Merge branch 'dev_v1.3.4_20220902' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.4_20220902

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/PmsProductAttributeCategoryServiceImpl.java

@@ -53,7 +53,9 @@ public class PmsProductAttributeCategoryServiceImpl implements PmsProductAttribu
     @Override
     public List<PmsProductAttributeCategory> getList(Integer pageSize, Integer pageNum) {
         PageHelper.startPage(pageNum,pageSize);
-        return productAttributeCategoryMapper.selectByExample(new PmsProductAttributeCategoryExample());
+        PmsProductAttributeCategoryExample pmsProductAttributeCategoryExample = new PmsProductAttributeCategoryExample();
+        pmsProductAttributeCategoryExample.setOrderByClause("sort desc");
+        return productAttributeCategoryMapper.selectByExample(pmsProductAttributeCategoryExample);
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/CouponIssueQueryInfo.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import org.joda.time.DateTime;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * Description
@@ -57,9 +58,20 @@ public class CouponIssueQueryInfo implements Serializable {
     // 可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券
     private CouponCategoryEnum couponCategory;
 
+    // 可用品类
+    private List<CouponCategoryEnum> couponCategoryList;
+
     // 过期时间
     private Long expiredTime = DateTime.now().getMillis();
 
+    public List<CouponCategoryEnum> getCouponCategoryList() {
+        return couponCategoryList;
+    }
+
+    public void setCouponCategoryList(List<CouponCategoryEnum> couponCategoryList) {
+        this.couponCategoryList = couponCategoryList;
+    }
+
     public Long getExpiredTime() {
         return expiredTime;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponIssueMapper.xml

@@ -64,6 +64,12 @@
             <if test="query.couponCategory != null">
                 and #{query.couponCategory} = cou.category_
             </if>
+            <if test="query.couponCategoryList != null and query.couponCategoryList.size() != 0">
+                and cou.category_ in
+                <foreach collection="query.couponCategoryList" open="(" close=")" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="query.couponType != null">
                 and #{query.couponType} = cou.coupon_type_
             </if>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/coupon/CouponInfoController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -60,6 +62,17 @@ public class CouponInfoController extends BaseController {
 
         request.setUserId(user.getId());
         request.setClientType(ClientEnum.STUDENT.getCode());
+
+
+        // 用户端的券类型 都包含全品类券
+        if (request.getCouponCategory() != null) {
+            List<CouponCategoryEnum> couponCategoryList = new ArrayList<>();
+            couponCategoryList.add(CouponCategoryEnum.UNIVERSAL);
+            couponCategoryList.add(request.getCouponCategory());
+            request.setCouponCategory(null);
+            request.setCouponCategoryList(couponCategoryList);
+        }
+
         IPage<CouponIssueWrapper> couponIssueWrapperIPage = couponIssueService.queryCouponIssueInfo(
                 PageUtil.getPage(request), CouponIssueQueryInfo.from(request.jsonString()));
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/io/request/CouponInfoVO.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.student.io.request;
 
 import com.alibaba.fastjson.JSON;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 优惠券信息
@@ -37,9 +39,19 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
 
-        @ApiModelProperty("使用状态")
+
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期  WITHDRAW 撤回")
         private String useState;
 
+
+        @ApiModelProperty("可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券")
+        private CouponCategoryEnum couponCategory;
+
+
+        // 可用品类
+        @ApiModelProperty(hidden = true)
+        private List<CouponCategoryEnum> couponCategoryList;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/coupon/CouponInfoController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -60,6 +62,16 @@ public class CouponInfoController extends BaseController {
 
         request.setUserId(user.getId());
         request.setClientType(ClientEnum.TEACHER.getCode());
+
+        // 用户端的券类型 都包含全品类券
+        if (request.getCouponCategory() != null) {
+            List<CouponCategoryEnum> couponCategoryList = new ArrayList<>();
+            couponCategoryList.add(CouponCategoryEnum.UNIVERSAL);
+            couponCategoryList.add(request.getCouponCategory());
+            request.setCouponCategory(null);
+            request.setCouponCategoryList(couponCategoryList);
+        }
+
         IPage<CouponIssueWrapper> couponIssueWrapperIPage = couponIssueService.queryCouponIssueInfo(
                 PageUtil.getPage(request), CouponIssueQueryInfo.from(request.jsonString()));
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/io/request/CouponInfoVO.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.teacher.io.request;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
+import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
@@ -13,6 +14,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 优惠券信息
@@ -38,9 +40,18 @@ public class CouponInfoVO {
         @ApiModelProperty("优惠券类型: FULL_DISCOUNT(满减券) VOUCHER(代金券) ")
         private String couponType;
 
-        @ApiModelProperty("使用状态")
+        @ApiModelProperty("使用状态 USED:已使用 USABLE：未使用 EXPIRED：过期  WITHDRAW 撤回")
         private String useState;
 
+
+        @ApiModelProperty("可用品类 UNIVERSAL：全场通用 VIP：小酷Ai PIANO：云酷琴房 MALL：商场购物券 MUSIC：单曲点播券 SPARRING：陪练课购买券 LIVE：直播课购买券  VIDEO：视频课购买券")
+        private CouponCategoryEnum couponCategory;
+
+
+        // 可用品类
+        @ApiModelProperty(hidden = true)
+        private List<CouponCategoryEnum> couponCategoryList;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }