Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into test

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

@@ -265,7 +265,7 @@ public class OrderCancelComponent implements InitializingBean {
         String orderNo = orderGoods.getOrderNo();
         Optional<FeignOrderInfoVO> optional = orderService.getOrderInfo(orderNo);
         if(!optional.isPresent()){
-            log.error("通过订单号未查询到对应的订单信息,订单号:{}",orderNo);
+            log.warn("通过订单号未查询到对应的订单信息,订单号:{}",orderNo);
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
         FeignOrderInfoVO orderInfo = optional.get();
@@ -318,7 +318,7 @@ public class OrderCancelComponent implements InitializingBean {
         }
         Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
         if (!result.succeed()) {
-            log.error("订单号：{} 的订单做吨数调整，对应货单号:{} 调整失败，调整吨数：{},调整类型:{}",
+            log.warn("订单号：{} 的订单做吨数调整，对应货单号:{} 调整失败，调整吨数：{},调整类型:{}",
                     orderNo,orderGoods.getOrderGoodsNo(),weight,updateTypeMsg);
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
         }

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

@@ -50,8 +50,6 @@ public class LargeScreenListener {
     @RabbitListener(queues = RabbitKeyConstants.ORDER_LARGE_SCREEN_QUEUE)
     public void onMessage(String message) {
         try {
-            log.info("接入数据大屏====================================================");
-            log.info("已经接入到数据============" + JSONUtil.parse(message));
             FeignOrderVO orderVO = JSONUtil.toBean(message, FeignOrderVO.class);
             log.info("处理数据大屏标准地址路线监听器执行,订单Id为{},发货地标准地址ID为{},收货地标准地址ID为{}", orderVO.getOrderNo(), orderVO.getSendSystemAddressId(), orderVO.getReveiveSystemAddressId());
 

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

@@ -60,7 +60,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
     public List<JSONObject> emptyCarList() {
         List<String> data = driverFeign.driverTruckList().getData();
 
-        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
+        String now = DateUtils.formatDateTime(LocalDateTime.now()).get();
         List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
         if (CollectionUtils.isEmpty(orderChildList)) {
             return null;
@@ -99,7 +99,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
     public List<JSONObject> weightCarList() {
         List<String> data = driverFeign.driverTruckList().getData();
 
-        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
+        String now = DateUtils.formatDateTime(LocalDateTime.now()).get();
         List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
         if (CollectionUtils.isEmpty(orderChildList)) {
             return null;

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

@@ -1429,22 +1429,21 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 更新货单吨数
      */
     @Override
-    public void updateOrderGoodsAmountLoad(OrderGoods orderGoods,String childNo, BigDecimal dif, Integer orderGoodsStatus) {
+    public void updateOrderGoodsAmountLoad(OrderGoods orderGoods, String childNo, BigDecimal dif, Integer orderGoodsStatus) {
         //防止状态倒退
         if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
                 || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
                 || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
-        ){
+        ) {
             orderGoodsStatus = orderGoods.getOrderGoodsStatus();
         }
-        if(dif.compareTo(BigDecimal.ZERO) != 0 ){
+        if (dif.compareTo(BigDecimal.ZERO) != 0) {
             //判断是从订单借吨还是直接货单进行扣减(货单剩余吨数小于本运单的修改后的吨数差值)
             if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
                 //货单吨数不够扣减，从订单进行借吨数
-            orderGoodsService.borrowWeight(orderGoods,childNo,orderGoods.getResidueTransportWeight(),dif,
-                    dif.subtract(orderGoods.getResidueTransportWeight()),
-                    OrderGoodsStatusEnum.Status.GO_TO_SEND.getCode());
-        }else{
+                orderGoodsService.borrowWeight(orderGoods, childNo, orderGoods.getResidueTransportWeight(), dif,
+                        dif.subtract(orderGoods.getResidueTransportWeight()), orderGoodsStatus);
+            } else {
                 // 货单吨数够扣减，直接更新货单剩余吨数和已拉运吨数和状态
                 orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(orderGoods.getId(), dif, orderGoodsStatus);
             }