乱七八糟

src/main/java/com/gxwebsoft/open/controller/OpenOrderController.java

@@ -1,6 +1,7 @@
 package com.gxwebsoft.open.controller;
 
 import cn.hutool.core.date.DateUtil;
+import com.alipay.api.AlipayApiException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.apps.utils.BcUtil;
 import com.gxwebsoft.common.core.web.ApiResult;
@@ -16,9 +17,7 @@ import com.gxwebsoft.shop.mapper.OrderMapper;
 import com.gxwebsoft.shop.param.CartParam;
 import com.gxwebsoft.shop.param.OrderGoodsParam;
 import com.gxwebsoft.shop.param.OrderParam;
-import com.gxwebsoft.shop.service.OrderGoodsService;
-import com.gxwebsoft.shop.service.OrderService;
-import com.gxwebsoft.shop.service.UserBalanceLogService;
+import com.gxwebsoft.shop.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,6 +49,8 @@ public class OpenOrderController extends BaseController {
     @Resource
     private OrderGoodsService orderGoodsService;
     @Resource
+    private FreezeOrderService freezeOrderService;
+    @Resource
     private OrderMapper orderMapper;
     @Resource
     private UserService userService;
@@ -252,10 +253,17 @@ public class OpenOrderController extends BaseController {
 
     @ApiOperation("删除订单记录表")
     @GetMapping("/remove/{id}")
-    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+    public ApiResult<?> remove(@PathVariable("id") Integer id) throws AlipayApiException {
         // 验证签名
         isCheckSign();
+        try {
+            freezeOrderService.unfreeze(id);
+        }catch (Exception e) {
+
+        }
+//        Order order = orderService.getById(id);
         if (orderService.removeById(id)) {
+
             return success("删除成功");
         }
         return fail("删除失败");