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

performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementOwnerEnum.java

@@ -13,7 +13,7 @@ public enum BreakContractSettlementOwnerEnum {
     @Getter
     @AllArgsConstructor
     public enum Status {
-        TO_BE_LOCKED(10, "待锁定"),
+        TO_BE_ACCOUNT(10, "待对账"),
         OWNER_TO_BE_CONFIRMED(20, "待货主确认"),
         SHIPPER_TO_PAYMENT (30, "待货主付款"),
         PLATFORM_CONFIRMED_OWNER_PAYMENT(40, "待平台确认付款"),

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

 package com.clx.performance.feign;
 
-import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.OrderCancelFeignParam;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -54,7 +54,7 @@ public interface PerformanceFeign {
 
 
     @PostMapping(value = {"clx-performance/feign/order/orderCancel"})
-    Result<Object> orderCancel(@RequestBody OrderCancelParam param);
+    Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param);
 
 
     /**

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

+package com.clx.performance.param.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+
+@Getter
+@Setter
+public class OrderCancelFeignParam {
+
+    @NotNull(message = "订单编号不能为空")
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+}

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

 package com.clx.performance.param.pc;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
-
-@Getter
-@Setter
+@Data
 public class OrderCancelParam {
 
     @NotNull(message = "订单编号不能为空")
     @ApiModelProperty("订单编号")
     private String orderNo;
 
+    @ApiModelProperty("1:弹窗1  2：弹窗取消未拉运吨数 3：取消未拉运+已到达货源地之前的吨数")
+    private Integer cancelType;
+
+    @ApiModelProperty("1:平台  2：货主")
+    private Integer createByType;
 }

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverDetailParam.java

@@ -20,6 +20,9 @@ public class PageCarrierBreakContractSettlementDriverDetailParam extends PagePar
     @ApiModelProperty(value="车主编号",example = "201457878")
     private Long truckOwnUserNo;
 
+    @ApiModelProperty("车主名称")
+    private String truckOwnName;
+
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
     private Integer breakContractPartyType;
 

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerDetailParam.java

@@ -20,6 +20,9 @@ public class PageCarrierBreakContractSettlementOwnerDetailParam extends PagePara
     @ApiModelProperty(value="货主编号",example = "201457878")
     private Long ownerUserNo;
 
+    @ApiModelProperty("货主名称")
+    private String ownerName;
+
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
     private Integer breakContractPartyType;
 

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerParam.java

@@ -28,7 +28,7 @@ public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
     @ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
     private Integer breakContractPartyType;
 
-    @ApiModelProperty(value = "状态：10-待锁定,20-待货主确认,30-待货主付款,40-待平台确认付款,50-待平台付款,60-待货主确认付款,70-已完结,80-已取消", example = "1")
+    @ApiModelProperty(value = "状态：10-待对账,20-待货主确认,30-待货主付款,40-待平台确认付款,50-待平台付款,60-待货主确认付款,70-已完结,80-已取消", example = "1")
     private Integer status;
 
     @ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")

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

 package com.clx.performance.controller.feign;
 
 
+import com.clx.performance.param.pc.OrderCancelFeignParam;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
 import com.msl.common.result.Result;
@@ -27,8 +28,12 @@ public class OrderCancelFeignController {
 
     @ApiOperation(value = "货主端订单取消", notes = "<br>By:胡宇帆")
     @PostMapping("/orderCancel")
-    public Result<Object> orderCancel(@RequestBody OrderCancelParam param) {
-        orderCancelService.ownerCancelOrderPre(param.getOrderNo());
+    public Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param) {
+        OrderCancelParam cancelParam = new OrderCancelParam();
+        cancelParam.setOrderNo(param.getOrderNo());
+        cancelParam.setCancelType(3);
+        cancelParam.setCreateByType(1);
+        orderCancelService.platformCancelOrderPrePC(cancelParam);
         return Result.ok();
     }
 }

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

 package com.clx.performance.controller.pc;
 
 
+import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
-import com.clx.performance.vo.pc.OrderGoodsVO;
-import com.msl.common.convertor.aspect.UnitCovert;
 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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,23 +18,23 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value="/pc/order/")
 @Validated
-@Api(tags = "PC-订单取消取消")
+@Api(tags = "PC-订单取消")
 @AllArgsConstructor
 public class OrderCancelController {
 
     private final OrderCancelService orderCancelService;
 
     @ApiOperation(value = "承运端取消订单", notes = "<br>By:胡宇帆")
-    @GetMapping("/platformCancelOrderPre")
-    public Result<Object> platformCancelOrderPre(@RequestParam String orderNo) {
-        orderCancelService.platformCancelOrderPre(orderNo);
+    @PostMapping("/platformCancelOrderPre")
+    public Result<Object> platformCancelOrderPre(@RequestParam OrderCancelParam param) {
+        orderCancelService.platformCancelOrderPrePC(param);
         return Result.ok();
     }
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
-    @GetMapping("/ownCancelOrderPre")
-    public Result<Object> ownCancelOrderPre(@RequestParam String orderNo) {
-        orderCancelService.ownerCancelOrderPre(orderNo);
+    @PostMapping("/ownCancelOrderPre")
+    public Result<Object> ownCancelOrderPre(@RequestParam OrderCancelParam param) {
+        orderCancelService.ownerCancelOrderPrePC(param);
         return Result.ok();
     }
 }

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

@@ -28,6 +28,7 @@ public class BreakContractSettlementDriverDetailDaoImpl extends BaseDaoImpl<Brea
         LambdaQueryWrapper<BreakContractSettlementDriverDetail> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriverDetail :: getChildNo,param.getChildNo());
         query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriverDetail :: getTruckOwnUserNo,param.getTruckOwnUserNo());
+        query.eq(StringUtils.isNotBlank(param.getTruckOwnName()),BreakContractSettlementDriverDetail :: getTruckOwnName,param.getTruckOwnName());
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementDriverDetail :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.orderByDesc(BreakContractSettlementDriverDetail::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);

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

@@ -30,6 +30,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         LambdaQueryWrapper<BreakContractSettlementOwner> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwner :: getOrderNo,param.getOrderNo());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractSettlementOwner :: getOwnerUserNo,param.getOwnerUserNo());
+        query.eq(Objects.nonNull(param.getStatus()),BreakContractSettlementOwner :: getStatus,param.getStatus());
         query.eq(StringUtils.isNotBlank(param.getOwnerName()),BreakContractSettlementOwner ::getOwnerName ,param.getOwnerName());
         query.eq(StringUtils.isNotBlank(param.getSettlementNo()),BreakContractSettlementOwner ::getSettlementNo ,param.getSettlementNo());
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwner :: getBreakContractPartyType,param.getBreakContractPartyType());
@@ -43,7 +44,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
     public boolean uploadInvoiceImg(Integer id, String invoiceImg) {
         return update(lUdWrapper()
                 .eq(BreakContractSettlementOwner::getId, id)
-                .eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())
+                .eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode())
                 .set(BreakContractSettlementOwner::getInvoiceImg, invoiceImg)
                 .set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode())
         );

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

@@ -26,6 +26,7 @@ public class BreakContractSettlementOwnerDetailDaoImpl extends BaseDaoImpl<Break
         LambdaQueryWrapper<BreakContractSettlementOwnerDetail> query = new LambdaQueryWrapper<>();
         query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwnerDetail :: getOrderNo,param.getOrderNo());
         query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractSettlementOwnerDetail ::getOwnerUserNo ,param.getOwnerUserNo());
+        query.eq(StringUtils.isNotBlank(param.getOwnerName()),BreakContractSettlementOwnerDetail :: getOwnerName,param.getOwnerName());
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwnerDetail :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.orderByDesc(BreakContractSettlementOwnerDetail::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);

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

 package com.clx.performance.listener;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.performance.constant.RabbitKeyConstants;
-import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.enums.OrderGoodsStatusEnum;
-import com.clx.performance.model.OrderGoods;
-import com.clx.performance.param.mq.OrderCancelMqParam;
-import com.clx.performance.service.IntegralMqService;
+import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
-import com.msl.common.base.Optional;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,16 +23,12 @@ public class OrderCancelHandler {
     @RabbitListener(queues = RabbitKeyConstants.ORDER_CANCEL_QUEUE)
     public void onMessage(String message) {
         log.info("处理订单取消监听器执行,订单No为{}", message);
-        OrderCancelMqParam param = JSONUtil.toBean(message, OrderCancelMqParam.class);
-        if (StringUtils.equals(param.getType(), "1")) {
-            orderCancelService.platformCancelOrder(param.getOrderNo());
+        OrderCancelParam param = JSONUtil.toBean(message, OrderCancelParam.class);
+        if (ObjectUtil.equals(param.getCancelType(), 1)) {
+            orderCancelService.ownerCancelOrderPrePCMQ(param);
         } else {
-            orderCancelService.ownerCancelOrder(param.getOrderNo());
+            orderCancelService.ownerCancelOrderPrePCMQ(param);
         }
-        return;
-//        if (StringUtils.isBlank(message)) {
-//            return;
-//        }
-//        orderCancelService.ownerCancelOrder(message);
+
     }
 }

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

 package com.clx.performance.service;
 
+import com.clx.performance.param.pc.OrderCancelParam;
+
 public interface OrderCancelService {
 
-    void platformCancelOrderPre(String orderNo);
+//    void platformCancelOrderPre(String orderNo);
+//
+//    void platformCancelOrder(String orderNo);
+//
+//    void ownerCancelOrderPre(String orderNo);
+//
+//    void ownerCancelOrder(String orderNo);
 
-    void platformCancelOrder(String orderNo);
+    void ownerCancelOrderPrePC(OrderCancelParam param);
 
-    void ownerCancelOrderPre(String orderNo);
+    void platformCancelOrderPrePC(OrderCancelParam param);
 
-    void ownerCancelOrder(String orderNo);
+    void ownerCancelOrderPrePCMQ(OrderCancelParam param);
 }

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

@@ -100,7 +100,7 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
 
         //货主违约结算单
         BreakContractSettlementOwner breakOwner = breakContractSettlementOwnerStruct.convert(breakOwnerDetail);
-        breakOwner.setStatus(BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode());
+        breakOwner.setStatus(BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode());
 
         record.setSettlementNo(settlementNo);
         //保存违约记录

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

@@ -131,7 +131,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     public void uploadInvoiceImg(CarrierUploadInvoiceImgParam param) {
 
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())){
+        if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
         }
         breakContractSettlementOwnerDao.uploadInvoiceImg(param.getId(),param.getInvoiceImg());
@@ -147,11 +147,11 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     @Transactional(rollbackFor = Exception.class)
     public void updateCancelSettlement(CarrierCancelSettlementParam param) {
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())){
+        if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
         }
 
-        breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode(),BreakContractSettlementOwnerEnum.Status.CANCEL.getCode());
+        breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode(),BreakContractSettlementOwnerEnum.Status.CANCEL.getCode());
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----取消结算单

performance-web/src/test/java/com/clx/performance/JobTest.java

@@ -60,7 +60,7 @@ public class JobTest {
 //                RabbitKeyConstants.ORDER_CANCEL_EXCHANGE, RabbitKeyConstants.ORDER_CANCEL_ROUTE_KEY, message
 //        );
 
-        orderCancelService.ownerCancelOrderPre("PT2023102700473");
+        //orderCancelService.ownerCancelOrderPre("PT2023102700473");
         //orderCancelService.ownerCancelOrder("PT2023102600466");
         System.out.println();
     }