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

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

 package com.clx.performance.vo.pc;
 
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@ public class OrderGoodsEditVO {
     @ApiModelProperty("拉运吨数")
     private BigDecimal transportWeight;
     @ApiModelProperty("有效运费")
+    @MoneyOutConvert
     private BigDecimal validFreightPrice;
     @ApiModelProperty("用车需求： 1平台车辆 2部分平台车辆 3自有车辆")
     private Integer truckDemand;

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -130,6 +130,7 @@ public class GoodsOrderController {
 
     @ApiOperation(value = "货单编辑查询", notes = "<br>By:胡宇帆")
     @GetMapping("/findOrderGoodsByBatchNumber")
+    @UnitCovert
     public Result<OrderGoodsEditVO> findOrderGoodsByBatchNumber(@RequestParam(value = "id") Integer id){
         OrderGoodsEditVO orderGoodsVO = orderGoodsService.findOrderGoodsById(id);
         return Result.ok(orderGoodsVO);

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

@@ -405,9 +405,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
             case 3: //取消未拉运+未到达货源地吨数
                 List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
-
+                log.info("执行货主取消未拉运+未到达货源地吨数,当前运单个数"+ orderChildren.size());
                 List<Integer> ids = new LinkedList<>();
                 for (OrderChild orderChild : orderChildren) {
+                    log.info("取消的运单：{}", JSONUtil.parse(orderChild));
                     //释放车辆
                     driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     ids.add(orderChild.getId());
@@ -415,6 +416,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
                 Map<String, List<OrderChild>> orderChildMap = new HashMap<>();
                 if (CollectionUtil.isNotEmpty(ids)) {
+                    log.info("ids:{}", ids);
                     orderChildDao.batchUpdateOrderChildStatus(
                             OrderChildEnum.Status.OWNER_CANCEL.getCode(), "货主取消",
                             ids);

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

@@ -129,10 +129,13 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (entity.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
             || entity.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
         ) {
+            //当前订单已经取消或完结
+
+        } else {
+            orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(id, orderChildWeight, orderGoodsStatus);
 
         }
 
-        orderGoodsDao.updateOrderGoodsReduceWeightAndStatus(id, orderChildWeight, orderGoodsStatus);
     }
 
     @Override

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

@@ -265,7 +265,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
     private BigDecimal arriveSendAddressFigureCalc(OrderChild orderChild, OrderGoods orderGoods, BreakContractDriverRuleVO rule){
         long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderGoods.getLastArriveSendTime(), orderChild.getArriveSendTime());
 
-        BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 0, RoundingMode.HALF_UP).multiply(rule.getSendAddressRule().getFigurePerHour());
+        BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 2, RoundingMode.HALF_UP).multiply(rule.getSendAddressRule().getFigurePerHour()).setScale(2, RoundingMode.HALF_UP);
         return money.movePointRight(2);
     }