bug修复

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

@@ -20,6 +20,7 @@ import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerSer
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
@@ -61,7 +62,7 @@ public class OrderCancelComponent implements InitializingBean {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
-        LocalDateTime now = LocalDateTime.now();
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
         List<String> childNoList = new LinkedList<>();
 
         switch (param.getCancelType()) {

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

@@ -19,6 +19,7 @@ import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.base.Optional;
+import com.msl.common.utils.DateUtils;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -171,7 +172,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
     public void consumingLastArriveSendTime() {
         log.info("货单-最晚到达货源地时间-定时器启动");
         long nowTimeMillis = System.currentTimeMillis();
-        LocalDateTime now = LocalDateTime.now();
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
         Set<ZSetOperations.TypedTuple<String>> orderGoodsIds = redisTemplate.opsForZSet().rangeByScoreWithScores(
                 RedisConstants.ORDER_GOODS_STATUS_LAZY_LAST_ARRIVE_SEND_TIME,
                 0, nowTimeMillis  //延时任务score最小值
@@ -210,8 +211,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     childNoList.add(orderChild.getChildNo());
                     //释放车辆
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
-                    orderChild.setCancelTime(now);
-                    orderChild.setFinishTime(now);
+                    orderChild.setCancelTime(DateUtils.parseDateTime(now).get());
+                    orderChild.setFinishTime(DateUtils.parseDateTime(now).get());
                     breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, 0L, "系统");
 
                 }

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

@@ -103,7 +103,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> selectArriveSendOrderChildGe(String orderGoodsNo);
 
 
-    void batchUpdateOrderChildStatus(Integer status, String remark, LocalDateTime cancelTime, LocalDateTime finishTime, List<String> childNoList);
+    void batchUpdateOrderChildStatus(Integer status, String remark, String cancelTime, String finishTime, List<String> childNoList);
 
     List<OrderChild> selectOrderChildListByOrderGoodsNoAndStatusGE(String orderGoodsNo, Integer status);
 

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

@@ -312,7 +312,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public void batchUpdateOrderChildStatus(Integer status, String remark, LocalDateTime cancelTime, LocalDateTime finishTime, List<String> childNoList) {
+    public void batchUpdateOrderChildStatus(Integer status, String remark, String cancelTime, String finishTime, List<String> childNoList) {
         baseMapper.updateOrderGoodsSetResidueWeight(status,remark, cancelTime, finishTime, childNoList);
     }
 

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

@@ -49,6 +49,6 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
 
     @UpdateProvider(type = OrderChildSqlProvider.class, method = "batchUpdateOrderChildStatus")
     Integer updateOrderGoodsSetResidueWeight(@Param(value = "status") Integer status, @Param(value = "remark") String remark,
-                                             @Param(value = "cancelTime") LocalDateTime cancelTime, @Param(value = "finishTime") LocalDateTime finishTime,
+                                             @Param(value = "cancelTime") String cancelTime, @Param(value = "finishTime") String finishTime,
                                              @Param(value = "childNoList") List<String> childNoList);
 }
\ No newline at end of file

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

@@ -27,6 +27,7 @@ import com.clx.user.enums.driver.DriverInfoEnum;
 import com.msl.common.enums.ResultEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
@@ -73,7 +74,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void ownerConfirmCancelOrderPre(String orderNo) {
-        LocalDateTime now = LocalDateTime.now();
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
         List<OrderGoods> orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
         if (CollectionUtil.isEmpty(orderGoodsList)) {
@@ -352,7 +353,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
-        LocalDateTime now = LocalDateTime.now();
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
         switch (param.getCancelType()) {
             case 1: //单纯取消订单
                 if (CollectionUtil.isNotEmpty(orderChildDao.getOrderChildByOrderNo(orderNo))) {

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

@@ -1392,10 +1392,14 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 装车补偿
      */
     private void updateOrderGoodsAmountLoad(OrderGoods orderGoods, BigDecimal dif) {
-        if (dif.compareTo(BigDecimal.ZERO) == 0) {
+        int i = dif.compareTo(BigDecimal.ZERO);
+        if (i == 0){
             return;
+        } else if (i > 0) {
+            if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
+            }
         }
-
 
         Integer status = OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode();
 

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

@@ -137,6 +137,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
             || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
         ) {
+            if (orderChildWeight.compareTo(BigDecimal.ZERO) < 0) {
+                orderChildWeight = orderChildWeight.negate();
+            }
             //当前订单已经取消或完结
             orderCancelComponent.backFillTonnage(orderGoods, orderChildWeight);
         } else {
@@ -470,7 +473,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     public void orderGoodsCancel(OrderGoodsCancelParam goodsCancelParam) {
         String orderGoodsNo = goodsCancelParam.getOrderGoodsNo();
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).orElseThrow(PerformanceResultEnum.HTTP_ERROR, "数据错误");
-        LocalDateTime now = LocalDateTime.now();
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
         List<OrderChild> orderChildList = null;
         BigDecimal residueWeight = null;
         BigDecimal sum = BigDecimal.ZERO;

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

@@ -128,7 +128,7 @@ public class OrderChildSqlProvider {
 
 
     public String batchUpdateOrderChildStatus(@Param(value ="status") Integer status, @Param(value ="remark") String remark,
-                                              @Param(value = "cancelTime") LocalDateTime cancelTime, @Param(value = "finishTime") LocalDateTime finishTime,
+                                              @Param(value = "cancelTime") String cancelTime, @Param(value = "finishTime") String finishTime,
                                               @Param(value = "childNoList") List<String> childNoList ){
         StringBuffer sqlList = new StringBuffer();