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

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

+package com.clx.performance.param.pc;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ArtificialCancelOrderParam {
+
+    @NotNull(message = "运单编号不能为空")
+    @ApiModelProperty("运单编号")
+    private String orderChildNo;
+
+    @ApiModelProperty("取消原因")
+    private String remark;
+}

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -170,4 +170,7 @@ public class OrderChildVO {
         return OrderChildEnum.Status.getByCode(status).get().getName();
     }
 
+    @ApiModelProperty("货物类型名称")
+    public String goodTypeName;
+
 }
\ No newline at end of file

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

@@ -2,6 +2,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.PageOrderGoodsListParam;
 import com.clx.performance.service.OrderCancelService;
@@ -52,9 +53,9 @@ public class OrderCancelController {
     }
 
     @ApiOperation(value = "客服取消运单", notes = "<br>By:胡宇帆")
-    @GetMapping("/artificialCancelOrder")
-    public Result<Object> artificialCancelOrder(@RequestParam(value = "orderChildNo") String orderChildNo, @RequestParam(value = "remark") String remark) {
-        orderCancelService.artificialCancelOrder(orderChildNo, remark);
+    @PostMapping("/artificialCancelOrder")
+    public Result<Object> artificialCancelOrder(@RequestBody ArtificialCancelOrderParam param) {
+        orderCancelService.artificialCancelOrder(param.getOrderChildNo(), param.getRemark());
         return Result.ok();
     }
 

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

@@ -697,12 +697,25 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     @Override
     public OrderChildVO findArtificialCancelOrder(String orderChildNo) {
-        return orderChildDao.findArtificialCancelOrder(orderChildNo);
+        OrderChildVO artificialCancelOrder = orderChildDao.findArtificialCancelOrder(orderChildNo);
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(artificialCancelOrder.getOrderNo());
+        if (orderInfoFeign != null) {
+            artificialCancelOrder.setGoodTypeName(orderInfoFeign.getGoodsTypeName());
+        }
+        return artificialCancelOrder;
     }
 
     @Override
     public IPage<OrderChildVO> orderChildCancelRecord(PageParam pageParam) {
-        return orderChildDao.orderChildCancelRecord(pageParam);
+        IPage<OrderChildVO> page = orderChildDao.orderChildCancelRecord(pageParam);
+        if (!page.getRecords().isEmpty()) {
+            String orderNo = page.getRecords().get(0).getOrderNo();
+            FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+            for (OrderChildVO record : page.getRecords()) {
+                record.setGoodTypeName(orderInfoFeign.getGoodsTypeName());
+            }
+        }
+        return page;
     }
 
 

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

@@ -160,7 +160,8 @@ public class OrderChildSqlProvider {
                     "date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime," +
                     "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime "
             );
-            FROM("order_child");
+            FROM("order_child a");
+
             WHERE("(child_no = #{orderChildNo}");
             WHERE("(status >=" + OrderChildEnum.Status.LOAD.getCode());
             WHERE("(status <=" + OrderChildEnum.Status.COMPLETE.getCode());