刘俊驰 4 months ago
parent
commit
bc8c978bb0

+ 4 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/coupon/CouponInfoController.java

@@ -29,8 +29,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 优惠券信息
@@ -67,8 +69,9 @@ public class CouponInfoController extends BaseController {
         // 用户端的券类型 都包含全品类券
         if (request.getCouponCategory() != null) {
             List<CouponCategoryEnum> couponCategoryList = new ArrayList<>();
+            List<CouponCategoryEnum> collect = Arrays.stream(request.getCouponCategory().split(",")).map(CouponCategoryEnum::valueOf).collect(Collectors.toList());
             couponCategoryList.add(CouponCategoryEnum.UNIVERSAL);
-            couponCategoryList.add(request.getCouponCategory());
+            couponCategoryList.addAll(collect);
             request.setCouponCategory(null);
             request.setCouponCategoryList(couponCategoryList);
         }

+ 1 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/student/io/request/CouponInfoVO.java

@@ -46,7 +46,7 @@ public class CouponInfoVO {
 
 
         @ApiModelProperty("可用品类 UNIVERSAL:全场通用 VIP:小酷Ai PIANO:云酷琴房 MALL:商场购物券 MUSIC:单曲点播券 SPARRING:趣纠课购买券 LIVE:直播课购买券  VIDEO:视频课购买券")
-        private CouponCategoryEnum couponCategory;
+        private String couponCategory;
 
 
         // 可用品类

+ 6 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/coupon/CouponInfoController.java

@@ -29,8 +29,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 优惠券信息
@@ -63,11 +65,14 @@ public class CouponInfoController extends BaseController {
         request.setUserId(user.getId());
         request.setClientType(ClientEnum.TEACHER.getCode());
 
+
+
         // 用户端的券类型 都包含全品类券
         if (request.getCouponCategory() != null) {
             List<CouponCategoryEnum> couponCategoryList = new ArrayList<>();
+            List<CouponCategoryEnum> collect = Arrays.stream(request.getCouponCategory().split(",")).map(CouponCategoryEnum::valueOf).collect(Collectors.toList());
             couponCategoryList.add(CouponCategoryEnum.UNIVERSAL);
-            couponCategoryList.add(request.getCouponCategory());
+            couponCategoryList.addAll(collect);
             request.setCouponCategory(null);
             request.setCouponCategoryList(couponCategoryList);
         }

+ 1 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/io/request/CouponInfoVO.java

@@ -45,7 +45,7 @@ public class CouponInfoVO {
 
 
         @ApiModelProperty("可用品类 UNIVERSAL:全场通用 VIP:小酷Ai PIANO:云酷琴房 MALL:商场购物券 MUSIC:单曲点播券 SPARRING:趣纠课购买券 LIVE:直播课购买券  VIDEO:视频课购买券")
-        private CouponCategoryEnum couponCategory;
+        private String couponCategory;
 
         @ApiModelProperty("订单金额")
         private BigDecimal amount;