代金券、优惠券提交

alien-store-platform/src/main/java/shop/alien/storeplatform/controller/LifeCouponPlatformController.java

@@ -10,20 +10,14 @@ import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.EssentialHolidayComparison;
 import shop.alien.entity.store.LifeCoupon;
-import shop.alien.entity.store.StoreGroupInfo;
 import shop.alien.entity.store.UserLoginInfo;
-import shop.alien.entity.store.vo.LifeCouponStatusVo;
-import shop.alien.entity.store.vo.LifeDiscountCouponVo;
-import shop.alien.entity.storePlatform.vo.LifeCouponPlatformDto;
 import shop.alien.entity.storePlatform.vo.LifeCouponPlatformVo;
-import shop.alien.entity.storePlatform.vo.LifeDiscountCouponPlatformVo;
+import shop.alien.entity.storePlatform.vo.DiscountCouponPlatformVo;
 import shop.alien.storeplatform.service.LifeCouponPlatformService;
 import shop.alien.storeplatform.service.LifeDiscountCouponPlatformService;
 import shop.alien.util.common.TokenInfo;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.Map;
-
 /**
  * 优惠券管理控制器（平台端）
  * 提供优惠券相关的管理接口，包括优惠券的创建、更新、删除、查询、核销等功能
@@ -237,13 +231,13 @@ public class LifeCouponPlatformController {
 
     @ApiOperation("代金劵/优惠券列表")
     @PostMapping("/getCouponList")
-    private R<LifeDiscountCouponPlatformVo> getCouponList(@ApiIgnore @TokenInfo UserLoginInfo userLoginInfo,
-                                                          @RequestBody LifeCouponPlatformVo lifeCouponPlatformVo) {
+    private R<DiscountCouponPlatformVo> getCouponList(@ApiIgnore @TokenInfo UserLoginInfo userLoginInfo,
+                                                      @RequestBody LifeCouponPlatformVo lifeCouponPlatformVo) {
         log.info("LifeCouponController.getCouponList?lifeCouponPlatformVo={}", lifeCouponPlatformVo);
         if (StringUtils.isBlank(lifeCouponPlatformVo.getStoreId())) {
             return R.data(null, "当前用户未入住！！！");
         }
-        LifeDiscountCouponPlatformVo vo = new LifeDiscountCouponPlatformVo();
+        DiscountCouponPlatformVo vo = new DiscountCouponPlatformVo();
         if (lifeCouponPlatformVo.getCouponType() == 1) {
             vo.setCouponList(lifeCouponService.getCouponList(lifeCouponPlatformVo.getPageNum(), lifeCouponPlatformVo.getPageSize(), lifeCouponPlatformVo.getStoreId(),
                     lifeCouponPlatformVo.getStatus(), lifeCouponPlatformVo.getName()));