Merge remote-tracking branch 'origin/pre' into dev-sweet

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

@@ -23,6 +23,15 @@ public interface IAdamUserService {
      */
     AdamUserInfoVo register(String mobile);
 
+    /**
+     * 手机号注册
+     *
+     * @param mobile
+     * @param isComplete 是否标记为已完善状态[0-未完善｜1-已完善]
+     * @return AdamUserInfoVo
+     */
+    AdamUserInfoVo register(String mobile, int isComplete);
+
     /**
      * 第三方账号注册
      *

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java

@@ -2,26 +2,25 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
-import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
-import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
+import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.service.AdamRdmService;
+import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.UserPathDto;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.util.List;
 
 @ApiSupport(order = 10080)
@@ -33,8 +32,31 @@ import java.util.List;
 public class AdamRscController {
     @Autowired
     AdamRdmService adamRdmService;
+    @Autowired
+    IAdamUserService adamUserService;
+
 
     @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "@API:手机号注册", notes = "用于小程序活动用户注册，不登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+    })
+    @PostMapping(value = {"reg/mobile"})
+    public void registerByMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
+                                 @RequestParam String mobile) {
+        AdamUserInfoVo userInfoVo;
+        String uid = adamRdmService.getUidByMobile(mobile);
+        if (StringUtils.isEmpty(uid)) {
+            userInfoVo = adamUserService.register(mobile, 1);
+            log.info(UserPathDto.setData("注册", mobile, userInfoVo));
+        } else {
+//            userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+            log.info(UserPathDto.setData("已注册", mobile, uid));
+        }
+//        return ResponseDto.success(userInfoVo);
+    }
+
+    @ApiOperationSupport(order = 20)
     @ApiOperation(value = "@API:入场人列表", notes = "查取用户指定入场人列表")
     @GetMapping("inquire/enters")
     public ResponseDto<List<AdamEntersVo>> querysForDepth(@NotBlank(message = "入场人ID不能为空（多个ID以,分隔）") @RequestParam String entersIds,
@@ -43,7 +65,7 @@ public class AdamRscController {
         return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
     }
 
-    @ApiOperationSupport(order = 20)
+    @ApiOperationSupport(order = 30)
     @ApiOperation(value = "@API:票务下单所需信息查询", notes = "包括是否会员、收货地址及入场人信息")
     @GetMapping("inquire/of_buy_ticket")
     public ResponseDto<AdamRscPolymer01Vo> queryForBuyTicket(@RequestParam(required = false) String addressId,

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -61,6 +61,11 @@ public class AdamUserServiceImpl implements IAdamUserService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public AdamUserInfoVo register(String mobile) {
+        return this.register(mobile, 0);
+    }
+
+    @Override
+    public AdamUserInfoVo register(String mobile, int isComplete) {
         LocalDateTime now = LocalDateTime.now();
 
         AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew();
@@ -71,7 +76,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         userInfoVo.setAvatar(AdamConst.DEF_URL_AVATAR);
         userInfoVo.setBackground(AdamConst.DEF_URL_BACKGROUND);
         userInfoVo.setCreateAt(now);
-        userInfoVo.setIsComplete(0);
+        userInfoVo.setIsComplete(isComplete);
         userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
 
         long s = System.currentTimeMillis();
@@ -83,13 +88,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
         LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
                 initUserInfoObjs = CollectionUtil.linkedListObjectArr();
 
-        s = System.currentTimeMillis();
         toMqSqls.add(SqlMapping.get("adam_user.add"));
         initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
         toMqSqls.add(SqlMapping.get("adam_user_info.add"));
         initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), null, userInfoVo.getQrCode()});
-        log.debug("#SQL.GET耗时:{}ms", System.currentTimeMillis() - s);
 
+        s = System.currentTimeMillis();
         queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UREGISTER.getKey(),
                 SqlMapping.gets(toMqSqls, initUserObjs, initUserInfoObjs)
         );