浏览代码

修复反馈优惠券问题

Eric 2 年之前
父节点
当前提交
a649436755

+ 2 - 2
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInfoVO.java

@@ -289,10 +289,10 @@ public class CouponInfoVO {
                     throw new BizException("优惠券类型不能为空");
                 }
 
-                if (CouponTypeEnum.FULL_DISCOUNT == getCouponType()
+                /*if (CouponTypeEnum.FULL_DISCOUNT == getCouponType()
                         && Optional.ofNullable(getUseLimit()).map(BigDecimal::intValue).orElse(0) <= 0) {
                     throw new BizException("满减金额未设置");
-                }
+                }*/
 
                 if (Objects.isNull(getValidType())) {
                     throw new BizException("有效期类型不能为空");

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/CouponInfoMapper.xml

@@ -32,7 +32,7 @@
 
     <!--优惠券分页查询-->
     <select id="selectCouponPageInfo" resultType="com.yonge.cooleshow.biz.dal.vo.coupon.CouponInfoWrapper">
-        SELECT t1.id_, t1.name_, t1.client_type_, t1.category_, t1.coupon_type_, t1.status_, t1.updated_by_, t1.update_time_, t1.created_time_ FROM coupon_info t1
+        SELECT t1.id_, t1.name_, t1.client_type_, t1.category_, t1.coupon_type_, t1.inventory_, t1.status_, t1.updated_by_, t1.update_time_, t1.created_time_ FROM coupon_info t1
         <where>
             <if test="record.name != null">
                 AND t1.name_ LIKE '%${record.name}%'

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

@@ -76,6 +76,7 @@ public class CouponInfoController extends BaseController {
      * @return List<CouponInfoVO.CouponIssueStateStat>
      */
     @GetMapping("/statInfo")
+    @ApiOperation(value = "查询优惠券统计")
     public HttpResponseResult<List<CouponInfoVO.CouponStateStat>> findCouponStateStatInfo(
             @ApiParam(value = "优惠券类型") @RequestParam(value = "couponType", required = false) String couponType) {
 

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

@@ -76,6 +76,7 @@ public class CouponInfoController extends BaseController {
      * @return List<CouponInfoVO.CouponIssueStateStat>
      */
     @GetMapping("/statInfo")
+    @ApiOperation(value = "查询优惠券统计")
     public HttpResponseResult<List<CouponInfoVO.CouponStateStat>> findCouponStateStatInfo(
             @ApiParam(value = "优惠券类型") @RequestParam(value = "couponType", required = false) String couponType) {