Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!1025

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelApplyController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Evan
  * @date 2023/3/15
  */
-@Api("创客申请管理API")
+@Api(tags = "创客申请管理API")
 @RestController
 @RequestMapping("/api/v1/mp/admin/channel/apply")
 public class ChannelApplyController extends BaseApiController {

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -31,8 +31,11 @@ import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.CouponStatusEnum;
 import com.qs.mp.common.enums.CouponUseAreaEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.UserCouponStatusEnum;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.service.ISysUserService;
+import com.qs.mp.user.domain.UserCoupon;
+import com.qs.mp.user.service.IUserCouponService;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -88,6 +91,9 @@ public class CouponMgrController extends BaseApiController {
     @Autowired
     private MapperFacade mapperFacade;
 
+
+    @Autowired
+    private IUserCouponService userCouponService;
     /**
      * 获取代金券列表信息，支持翻页
      *
@@ -183,6 +189,12 @@ public class CouponMgrController extends BaseApiController {
                 couponVO.setChannelList(list);
             }
         }
+
+        // 查询已使用数量
+        int count = userCouponService.count(new LambdaQueryWrapper<UserCoupon>()
+            .eq(UserCoupon::getCouponId, couponId)
+            .eq(UserCoupon::getStatus, UserCouponStatusEnum.USED));
+        couponVO.setUsedQty(count);
         return AjaxResult.success(couponVO);
     }
 

mp-service/src/main/java/com/qs/mp/admin/domain/vo/CouponVO.java

@@ -157,6 +157,9 @@ public class CouponVO {
     @ApiModelProperty("已发放量")
     private Integer distributeQty;
 
+    @ApiModelProperty("已使用数量")
+    private Integer usedQty;
+
     /**
      * 创建时间
      */