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

标签数判断

See merge request quanshu/mp-server!331

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

@@ -2,50 +2,34 @@ package com.qs.mp.web.controller.api.user;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.ExchangeBanner;
 import com.qs.mp.admin.domain.Goods;
 import com.qs.mp.admin.domain.GoodsCategory;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.admin.domain.GoodsTag;
 import com.qs.mp.admin.domain.GoodsTagRel;
-import com.qs.mp.admin.domain.Ticket;
-import com.qs.mp.admin.domain.TicketAwardsPrize;
-import com.qs.mp.admin.domain.TicketBox;
-import com.qs.mp.admin.domain.param.TicketBoxParam;
-import com.qs.mp.admin.domain.param.TicketParam;
 import com.qs.mp.admin.domain.vo.GoodsListVO;
 import com.qs.mp.admin.domain.vo.GoodsVO;
-import com.qs.mp.admin.domain.vo.TicketBoxListVO;
-import com.qs.mp.admin.domain.vo.TicketBoxVO;
-import com.qs.mp.admin.domain.vo.TicketVO;
 import com.qs.mp.admin.service.IExchangeBannerService;
 import com.qs.mp.admin.service.IGoodsCategoryService;
 import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
 import com.qs.mp.admin.service.IGoodsTagRelService;
 import com.qs.mp.admin.service.IGoodsTagService;
-import com.qs.mp.admin.service.ITicketAwardsPrizeService;
-import com.qs.mp.admin.service.ITicketBoxService;
-import com.qs.mp.admin.service.ITicketService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.GoodsStatusEnum;
-import com.qs.mp.common.enums.TicketBoxStatusEnum;
-import com.qs.mp.common.enums.TicketStatusEnum;
-import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.user.domain.param.ExchangeOrderParam;
 import com.qs.mp.user.service.IUserExchangeOrderService;
-import com.qs.mp.user.service.IUserHitPrizeService;
-import com.qs.mp.user.service.IUserTicketOrderItemService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
@@ -94,7 +78,7 @@ public class UserExchangeController extends BaseApiController {
    * 商品列表
    */
   @PostMapping("/goods/list")
-  @ApiOperation(value = "商品列表" , notes = "获取所有可兑换商品")
+  @ApiOperation(value = "商品列表", notes = "获取所有可兑换商品")
   public TableDataInfo list(@RequestBody JSONObject param) {
     Long categoryId = param.getLong("categoryId");
     String tagIds = param.getString("tagIds");
@@ -103,8 +87,9 @@ public class UserExchangeController extends BaseApiController {
 
     List<Long> goodsIds = new ArrayList<>();
     if (StringUtils.isNotBlank(tagIds)) {
-      List<GoodsTagRel> goodsTagRelList = goodsTagRelService.list(new LambdaQueryWrapper<GoodsTagRel>()
-          .in(GoodsTagRel::getTagId, Arrays.asList(tagIds.split(","))));
+      List<GoodsTagRel> goodsTagRelList = goodsTagRelService.list(
+          new LambdaQueryWrapper<GoodsTagRel>()
+              .in(GoodsTagRel::getTagId, Arrays.asList(tagIds.split(","))));
       goodsIds = goodsTagRelList.stream().map(GoodsTagRel::getGoodsId).collect(Collectors.toList());
     }
     startPage();
@@ -126,7 +111,7 @@ public class UserExchangeController extends BaseApiController {
    * 查看商品详情
    */
   @PostMapping("/goods/detail")
-  @ApiOperation(value = "查看商品详情" , notes = "根据商品ID，获取商品信息")
+  @ApiOperation(value = "查看商品详情", notes = "根据商品ID，获取商品信息")
   public AjaxResult getInfo(@RequestBody Goods param) {
     if (null == param.getGoodsId() || 0 == param.getGoodsId()) {
       return AjaxResult.error("参数异常，商品ID缺失");
@@ -139,7 +124,7 @@ public class UserExchangeController extends BaseApiController {
     queryWrapper.eq(GoodsSku::getGoodsId, goods.getGoodsId());
     queryWrapper.orderByDesc(GoodsSku::getCreatedTime);
     List<GoodsSku> skuList = goodsSkuService.list(queryWrapper);
-    if(null != skuList && skuList.size() > 0) {
+    if (null != skuList && skuList.size() > 0) {
       goodsVo.setSkuList(skuList);
     }
     return AjaxResult.success(goodsVo);
@@ -149,14 +134,15 @@ public class UserExchangeController extends BaseApiController {
    * 提交兑换订单
    */
   @PostMapping("/submit")
-  @ApiOperation(value = "提交兑换订单" , notes = "提交兑换订单")
+  @ApiOperation(value = "提交兑换订单", notes = "提交兑换订单")
   public AjaxResult submit(@RequestBody ExchangeOrderParam param) {
     Long userId = SecurityUtils.getUserId();
     if (null == param.getGoodsId() || 0 == param.getGoodsId() || null == param.getOrderNum()
         || param.getOrderNum() == 0) {
       return AjaxResult.error("参数缺失");
     }
-    boolean result = userExchangeOrderService.exchange(userId, param.getGoodsId(), param.getSkuId(), param.getOrderNum());
+    boolean result = userExchangeOrderService.exchange(userId, param.getGoodsId(), param.getSkuId(),
+        param.getOrderNum());
     if (!result) {
       return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1021);
     }
@@ -167,11 +153,12 @@ public class UserExchangeController extends BaseApiController {
    * 查询banner列表
    */
   @PostMapping("/banner/list")
-  @ApiOperation(value = "查询banner列表" , notes = "banner列表")
+  @ApiOperation(value = "查询banner列表", notes = "banner列表")
   public AjaxResult listBanner(@RequestBody JSONObject param) {
     String location = param.getString("location");
-    List<ExchangeBanner> bannerList = exchangeBannerService.list(new LambdaQueryWrapper<ExchangeBanner>()
-        .eq(ExchangeBanner::getLocation, location).orderByDesc(ExchangeBanner::getSort));
+    List<ExchangeBanner> bannerList = exchangeBannerService.list(
+        new LambdaQueryWrapper<ExchangeBanner>()
+            .eq(ExchangeBanner::getLocation, location).orderByDesc(ExchangeBanner::getSort));
     return AjaxResult.success(bannerList);
   }
 
@@ -179,10 +166,11 @@ public class UserExchangeController extends BaseApiController {
    * 查询分类列表
    */
   @PostMapping("/category/list")
-  @ApiOperation(value = "查询分类列表" , notes = "分类列表")
+  @ApiOperation(value = "查询分类列表", notes = "分类列表")
   public AjaxResult listCategory(@RequestBody JSONObject param) {
-    List<GoodsCategory> categoryList = goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>()
-        .eq(GoodsCategory::getIsShow, 1).orderByDesc(GoodsCategory::getSort));
+    List<GoodsCategory> categoryList = goodsCategoryService.list(
+        new LambdaQueryWrapper<GoodsCategory>()
+            .eq(GoodsCategory::getIsShow, 1).orderByDesc(GoodsCategory::getSort));
     return AjaxResult.success(categoryList);
   }
 
@@ -190,10 +178,19 @@ public class UserExchangeController extends BaseApiController {
    * 查询标签列表
    */
   @PostMapping("/activity/list")
-  @ApiOperation(value = "查询标签列表" , notes = "标签列表")
+  @ApiOperation(value = "查询标签列表", notes = "标签列表")
   public AjaxResult listActivity(@RequestBody JSONObject param) {
     List<GoodsTag> tagList = goodsTagService.list(new LambdaQueryWrapper<GoodsTag>()
         .eq(GoodsTag::getIsShow, 1).orderByDesc(GoodsTag::getSort));
+    Iterator<GoodsTag> iterator = tagList.iterator();
+    while (iterator.hasNext()) {
+      GoodsTag next = iterator.next();
+      int cnt = goodsTagRelService.count(
+          new LambdaQueryWrapper<GoodsTagRel>().eq(GoodsTagRel::getTagId, next.getTagId()));
+      if (cnt < 2) {
+        iterator.remove();
+      }
+    }
     return AjaxResult.success(tagList);
   }