Browse Source

fixed 卡券适用店铺

fushengqian 1 year ago
parent
commit
26e71398de

+ 3 - 0
fuint-application/src/main/java/com/fuint/common/dto/CouponDto.java

@@ -53,6 +53,9 @@ public class CouponDto implements Serializable {
     @ApiModelProperty("限制数量")
     @ApiModelProperty("限制数量")
     private Integer limitNum;
     private Integer limitNum;
 
 
+    @ApiModelProperty("适用店铺")
+    private String storeNames;
+
     @ApiModelProperty("是否领取")
     @ApiModelProperty("是否领取")
     private Boolean isReceive;
     private Boolean isReceive;
 
 

+ 10 - 4
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCouponController.java

@@ -6,10 +6,7 @@ import com.fuint.common.enums.CouponExpireTypeEnum;
 import com.fuint.common.param.CouponInfoParam;
 import com.fuint.common.param.CouponInfoParam;
 import com.fuint.common.param.CouponListParam;
 import com.fuint.common.param.CouponListParam;
 import com.fuint.common.param.CouponReceiveParam;
 import com.fuint.common.param.CouponReceiveParam;
-import com.fuint.common.service.CouponService;
-import com.fuint.common.service.MerchantService;
-import com.fuint.common.service.SettingService;
-import com.fuint.common.service.UserCouponService;
+import com.fuint.common.service.*;
 import com.fuint.common.util.DateUtil;
 import com.fuint.common.util.DateUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -64,6 +61,11 @@ public class ClientCouponController extends BaseController {
      */
      */
     private MerchantService merchantService;
     private MerchantService merchantService;
 
 
+    /**
+     * 店铺接口
+     */
+    private StoreService storeService;
+
     /**
     /**
      * 获取卡券列表数据
      * 获取卡券列表数据
      */
      */
@@ -165,6 +167,10 @@ public class ClientCouponController extends BaseController {
             }
             }
         }
         }
 
 
+        // 适用店铺
+        String storeNames = storeService.getStoreNames(couponInfo.getStoreIds());
+        couponDto.setStoreNames(storeNames);
+
         String baseImage = settingService.getUploadBasePath();
         String baseImage = settingService.getUploadBasePath();
         couponDto.setImage(baseImage + couponInfo.getImage());
         couponDto.setImage(baseImage + couponInfo.getImage());
         String effectiveDate = "";
         String effectiveDate = "";