奖品库数量

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

@@ -68,6 +68,9 @@ public class ChannelCouponVerifyController extends BaseApiController {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>()
         .eq(UserCoupon::getVerifyCode, verifyCode));
+    if (null == userCoupon) {
+      return error("券码非法");
+    }
     AjaxResult result = checkCoupon(verifyCode, channelId, userCoupon);
     if (null != result) {
       return result;
@@ -116,6 +119,9 @@ public class ChannelCouponVerifyController extends BaseApiController {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>()
         .eq(UserCoupon::getVerifyCode, verifyCode));
+    if (null == userCoupon) {
+      return error("券码非法");
+    }
     AjaxResult result = checkCoupon(verifyCode, channelId, userCoupon);
     if (null != result) {
       return result;
@@ -136,7 +142,7 @@ public class ChannelCouponVerifyController extends BaseApiController {
     List<ChannelCouponVerifyLog> verifyLogList = channelCouponVerifyLogService.list(
         new LambdaQueryWrapper<ChannelCouponVerifyLog>()
             .eq(ChannelCouponVerifyLog::getChannelId, channelId)
-            .orderByDesc(ChannelCouponVerifyLog::getCreatedTime));
+            .orderByDesc(ChannelCouponVerifyLog::getVerifyTime));
     return getDataTable(verifyLogList);
   }
 

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

@@ -9,6 +9,8 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
+import com.qs.mp.common.enums.UserCouponStatusEnum;
+import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.user.domain.UserCoin;
 import com.qs.mp.user.domain.UserCoinLog;
 import com.qs.mp.user.domain.UserCoupon;
@@ -124,10 +126,15 @@ public class UserMineController extends BaseApiController {
     Long userId = SecurityUtils.getLoginUser().getUserId();
     Map<String, Object> storageMap = userPrizeStorageService.getMap(
         new QueryWrapper<UserPrizeStorage>()
-            .select("IFNULL(goods_num,0) as total")
+            .select("count(IFNULL(goods_num,0)) as total")
             .eq("user_id", userId).eq("status", PrizeStorageStatusEnum.NOT_DISTRIBUTED));
+    int couponCnt = userCouponService.count(new LambdaQueryWrapper<UserCoupon>()
+            .eq(UserCoupon::getUserId, userId)
+        .eq(UserCoupon::getStatus, UserCouponStatusEnum.UNUSED)
+        .le(UserCoupon::getValidStart, DateUtils.getToday())
+        .ge(UserCoupon::getValidEnd, DateUtils.getToday()));
     JSONObject result = new JSONObject();
-    result.put("prizeNum", Integer.valueOf(String.valueOf(null != storageMap ? storageMap.get("total") : 0)));
+    result.put("prizeNum", Integer.valueOf(String.valueOf(null != storageMap ? storageMap.get("total") : 0)) + couponCnt);
 
     int ticketNum = userTicketOrderItemService.countMyTicket(userId, TicketStatusEnum.ACTIVATED);
     result.put("ticketNum", ticketNum);