Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into…

performance-api/src/main/java/com/clx/performance/param/pc/OrderChildCancelRecordParam.java

@@ -7,6 +7,4 @@ import java.util.List;
 
 @Data
 public class OrderChildCancelRecordParam extends PageParam {
-
-    private List<Integer> childStatusList;
 }

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

@@ -63,7 +63,7 @@ public class OrderCancelController {
 
     @ApiOperation(value = "取消运单记录", notes = "<br>By:胡宇帆")
     @PostMapping("/orderChildCancelRecord")
-    public Result<PageData<OrderChildVO>> orderChildCancelRecord(OrderChildCancelRecordParam param) {
+    public Result<PageData<OrderChildVO>> orderChildCancelRecord(@RequestBody OrderChildCancelRecordParam param) {
         IPage<OrderChildVO> page = orderCancelService.orderChildCancelRecord(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }

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

@@ -727,12 +727,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     @Override
     public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) {
-        List<Integer> listStatus = new ArrayList<>();
-        listStatus.add(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
-        listStatus.add(OrderChildEnum.Status.OWNER_CANCEL.getCode());
-        listStatus.add(OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode());
-        param.setChildStatusList(listStatus);
-
         IPage<OrderChildVO> page = orderChildDao.orderChildCancelRecord(param);
         if (!page.getRecords().isEmpty()) {
             String orderNo = page.getRecords().get(0).getOrderNo();

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

@@ -146,7 +146,7 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
         // 车主
         if (Objects.equals(settlement.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.DRIVER.getCode())){
 
-            payService.driverPay(settlement.getSettlementNo(), settlement.getTruckOwnUserNo(), settlement.getFigure().negate().intValue());
+            payService.driverPay(settlement.getSettlementNo(), settlement.getTruckOwnUserNo(), settlement.getFigure().intValue());
         }
         // 平台
         else if (Objects.equals(settlement.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())) {

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

@@ -180,7 +180,7 @@ public class OrderChildSqlProvider {
             );
             FROM("order_child ");
 
-            WHERE("status in (" + StringUtils.join(param.getChildStatusList(), ",")+")");
+            WHERE("status in (" + StringUtils.join(OrderChildEnum.CANCEL_lIST, ",")+")");
 
 
             ORDER_BY("create_time desc");