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

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -7,6 +7,7 @@ import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.param.pc.owner.UpdateStatusParam;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,4 +92,7 @@ public interface PerformanceFeign {
 
     @GetMapping(value = {"clx-performance/feign/owner/accountInfo"})
     Result<OwnerAccountAllVO> accountInfo(@RequestParam Long userNo);
+
+    @GetMapping(value = {"clx-performance/feign/breakContract/getRuleInfo"})
+    Result<BreakContractOwnerRuleVO> getRuleInfo(@RequestParam Integer id);
 }

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

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import lombok.Data;
+
+@Data
+public class OrderChildCancelRecordParam extends PageParam {
+}

performance-web/src/main/java/com/clx/performance/controller/feign/BreakContractSettlementOwnerFeignController.java

 package com.clx.performance.controller.feign;
 
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
+import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @Slf4j
@@ -24,6 +23,8 @@ public class BreakContractSettlementOwnerFeignController {
 
     private final BreakContractSettlementOwnerService breakContractSettlementOwnerService;
 
+    private final BreakContractOwnerRuleService breakContractOwnerRuleService;
+
 
     @ApiOperation(value = "货主订单吨数下调自动保存违约结算单")
     @PostMapping("/saveSettlementOwnerForTonnageDown")
@@ -32,6 +33,10 @@ public class BreakContractSettlementOwnerFeignController {
         return Result.ok();
     }
 
-
+    @ApiOperation(value = "查询货主违约规则")
+    @GetMapping("/getRuleInfo")
+    Result<BreakContractOwnerRuleVO> getRuleInfo(@RequestParam Integer id){
+        return Result.ok(breakContractOwnerRuleService.getRuleInfo(id));
+    }
 
 }

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

@@ -4,6 +4,7 @@ package com.clx.performance.controller.pc;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.ArtificialCancelOrderParam;
 import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.service.OrderCancelService;
 import com.clx.performance.vo.app.OrderChildVO;
@@ -62,8 +63,8 @@ public class OrderCancelController {
 
     @ApiOperation(value = "取消运单记录", notes = "<br>By:胡宇帆")
     @PostMapping("/orderChildCancelRecord")
-    public Result<PageData<OrderChildVO>> orderChildCancelRecord(PageParam pageParam) {
-        IPage<OrderChildVO> page = orderCancelService.orderChildCancelRecord(pageParam);
+    public Result<PageData<OrderChildVO>> orderChildCancelRecord(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/dao/OrderChildDao.java

@@ -6,6 +6,7 @@ import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
@@ -144,7 +145,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
      */
     OrderChildVO findArtificialCancelOrder(String orderChildNo);
 
-    IPage<OrderChildVO> orderChildCancelRecord(PageParam pageParam);
+    IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param);
 
     List<OrderChild> selectInOrderChildNoList(List<String> childNoList);
 }

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

@@ -11,6 +11,7 @@ import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
@@ -391,9 +392,9 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public IPage<OrderChildVO> orderChildCancelRecord(PageParam param) {
+    public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) {
         Page<OrderGoodsVO> page = Page.of(param.getPage(), param.getPageSize());
-        return baseMapper.orderChildCancelRecord(page);
+        return baseMapper.orderChildCancelRecord(page,param);
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
@@ -77,5 +78,5 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     OrderChildVO findArtificialCancelOrder(@Param("orderChildNo") String orderChildNo);
 
     @SelectProvider(type = OrderChildSqlProvider.class, method = "orderChildCancelRecord")
-    IPage<OrderChildVO> orderChildCancelRecord(@Param("page")Page<OrderGoodsVO> page);
+    IPage<OrderChildVO> orderChildCancelRecord(@Param("page")Page<OrderGoodsVO> page, OrderChildCancelRecordParam param);
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/OrderCancelService.java

@@ -2,6 +2,7 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.msl.common.base.PageParam;
 
@@ -48,5 +49,5 @@ public interface OrderCancelService {
      */
     OrderChildVO findArtificialCancelOrder(String orderChildNo);
 
-    IPage<OrderChildVO> orderChildCancelRecord(PageParam pageParam);
+    IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param);
 }

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

@@ -19,6 +19,7 @@ import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.OrderCancelService;
 import com.clx.performance.service.OrderChildLogService;
@@ -722,8 +723,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     }
 
     @Override
-    public IPage<OrderChildVO> orderChildCancelRecord(PageParam pageParam) {
-        IPage<OrderChildVO> page = orderChildDao.orderChildCancelRecord(pageParam);
+    public IPage<OrderChildVO> orderChildCancelRecord(OrderChildCancelRecordParam param) {
+        IPage<OrderChildVO> page = orderChildDao.orderChildCancelRecord(param);
         if (!page.getRecords().isEmpty()) {
             String orderNo = page.getRecords().get(0).getOrderNo();
             FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
@@ -148,7 +149,7 @@ public class OrderChildSqlProvider {
     }
 
     public String findArtificialCancelOrder(@Param("orderChildNo") String orderChildNo) {
-        String sql = "select child_no,goods_name,freight_price," +
+        String sql = "select child_no,goods_name,freight_price,order_no" +
                 "send_address,receive_address," +
                 "driver_user_no, driver_name,driver_mobile," +
                 "truck_no," +
@@ -160,11 +161,11 @@ public class OrderChildSqlProvider {
                 "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime  from order_child where child_no = #{orderChildNo}";
 
         sql += " and status >="+ OrderChildEnum.Status.LOAD.getCode();
-        sql += " and status <="+ OrderChildEnum.Status.COMPLETE.getCode();
+        sql += " and status <="+ OrderChildEnum.Status.UNSETTLE.getCode();
         return sql;
     }
 
-    public String orderChildCancelRecord(@Param("page") Page<OrderChildVO> page) {
+    public String orderChildCancelRecord(@Param("page") Page<OrderChildVO> page, @Param("param") OrderChildCancelRecordParam param) {
         return new SQL(){{
             SELECT("child_no,goods_name,freight_price," +
                     "send_address,receive_address," +