系统取消

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

@@ -8,14 +8,11 @@ import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.enums.OrderGoodsTruckBindEnum;
-import com.clx.performance.enums.TruckDemandEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
-import com.clx.performance.service.OrderChildService;
+import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.base.Optional;
@@ -24,7 +21,6 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.stereotype.Component;
@@ -33,7 +29,10 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 货单最晚接单时间、最晚到达货源地时间处理
@@ -59,6 +58,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
 
     private final BreakContractDriverRecordService breakContractDriverRecordService;
 
+    private final OrderChildLogService orderChildLogService;
+
 
     //根据货单最晚接单时间处理
     public void expireProduceByLastOrderTime(LocalDateTime localDateTime, String orderGoodsNo) {
@@ -215,6 +216,11 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     orderChild.setFinishTime(DateUtils.parseDateTime(now).get());
                     breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, 0L, "系统");
 
+                    //保存运单日志数据
+                    // 日志
+                    orderChildLogService.saveDriverOrderChildLog(orderChild.getChildNo(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(),
+                            OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), 0L, "系统");
+
                 }
                 log.info("取消运单ID集合：{}", childNoList);
                 if (CollectionUtil.isNotEmpty(childNoList)) {

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

@@ -1612,7 +1612,10 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         //实付运费（元）
-        BigDecimal realFreight = payableFreight.subtract(lossDeduction);
+        BigDecimal realFreight = null;
+        if(Objects.equals(orderChild.getPoundStatus(),OrderChildPoundAuditEnum.Status.APPROVED.getCode())){
+            realFreight = payableFreight.subtract(lossDeduction);
+        }
         carrierOrderChildDetailVO.setPayableFreight(payableFreight);
         carrierOrderChildDetailVO.setLossDeduction(lossDeduction);
         carrierOrderChildDetailVO.setRealFreight(realFreight);