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

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));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -240,7 +240,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("redis 获取库存 -> time:" + (currentTime) + "毫秒");
-                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
+//                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
 //            }else{
 //                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
 //                return ResponseDto.failure("下单超时");//乱七八糟异常