添加用户端接口

cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java

@@ -2,10 +2,14 @@ package com.czg.controller.admin;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.annotation.SaAdminCheckPermission;
+import com.czg.market.service.PpPackageOrderService;
 import com.czg.market.service.PpPackageService;
+import com.czg.market.vo.PpOrderListVO;
 import com.czg.market.vo.PpPackagePageReqVo;
 import com.czg.market.vo.PpPackageVO;
+import com.czg.order.dto.GbOrderQueryParam;
 import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
 import com.czg.utils.AssertUtil;
 import com.czg.validator.group.InsertGroup;
 import com.czg.validator.group.UpdateGroup;
@@ -29,6 +33,9 @@ public class PpPackageController {
     @Resource
     private PpPackageService ppPackageService;
 
+    @Resource
+    private PpPackageOrderService ppPackageOrderService;
+
     /**
      * 添加套餐
      */
@@ -51,22 +58,26 @@ public class PpPackageController {
 
     /**
      * 删除套餐
-     * 如果返回值大于0则删除失败，存在进行中的订单，请继续调用确认删除套餐接口
      */
     @DeleteMapping("/{id}")
     @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:delete", name = "删除套餐")
-    public CzgResult<Long> deletePackage(@PathVariable Long id) {
+    public CzgResult<Boolean> deletePackage(@PathVariable Long id) {
         return CzgResult.success(ppPackageService.deletePackage(id));
     }
 
     /**
-     * 确认删除套餐
+     * 上下架套餐
+     * 参数: {"status": 1, "packageId": 123}
      */
-    @DeleteMapping("/sure/{id}")
-    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:sureDelete", name = "确认删除套餐")
-    public CzgResult<Void> sureDeletePackage(@PathVariable Long id) {
-        ppPackageService.sureDeletePackage(id);
-        return CzgResult.success();
+    @PutMapping("/switch")
+    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:switch", name = "上下架套餐")
+    public CzgResult<Boolean> switchPackage(@RequestBody JSONObject param) {
+        AssertUtil.isNull(param, "参数错误");
+        Integer status = param.getInteger("status");
+        Long packageId = param.getLong("packageId");
+        AssertUtil.isNull(status, "参数错误");
+        AssertUtil.isNull(packageId, "参数错误");
+        return CzgResult.success(ppPackageService.updateOnlineStatus(packageId, status));
     }
 
     /**
@@ -100,6 +111,15 @@ public class PpPackageController {
         Integer status = param.getInteger("status");
         AssertUtil.isNull(status, "参数错误");
         log.info("修改套餐推广开关 status == {}", status);
-        return CzgResult.success(ppPackageService.updatePackagePromotionSwitch(status));
+        return CzgResult.success(ppPackageService.updatePackagePromotionSwitch(status, StpKit.USER.getShopId()));
+    }
+
+    /**
+     * 获取套餐推广订单列表
+     */
+    @GetMapping("/order")
+    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", name = "获取套餐推广订单列表")
+    public CzgResult<Page<PpOrderListVO>> getPackageOrderList(GbOrderQueryParam reqVo) {
+        return CzgResult.success(ppPackageOrderService.queryOrderList(StpKit.USER.getShopId(), null, reqVo));
     }
 }

cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java

@@ -0,0 +1,73 @@
+package com.czg.controller.user;
+
+import com.czg.market.dto.PpPackageOrderDTO;
+import com.czg.market.service.PpPackageOrderService;
+import com.czg.market.service.PpPackageService;
+import com.czg.market.vo.PpOrderListVO;
+import com.czg.market.vo.PpPackagePageReqVo;
+import com.czg.market.vo.PpPackageVO;
+import com.czg.order.dto.GbOrderQueryParam;
+import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
+import com.mybatisflex.core.paginate.Page;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用户端/套餐推广
+ *
+ * @author yjjie
+ * @date 2025/12/18 18:03
+ */
+@RestController
+@RequestMapping("/user/package")
+public class UPpPackageController {
+
+    @Resource
+    private PpPackageService ppPackageService;
+
+    @Resource
+    private PpPackageOrderService ppPackageOrderService;
+
+    /**
+     * 获取套餐列表
+     */
+    @GetMapping
+    public CzgResult<Page<PpPackageVO>> getPackageList(PpPackagePageReqVo reqVo) {
+        return CzgResult.success(ppPackageService.getPackagePage(reqVo, false));
+    }
+
+    /**
+     * 获取我的订单列表
+     */
+    @GetMapping("/order")
+    public CzgResult<Page<PpOrderListVO>> getMyOrderList(GbOrderQueryParam reqVo) {
+        return CzgResult.success(ppPackageOrderService.queryOrderList(null, StpKit.USER.getLoginIdAsLong(), reqVo));
+    }
+
+    /**
+     * 取消订单
+     */
+    @GetMapping("/cancel")
+    public CzgResult<Boolean> cancelOrder(Long orderId) {
+        return CzgResult.success(ppPackageOrderService.cancelOrder(orderId));
+    }
+
+    /**
+     * 助力订单
+     */
+    @GetMapping("/help")
+    public CzgResult<Boolean> helpOrder(Long orderId) {
+        return CzgResult.success(ppPackageOrderService.helpOrder(orderId));
+    }
+
+    /**
+     * 获取订单详情
+     */
+    @GetMapping("/order/detail")
+    public CzgResult<PpPackageOrderDTO> getOrderDetail(Long orderId) {
+        return CzgResult.success(ppPackageOrderService.getOrderDetailById(orderId));
+    }
+}