逆向

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-web/src/main/java/com/clx/performance/controller/feign/OrderCancelFeignController.java

 package com.clx.performance.controller.feign;
 
 
-import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.param.pc.OrderCancelFeignParam;
 import com.clx.performance.service.OrderCancelService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -27,8 +27,8 @@ 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) {
+        //orderCancelService.platformCancelOrderPrePC(param.getOrderNo());
         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/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);
 }