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

Dev

See merge request quanshu/mp-server!237

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);

mp-common/src/main/java/com/qs/mp/common/enums/ErrorCodeEnum.java

@@ -27,7 +27,7 @@ public enum ErrorCodeEnum {
   ERROR_CODE_1018(1018, "无权限查看"),
   ERROR_CODE_1019(1019, "盲票未付款"),
   ERROR_CODE_1020(1020, "库存不足"),
-  ERROR_CODE_1021(1021, "盲豆余额不足"),
+  ERROR_CODE_1021(1021, "芒豆余额不足"),
   ;
   private int code;
   private String msg;

mp-common/src/main/java/com/qs/mp/common/enums/PrizeStorageInTypeEnum.java

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.IEnum;
 public enum PrizeStorageInTypeEnum implements IEnum<Integer> {
 
   TICKET_CASHED(1, "奖品兑奖"),
-  COIN_EXCHANGE(2, "盲豆兑换");
+  COIN_EXCHANGE(2, "芒豆兑换");
 
 
   private final int value;

mp-common/src/main/java/com/qs/mp/common/enums/TicketPrizeTypeEnum.java

@@ -15,7 +15,7 @@ public enum TicketPrizeTypeEnum implements IEnum<String> {
 
   GOODS("goods", "商品"),
   COUPON("coupon", "优惠券"),
-  COIN("coin", "盲豆");
+  COIN("coin", "芒豆");
 
   private final String value;
   private final String desc;

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -152,7 +152,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
           awardsPrize.setPicUrl(coupon.getPicUrl());
           awardsPrize.setValue(coupon.getDiscount());
         } else {
-          awardsPrize.setTitle("盲豆");
+          awardsPrize.setTitle("芒豆");
           awardsPrize.setPicUrl("md.jpeg");
         }
         awardsPrizeList.add(awardsPrize);

mp-service/src/main/java/com/qs/mp/user/service/impl/UserCoinServiceImpl.java

@@ -46,7 +46,7 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
     UserCoinLog userCoinLog = new UserCoinLog();
     userCoinLog.setUserId(userId);
     userCoinLog.setType(CoinLogTypeEnum.PRIZE);
-    userCoinLog.setMoney(userCoin.getCoin() + logCoin);
+    userCoinLog.setMoney(userCoin.getCoin());
     userCoinLog.setLogMoney(logCoin);
     userCoinLog.setIncomeExpense(CoinLogTypeEnum.INCOME);
     userCoinLog.setLogText("盲票奖品");
@@ -67,7 +67,7 @@ public class UserCoinServiceImpl extends ServiceImpl<UserCoinMapper, UserCoin> i
     UserCoinLog userCoinLog = new UserCoinLog();
     userCoinLog.setUserId(userId);
     userCoinLog.setType(CoinLogTypeEnum.EXCHANGE);
-    userCoinLog.setMoney(userCoin.getCoin() - logCoin);
+    userCoinLog.setMoney(userCoin.getCoin());
     userCoinLog.setLogMoney(0 - logCoin);
     userCoinLog.setIncomeExpense(CoinLogTypeEnum.EXPENSES);
     userCoinLog.setLogText("兑换商品");