Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

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

@@ -115,6 +115,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
         } else {
             List<OrderChild> arriveSendChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
+            orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
 
             List<String> childNoList = new LinkedList<>();
             for (OrderChild orderChild : arriveSendChildList) {
@@ -127,7 +128,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 orderChildDao.batchUpdateOrderChildStatus(
                         OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消",
                         now, now,childNoList);
-                orderStatusCode = OrderEnum.Status.COMPLETED.getCode();
             }
 
             Map<String, List<OrderChild>> orderChildMap = orderChildrenList.stream()
@@ -698,6 +698,9 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     @Override
     public OrderChildVO findArtificialCancelOrder(String orderChildNo) {
         OrderChildVO artificialCancelOrder = orderChildDao.findArtificialCancelOrder(orderChildNo);
+        if (artificialCancelOrder == null) {
+            return null;
+        }
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(artificialCancelOrder.getOrderNo());
         if (orderInfoFeign != null) {
             artificialCancelOrder.setGoodTypeName(orderInfoFeign.getGoodsTypeName());

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -148,25 +148,20 @@ public class OrderChildSqlProvider {
     }
 
     public String findArtificialCancelOrder(@Param("orderChildNo") String orderChildNo) {
-        return new SQL(){{
-            SELECT("child_no,goods_name,freight_price," +
-                    "send_address,receive_address,good_type_code,good_type_name" +
-                    "driver_user_no, driver_name,driver_mobile," +
-                    "truck_no," +
-                    "unload_pound_no,weight," +
-                    "cancel_remark," +
-                    "pound_status,status," +
-                    "date_format(load_deadline, '%Y-%m-%d %H:%i:%s') as loadDeadline," +
-                    "date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime," +
-                    "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime "
-            );
-            FROM("order_child a");
-
-            WHERE("(child_no = #{orderChildNo}");
-            WHERE("(status >=" + OrderChildEnum.Status.LOAD.getCode());
-            WHERE("(status <=" + OrderChildEnum.Status.COMPLETE.getCode());
-            LIMIT("1");
-        }}.toString();
+        String sql = "select child_no,goods_name,freight_price," +
+                "send_address,receive_address," +
+                "driver_user_no, driver_name,driver_mobile," +
+                "truck_no," +
+                "unload_pound_no,weight," +
+                "cancel_remark," +
+                "pound_status,status," +
+                "date_format(load_deadline, '%Y-%m-%d %H:%i:%s') as loadDeadline," +
+                "date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime," +
+                "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime  from order_child where child_no = #{orderChildNo}";
+
+        sql += " and status >="+ OrderChildEnum.Status.LOAD.getCode();
+        sql += " and status <="+ OrderChildEnum.Status.COMPLETE.getCode();
+        return sql;
     }
 
     public String orderChildCancelRecord(@Param("page") Page<OrderChildVO> page) {