Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderChildListener.java

 package com.clx.performance.listener;
 
-import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.clx.performance.common.MqWrapper;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.PerformanceProgressService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
@@ -21,9 +24,11 @@ public class SyncPerformanceProgress4OrderChildListener {
 
 
     @RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_QUEUE)
-    public void onMessage(String message) {
+    public void onMessage(Message message) {
         log.info("监听到同步履约进度表---运单信息部分,消息内容{}", message);
-        OrderChild data = JSONUtil.toBean(message, OrderChild.class);
+        OrderChild data = JSON.parseObject(new String(message.getBody()),
+                new TypeReference<MqWrapper<OrderChild>>() {
+                }).getData();
         performanceProgressService.dealPerformanceProgress4OrderChild(data);
     }
 }

performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderGoodsListener.java

 package com.clx.performance.listener;
 
-import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.clx.performance.common.MqWrapper;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.PerformanceProgressService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
@@ -21,9 +24,11 @@ public class SyncPerformanceProgress4OrderGoodsListener {
 
 
     @RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_QUEUE)
-    public void onMessage(String message) {
+    public void onMessage(Message message) {
         log.info("监听到同步履约进度表---货单信息部分,消息内容{}", message);
-        OrderGoods data = JSONUtil.toBean(message, OrderGoods.class);
+        OrderGoods data = JSON.parseObject(new String(message.getBody()),
+                new TypeReference<MqWrapper<OrderGoods>>() {
+                }).getData();
         performanceProgressService.dealPerformanceProgress4OrderGoods(data);
     }
 }

performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderInfoListener.java

@@ -29,7 +29,6 @@ public class SyncPerformanceProgress4OrderInfoListener {
         OrderInfoMessage data = JSON.parseObject(new String(message.getBody()),
                 new TypeReference<MqWrapper<OrderInfoMessage>>() {
                 }).getData();
-        log.info("OrderInfoMessage===={}",data);
         performanceProgressService.dealPerformanceProgress4OrderInfo(data);
     }
 }

performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java

@@ -327,7 +327,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //重车运距（收发货地址距离）
             try{
                 List<GdRouteDTO> route = gdService.getRoute(sendAddress.getLongitude(), sendAddress.getLatitude(),
-                        receiveAddress.getLongitude(), receiveAddress.getLongitude());
+                        receiveAddress.getLongitude(), receiveAddress.getLatitude());
                 if (!route.isEmpty()){
                     distance = new BigDecimal(route.get(0).getDistance() /1000);
                 }