Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -100,10 +100,6 @@ public class KylinPerformanceVo {
     @ApiModelProperty(value = "场次")
     private List<KylinTicketTimesVo> ticketTimeList;
 
-    @ApiModelProperty(value = "巡演数据")
-    private List<KylinPerformanceVo> roadList;
-
-
     public void setPerformance(KylinPerformances performance) {
         this.performancesId = performance.getPerformancesId();
         this.title = performance.getTitle();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -249,12 +249,7 @@ public class DataUtils {
         if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
         } else {
             KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-            List<KylinPerformanceVo> roadList = new ArrayList();
-            if (Integer.parseInt(performanceData.getRoadShowId()) > 0) {
-                roadList = getRoadList(performanceData.getRoadShowId());
-            }
             redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
-            performanceData.setRoadList(roadList); // 不一起存到演出详情
         }
         return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
     }

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

@@ -153,12 +153,13 @@ public class AdamMemberOrderController {
         return "success";
     }
 
-//    @ApiOperationSupport(order = 3)
-//    @ApiOperation(value = "会员码详情")
-//    @GetMapping("check/code")
-//    public ResponseDto<AdamMemberCodeVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
-//        return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(orderNo));
-//    }
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "兑换码校验")
+    @GetMapping("check/code")
+    public ResponseDto<Integer> checkMemberCode(@NotBlank @RequestParam String mCode) {
+        AdamMemberCodeVo vo = adamRdmService.getMemberCodeVoByCode(mCode);
+        return ResponseDto.success(null == vo ? -1 : vo.getState());
+    }
 
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "使用兑换码")

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

@@ -287,7 +287,9 @@ public class AdamUserController {
         String currentUid = CurrentUtil.getCurrentUid();
 
         Map<String, Object> map = new HashMap<>();
-        map.put("userInfo", adamRdmService.getUserInfoVoByUid(currentUid));
+        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
+        userInfoVo.setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
+        map.put("userInfo", userInfoVo);
         map.put("realNameInfo", adamRdmService.getRealInfoVoByUid(currentUid));
         map.put("thirdPartInfo", adamRdmService.getThirdPartVoListByUid(currentUid));
         map.put("userMemberVo", adamRdmService.getUserMemberVoByUid(currentUid));