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

Dev

See merge request quanshu/mp-server!573

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

@@ -119,8 +119,9 @@ public class GoodsMgrController extends BaseApiController {
     queryWrapper.lambda().eq(null != queryParam.getExchangeShow(), Goods::getExchangeShow,
         queryParam.getExchangeShow());
     // 商品分类
-    queryWrapper.lambda()
-        .eq(null != queryParam.getCategoryId(), Goods::getCategoryId, queryParam.getCategoryId());
+    if (!CollectionUtils.isEmpty(queryParam.getCategoryIdList())) {
+      queryWrapper.lambda().in(Goods::getCategoryId, queryParam.getCategoryIdList());
+    }
     // 标签过滤的商品ID
     queryWrapper.lambda().in(null != queryParam.getTagId(), Goods::getGoodsId, goodsIds);
     queryWrapper.lambda().eq(Goods::getIsDeleted, 0);

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

@@ -236,6 +236,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<UserDeliverOrder>();
 		queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id", queryParam.getOrderId());
 		queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`status`", queryParam.getStatus());
+		queryWrapper.eq(null != queryParam && null != queryParam.getResource(), "t1.`resource`", queryParam.getResource());
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getNickName()), "t2.nick_name", queryParam.getNickName());

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

@@ -18,6 +18,8 @@ import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.security.handle.HostHolder;
+import com.qs.mp.system.domain.SysUser;
+import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.user.domain.MarketingHitPrize;
 import com.qs.mp.user.domain.MarketingUserCode;
 import com.qs.mp.user.domain.param.MarketingHelpParam;
@@ -78,6 +80,27 @@ public class MarketingController extends BaseApiController {
     @Autowired
     private DistributedLocker distributedLocker;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @PostMapping("/userInfo/{inviteCode}")
+    @ApiOperation("通过邀请码获取用户信息")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "成功", response = SysUser.class)
+    )
+    public AjaxResult userInfoByInviteCode(@PathVariable("inviteCode") String inviteCode) {
+        if (StringUtils.isBlank(inviteCode)) {
+            return AjaxResult.error("邀请码不能为空");
+        }
+
+        Long userId = MarketingUtils.decodeInviteCode(inviteCode);
+        SysUser sysUser = sysUserService.selectUserById(userId);
+        if (Objects.isNull(sysUser)) {
+            return AjaxResult.error("邀请码无效");
+        }
+        return AjaxResult.success(sysUser);
+    }
+
     @PostMapping("/help")
     @ApiOperation("活动助力")
     public AjaxResult help(@RequestBody MarketingHelpParam marketingHelpParam) {

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

@@ -122,7 +122,9 @@ public class UserExchangeController extends BaseApiController {
           @DynamicParameter(name = "categoryId",value = "分类id",dataTypeClass = Long.class),
           @DynamicParameter(name = "tagIds",value = "标签id",dataTypeClass = String.class),
           @DynamicParameter(name = "startPrice",value = "开始价格",dataTypeClass = Integer.class),
-          @DynamicParameter(name = "endPrice",value = "结束价格",dataTypeClass = Integer.class)
+          @DynamicParameter(name = "endPrice",value = "结束价格",dataTypeClass = Integer.class),
+          @DynamicParameter(name = "categoryIdList",value = "分类id列表",dataTypeClass = List.class),
+          @DynamicParameter(name = "goodsName",value = "商品名称",dataTypeClass = String.class),
   })
   @ApiResponses(
           @ApiResponse(code = 200, message = "success" , response = GoodsListVO.class)
@@ -132,6 +134,8 @@ public class UserExchangeController extends BaseApiController {
     String tagIds = param.getString("tagIds");
     Integer startPrice = param.getInteger("startPrice");
     Integer endPrice = param.getInteger("endPrice");
+    List<Long> categoryIdList = param.getJSONArray("categoryIdList").toJavaList(Long.class);
+    String goodsName = param.getString("goodsName");
 
     List<Long> goodsIds = new ArrayList<>();
     if (StringUtils.isNotBlank(tagIds)) {
@@ -145,6 +149,8 @@ public class UserExchangeController extends BaseApiController {
         .eq(null != categoryId && 0 != categoryId, Goods::getCategoryId, categoryId)
         .ge(null != startPrice && 0 != startPrice, Goods::getExchangePrice, startPrice)
         .le(null != endPrice && 0 != endPrice, Goods::getExchangePrice, endPrice)
+        .in(!CollectionUtils.isEmpty(goodsIds), Goods::getCategoryId, categoryIdList)
+        .like(StringUtils.isNotBlank(goodsName), Goods::getTitle, goodsName)
         .eq(Goods::getStatus, GoodsStatusEnum.PUT_ON)
         .eq(Goods::getExchangeShow, 1)
         .in(!CollectionUtils.isEmpty(goodsIds), Goods::getGoodsId, goodsIds)

mp-framework/src/main/java/com/qs/mp/framework/config/SecurityConfig.java

@@ -142,7 +142,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/api/v1/mp/user/exchange/category/list",
                     "/api/v1/mp/user/exchange/activity/list",
                     "/api/v1/mp/user/marketing/list",
-                    "/api/v1/mp/user/marketing/detail/*"
+                    "/api/v1/mp/user/marketing/detail/*",
+                    "/api/v1/mp/user/marketing/userInfo/*"
                 ).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsQueryParam.java

@@ -11,6 +11,8 @@ import com.qs.mp.common.enums.GoodsStatusEnum;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @describe 商品库实体类
  * @auther quanshu
@@ -26,6 +28,9 @@ public class GoodsQueryParam {
 	@ApiModelProperty(value = "分类ID", required = false)
 	private Long categoryId;
 
+	@ApiModelProperty(value = "分类ID列表", required = false)
+	private List<Long> categoryIdList;
+
 	@ApiModelProperty(value = "标签ID", required = false)
 	private Long tagId;