修改Bug

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsEditVO.java

@@ -11,6 +11,8 @@ public class OrderGoodsEditVO {
 
     @ApiModelProperty("订单编号")
     private String orderNo;
+    @ApiModelProperty("拉运结束时间")
+    private String transportEndTime;
     @ApiModelProperty("拉运吨数")
     private BigDecimal transportWeight;
     @ApiModelProperty("有效运费")

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -60,12 +60,12 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     //删除货单最晚接单时间处理
     public void deleteRedisRecordForLastOrderTime(String orderGoodsNo) {
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo);
+        redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ORDER_TIME, orderGoodsNo);
     }
 
     //删除货单最晚到达货源地时间处理
     public void deleteRedisRecordForLastArriveSendTime(String orderGoodsNo) {
-        redisTemplate.opsForSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo);
+        redisTemplate.opsForZSet().remove(RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME, orderGoodsNo);
     }
 
     //根据货单最晚到达货源地时间处理
@@ -183,7 +183,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
             log.info("货单-最晚到达货源地时间-定时器查询redis条数：{}", orderGoodsIds.size());
 
             for (ZSetOperations.TypedTuple<String> orderGoodsId : orderGoodsIds) {
-                log.info("货单" + orderGoodsId + "过了最晚到达货源地时间");
+                log.info("货单" + orderGoodsId.getValue() + "过了最晚到达货源地时间");
                 String orderGoodsNo = orderGoodsId.getValue();
                 log.info("处理当前货单编号:{}", orderGoodsNo);
                 Optional<OrderGoods> optional = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo);
@@ -206,9 +206,10 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
 
                 }
-
-
+                log.info("取消运单ID集合：{}", ids);
+                if (CollectionUtil.isNotEmpty(ids)) {
                     orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), ids);
+                }
 
                 RollbackOrderWeightParam param = new RollbackOrderWeightParam();
                 param.setOrderNo(orderGoods.getOrderNo());

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

@@ -595,7 +595,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         result.setUpFloatWeight(orderInfoFeign.getUpFloatWeight());
         result.setStopFlag(orderInfoFeign.getStopFlag());
         result.setSettlementAccountPeriod(orderInfoFeign.getSettlementAccountPeriod());
-
+        result.setTransportEndTime(orderInfoFeign.getTransportEndTime());
         List<OrderChild> orderChildList = orderChildDao.selectListByOrderGoodsNo(orderGoodsVO.getOrderGoodsNo());
         if (CollectionUtils.isNotEmpty(orderChildList)) {
             result.setEditAllFlag(false);

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

@@ -149,7 +149,7 @@ public class OrderGoodsSqlProvider {
                 "need_truck_num,vehicle_usage,pending_order_way,pending_order_time,pending_order_freight,last_arrive_send_time,senior_logistics_manager_id," +
                 "senior_logistics_manager_name,order_no,order_goods_no,order_goods_status,send_address_id,send_address_shorter,send_longitude," +
                 "send_latitude,receive_latitude,receive_longitude,receive_address_id,receive_address_shorter,goods_name,goods_id,create_time,modified_time," +
-                "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time) VALUES ");
+                "user_name,user_no,batch_number,last_arrive_receive_time,last_load_time,last_order_time,settlement_account_period) VALUES ");
 
         for (int i = 0; i < orderGoodsList.size(); i++) {
             OrderGoods o = orderGoodsList.get(i);
@@ -164,7 +164,7 @@ public class OrderGoodsSqlProvider {
                     .append(o.getReceiveAddressId()).append("','").append(o.getReceiveAddressShorter()).append("','").append(o.getGoodsName()).append("','")
                     .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
                     .append(o.getUserNo()).append("','").append(o.getBatchNumber()).append("','").append(o.getLastArriveReceiveTime()).append("','")
-                    .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime())
+                    .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime()).append("','").append(o.getSettlementAccountPeriod())
                     .append("')");
 
             if (i < orderGoodsList.size() - 1) {