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

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

@@ -127,4 +127,10 @@ public class GoodsOrderController {
         IPage<OrderGoodsVO> page = orderGoodsService.pageOrderGoodsList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
+    @ApiOperation(value = "取消订单获取弹窗样式", notes = "<br>By:胡宇帆")
+    @GetMapping("/orderCancel")
+    public Result<String> orderCancel(@RequestParam(value = "orderNo") String orderNo) {
+        return Result.ok(orderGoodsService.orderCancel(orderNo));
+    }
 }

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

@@ -34,5 +34,5 @@ public interface OrderGoodsService {
 
     List<OrderGoods> getOrderGoodsList(String orderNo, LocalDateTime lastArriveSendTime);
 
-    String orderCancel();
+    String orderCancel(String orderNo);
 }

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

@@ -154,8 +154,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
 
     @Override
-    public String orderCancel() {
-        String orderNo = "";
+    public String orderCancel(String orderNo) {
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         Integer orderStatus = orderInfoFeign.getOrderStatus();