提交chime社交相关

liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/dto/ChimeUserRegisterReqDto.java

@@ -20,6 +20,7 @@ public class ChimeUserRegisterReqDto {
     private String nickName;
     private String sex;
     private String tags;
+    private String performanceId;
 
     @Override
     public String toString(){

liquidnet-bus-api/liquidnet-service-chime-api/src/main/java/com/liquidnet/service/chime/service/IChimeUserService.java

@@ -26,4 +26,6 @@ public interface IChimeUserService {
     boolean updateUserTags(String userId,String tags);
 
     ChimeUserInfoDto getUserByUserId(String userId);
+
+    boolean switchPerformanceId(String performanceId);
 }

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/ChimePerformanceController.java

@@ -7,6 +7,7 @@ import com.liquidnet.service.chime.dto.ChimeUserInfoDto;
 import com.liquidnet.service.chime.dto.ChimeUserListQueryReqDto;
 import com.liquidnet.service.chime.dto.PerformanceDto;
 import com.liquidnet.service.chime.service.IChimePerformanceService;
+import com.liquidnet.service.chime.service.IChimeUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -38,6 +39,9 @@ public class ChimePerformanceController {
     @Autowired
     private IChimePerformanceService chimePerformanceService;
 
+    @Autowired
+    private IChimeUserService chimeUserService;
+
     @GetMapping("myPerformanceList")
     @ApiOperation("已购票的演出")
     @ApiImplicitParams({
@@ -136,6 +140,10 @@ public class ChimePerformanceController {
         reqDto.setTags(tags);
 //        PageInfo<ChimeUserInfoDto> pageInfo = chimePerformanceService.getUserListByCon(reqDto);
         PagedResult<ChimeUserInfoDto> pageInfo = chimePerformanceService.getUserListByCon(reqDto);
+
+        //切换场次
+        chimeUserService.switchPerformanceId(performanceId);
+
         return ResponseDto.success(pageInfo);
     }
 }

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/controller/ChimeUserController.java

@@ -41,19 +41,27 @@ public class ChimeUserController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "userId", value = "用户id"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "nickname", value = "昵称"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "sex", value = "性别"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "tags", value = "兴趣标签(多个用逗号隔开)")
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "tags", value = "兴趣标签[{\"tagCode\":\"tag1\",\"tagDesc\":\"tag描述\"},{\"tagCode\":\"tag2\",\"tagDesc\":\"tag描述2\"}]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "performanceId", value = "演出id")
     })
     @PostMapping(value = {"register"})
     public ResponseDto<ChimeUserRegisterRespDto> register(@RequestParam @Validated String userId
             , @RequestParam @Validated String nickname
             , @RequestParam @Validated String sex
             , @RequestParam @Validated String tags
+            , @RequestParam @Validated String performanceId
     ) {
         ChimeUserRegisterReqDto reqDto = ChimeUserRegisterReqDto.getNew();
         reqDto.setUserId(userId);
         reqDto.setNickName(nickname);
         reqDto.setSex(sex);
         reqDto.setTags(tags);
+        if(StringUtil.isNotEmpty(performanceId)){
+            reqDto.setPerformanceId(performanceId);
+        }else{
+            //云在场
+            reqDto.setPerformanceId("-1");
+        }
         //获取等前登陆用户 CurrentUtil.getCurrentUid()
         JSONObject jsonObject = chimeUserService.register(reqDto);
         if(StringUtil.isNotNull(jsonObject.get("error"))){

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/service/impl/ChimeUserServiceImpl.java

@@ -68,7 +68,7 @@ public class ChimeUserServiceImpl implements IChimeUserService {
         chimeUserInfoVo.setUserName(vo.getUid());
         chimeUserInfoVo.setUserMobile(vo.getMobile());
         chimeUserInfoVo.setAvatar(vo.getAvatar());
-        chimeUserInfoVo.setJoinPerformanceId("-1");
+        chimeUserInfoVo.setJoinPerformanceId(reqDto.getPerformanceId());
 
 
 //
@@ -136,4 +136,19 @@ public class ChimeUserServiceImpl implements IChimeUserService {
         }
         return null;
     }
+
+    @Override
+    public boolean switchPerformanceId(String performanceId) {
+        String userId = CurrentUtil.getCurrentUid();
+        //获取社交用户
+        ChimeUserInfoVo chimeUserInfoVo = dataUtils.getUserByUserId(userId);
+        if(StringUtil.isNotNull(chimeUserInfoVo)){
+            //判断演出id是否需要切换
+            if(!chimeUserInfoVo.getJoinPerformanceId().equalsIgnoreCase(performanceId)){
+                chimeUserInfoVo.setJoinPerformanceId(performanceId);
+                dataUtils.updateChimeUser(chimeUserInfoVo);
+            }
+        }
+        return true;
+    }
 }

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/utils/DataUtils.java

@@ -31,23 +31,39 @@ public class DataUtils {
     @Autowired
     private RedisUtil redisUtil;
 
+    /**
+     * 注册社交用户
+     * @param chimeUserInfoVo
+     */
     public void createChimeUser(ChimeUserInfoVo chimeUserInfoVo){
         mongoTemplate.save(chimeUserInfoVo,ChimeUserInfoVo.class.getSimpleName());
     }
 
+    /**
+     * 修改社交用户
+     * @param chimeUserInfoVo
+     */
     public void updateChimeUser(ChimeUserInfoVo chimeUserInfoVo) {
-        UpdateResult result = mongoTemplate.updateFirst(
-                Query.query(Criteria.where("userId").is(chimeUserInfoVo.getUserId())),
-                Update.fromDocument(Document.parse(JsonUtils.toJson(chimeUserInfoVo))),
-                ChimeUserInfoVo.class.getSimpleName()
-        );
+        Query query = Query.query(Criteria.where("userId").is(chimeUserInfoVo.getUserId()));
+        Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(chimeUserInfoVo)));
+        UpdateResult result = mongoTemplate.updateFirst(query,update,ChimeUserInfoVo.class.getSimpleName());
         log.info("updateChimeUser result:{}",result.toString());
     }
 
+    /**
+     * 创建用户标签
+     * @param chimeUserTagsMappingVoList
+     */
     public void createUserTagMapping(List<ChimeUserTagsMappingVo> chimeUserTagsMappingVoList){
         mongoTemplate.insert(chimeUserTagsMappingVoList,ChimeUserTagsMappingVo.class.getSimpleName());
     }
 
+    /**
+     * 修改用户标签
+     * @param userId
+     * @param chimeUserTagsMappingVoList
+     * @return
+     */
     public boolean updateUserTagMapping(String userId,List<ChimeUserTagsMappingVo> chimeUserTagsMappingVoList){
 
         Query query = Query.query(Criteria.where("userId").is(userId));
@@ -57,17 +73,29 @@ public class DataUtils {
         return rsList.size()>0;
     }
 
+    /**
+     * 获取单个用户信息
+     * @param userId
+     * @return
+     */
     public ChimeUserInfoVo getUserByUserId(String userId){
         Query query = Query.query(Criteria.where("userId").is(userId));
         ChimeUserInfoVo chimeUserInfoVo = mongoTemplate.findOne(query,ChimeUserInfoVo.class,ChimeUserInfoVo.class.getSimpleName());
         return chimeUserInfoVo;
     }
 
+    /**
+     * 获取用户标签
+     * @param userId
+     * @return
+     */
     public List<ChimeUserTagDto> getUserTagList(String userId){
         Query query= Query.query(Criteria.where("userId").is(userId));
         return mongoTemplate.find(query, ChimeUserTagDto.class,ChimeUserTagsMappingVo.class.getSimpleName());
     }
 
+
+
     /**
      * 根据订单id 获取 订单vo 详情
      *