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

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -111,4 +111,5 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
 
     List<OrderGoods> listAfterCreatedByOrderNo(String orderNo);
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -316,4 +316,5 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
         );
 
     }
+
 }

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

@@ -72,6 +72,9 @@ public class OrderChildDtsListener  {
     private final OrderChildStruct orderChildStruct;
     private final RabbitTemplate rabbitTemplate;
 
+    private final OrderGoodsDao orderGoodsDao;
+
+
 
     @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
     public void onMessage(Message message) {
@@ -271,6 +274,28 @@ public class OrderChildDtsListener  {
 
     }
 
+    //同步履约进度表-----运单部分
+    public void syncPerformanceProgress(OrderChild before,OrderChild after, Integer updateType){
+        boolean isSend = false;
+        if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode())){
+            isSend = true;
+        }
+        if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode()) &&
+                (!Objects.equals(before.getStatus(),after.getStatus()) ||
+                 !Objects.equals(before.getLoadNet(),after.getLoadNet())) ||
+                 !Objects.equals(before.getUnloadNet(),after.getUnloadNet())
+        ){
+            isSend = true;
+        }
+        if(isSend){
+            log.info("开始发送同步履约进度表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
+            Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
+            rabbitTemplate.send(SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_EXCHANGE,
+                    SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_ROUTING_KEY, body);
+            log.info("结束发送同步履约进度表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
+        }
+    }
+
     /**
      * 后续逻辑处理
      * @param before
@@ -311,33 +336,6 @@ public class OrderChildDtsListener  {
             og.setAlreadyLoadWeight(alreadyLoadWeight);
             orderGoodsDao.updateEntityByKey(og);
         }
-
-
-
-
-
-    }
-
-    //同步履约进度表-----运单部分
-    public void syncPerformanceProgress(OrderChild before,OrderChild after, Integer updateType){
-        boolean isSend = false;
-        if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode())){
-            isSend = true;
-        }
-        if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode()) &&
-                (!Objects.equals(before.getStatus(),after.getStatus()) ||
-                 !Objects.equals(before.getLoadNet(),after.getLoadNet())) ||
-                 !Objects.equals(before.getUnloadNet(),after.getUnloadNet())
-        ){
-            isSend = true;
-        }
-        if(isSend){
-            log.info("开始发送同步履约进度表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
-            Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
-            rabbitTemplate.send(SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_EXCHANGE,
-                    SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_ROUTING_KEY, body);
-            log.info("结束发送同步履约进度表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
-        }
     }
 
 }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -96,7 +96,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
                                                   @Param("receiveAddressId") Integer receiveAddressId);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "indexOrderGoodsListSearch")
-    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(@Param("page")Page<OrderGoodsAPPVO> page, @Param("param")AppGoodsOrderSearchParam param);
+    IPage<OrderGoodsAPPVO> indexOrderGoodsListSearch(@Param("page")Page<OrderGoodsAPPVO> page, @Param("param") AppGoodsOrderSearchParam param);
 
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "queryProcessFleetOpenTruckList")

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -108,5 +108,6 @@ public interface OrderChildService {
 
     void cacheOrderChildExpectData(String childNo, OrderChildExpectDTO expect);
 
+
     List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo);
 }

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

@@ -6,6 +6,8 @@ import com.clx.performance.service.PerformanceProgressLogService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * @author kavin
  * Date 2024-07-12
@@ -20,7 +22,7 @@ public class PerformanceProgressLogServiceImpl  implements PerformanceProgressLo
         PerformanceProgressLog log = new PerformanceProgressLog();
         log.setOrderNo(orderNo);
         log.setOperateType(logType.getCode());
-        log.setOperateContent(logType.getName() + ":" + content);
+        log.setOperateContent(logType.getName() + ":" + (Objects.isNull(content)?"-":content));
         log.setCreateBy(userNo);
         log.setCreateName(userName);
         return log;