Merge remote-tracking branch 'origin/master'

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FavoritesItemsRelationMapper.xml

@@ -132,6 +132,14 @@
     values (#{favoritesId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT}, 
       #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
+  <insert id="batchInsert" parameterType="com.wwdz.ch.db.domain.FavoritesItemsRelation">
+    insert into favorites_items_relation (favorites_id, user_id, item_id,
+    add_time, update_time)
+  values
+  <foreach collection="list" item="item" separator=",">
+    (#{item.favoritesId,jdbcType=BIGINT}, #{item.userId,jdbcType=BIGINT}, #{item.itemId,jdbcType=BIGINT}, #{item.addTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP})
+  </foreach>
+  </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.FavoritesItemsRelation">
     insert into favorites_items_relation
     <trim prefix="(" suffix=")" suffixOverrides=",">

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -30,7 +30,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 		registry.addInterceptor(loginInterceptor())
 				.addPathPatterns("/**")
 				.excludePathPatterns("/*.html", "/**/*.html", "/**/*.css", "/**/*.js"
-						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login");
+						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login", "/wx/user/fillCode");
 //						, "/wx/item/page", "/wx/item/info", "/wx/item/findNames"
 //						, "/wx/favorites/info", "/wx/favorites/itemList"
 //						, "/wx/keyword/recommend", "/wx/queryPrice/**");

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

@@ -68,9 +68,6 @@ public class LoginInterceptor implements HandlerInterceptor {
                 loginType = 2;
             } else {
                 if (userTokenManager.checkLogin(token)) {
-                    if (StringUtils.equals(url, "/wx/user/fillCode")) {
-                        return true;
-                    }
                     User user = userDao.queryById(userTokenManager.getUserId(token));
                     if (!(Boolean) inviteRecordService.isExisted(user.getMobile()).getData()) {
                         loginType = 3;

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserController.java

@@ -3,9 +3,11 @@ package com.wwdz.ch.wx.web;
 
 import com.alibaba.fastjson.JSON;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.InviteRecordRequestDto;
 import com.wwdz.ch.wx.constant.CacheCodeConstants;
 import com.wwdz.ch.wx.constant.LoginTypeEnum;
 import com.wwdz.ch.wx.entity.request.UserRequestDto;
+import com.wwdz.ch.wx.service.InviteRecordService;
 import com.wwdz.ch.wx.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -31,6 +33,8 @@ public class WxUserController {
     private static final Logger logger = LoggerFactory.getLogger(WxUserController.class);
     @Autowired
     private UserService userService;
+    @Autowired
+    private InviteRecordService inviteRecordService;
 
 
     @ApiOperation(value = "快捷登录")
@@ -98,7 +102,7 @@ public class WxUserController {
     @ApiOperation(value = "手机验证码登录")
     @PostMapping("/loginByMobile")
     public Result loginByMobile(@RequestBody UserRequestDto dto, HttpServletRequest request) {
-        logger.info("【请求开始】手机号登录,请求参数,kl_data:{}", JSON.toJSONString(dto));
+        logger.info("【请求开始】手机号登录,请求参数:{}", JSON.toJSONString(dto));
         if (StringUtils.isBlank(dto.getMobile())) {
             return Result.failed("手机号不能为空");
         }
@@ -108,6 +112,22 @@ public class WxUserController {
         return userService.loginByMobile(dto, request);
     }
 
+    @ApiOperation(value = "填写邀请码")
+    @PostMapping("/fillCode")
+    public Result fillCode(@RequestBody InviteRecordRequestDto dto) {
+        logger.info("【请求开始】填写邀请码,请求参数:{}", JSON.toJSONString(dto));
+        if (Objects.isNull(dto.getInvitee()) || dto.getInvitee().equals(0L)) {
+            return Result.failed("受邀人id不能为空");
+        }
+        if (StringUtils.isBlank(dto.getInviteePhone())) {
+            return Result.failed("受邀人手机号不能为空");
+        }
+        if (StringUtils.isBlank(dto.getInvitationCode())) {
+            return Result.failed("请填写邀请码");
+        }
+        return inviteRecordService.create(dto);
+    }
+
     @ApiOperation(value = "修改个性签名")
     @PostMapping("/updateProfile")
     public Result updateProfile(@RequestBody UserRequestDto dto) {