~API:加入会员;

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

@@ -27,6 +27,7 @@ public class AdamRedisConst {
     public static final String INFO_CERTIFICATION_JUNK = PREFIX.concat("info:certification_junk:");
 
     public static final String INFO_MEMBER_CARDFACE = PREFIX.concat("info:member:cardface");
+    public static final String INFO_MEMBER_JOINUS = PREFIX.concat("info:member:joinus");
     public static final String INFO_MEMBER_SIMPLE = PREFIX.concat("info:member:simple");
     public static final String INFO_MEMBER_CATEGORY = PREFIX.concat("info:member:category:");
     public static final String INFO_MEMBER_PRICE = PREFIX.concat("info:member:price:");

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

@@ -97,46 +97,41 @@ public class AdamMemberController {
     @GetMapping("joininfo")
     public ResponseDto<AdamMemberJoinusVo> joininfo() {
         String currentUid = CurrentUtil.getCurrentUid();
-        AdamMemberJoinusVo memberJoinusVo = AdamMemberJoinusVo.getNew();
+        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo();
 
-//        AdamMemberSimpleVo memberSimpleVo = adamRdmService.getMemberSimpleVo();
-//        if (null != memberSimpleVo) {
-//            memberJoinusVo.setTitle(memberSimpleVo.getTitle());
-//            memberJoinusVo.setSubTitle(memberSimpleVo.getSubTitle());
-//        }
-        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
-        boolean lN = StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN");
-        memberJoinusVo.setState(lN ? 0 : 1);
-        memberJoinusVo.setType(lN ? 0 : 10);
-        memberJoinusVo.setQrCode(userInfoVo.getQrCode());
-        memberJoinusVo.setCardface(adamRdmService.getMemberCardface(memberJoinusVo.getType()));
+        AdamUserInfoVo userInfoVo = null;
+        if (!StringUtils.isEmpty(currentUid)) {
+            userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
+        }
+        if (null == userInfoVo || StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN")) {
+            joinusVo.setState(0);
+        } else {
+            joinusVo.setType(10);
+            joinusVo.setQrCode(userInfoVo.getQrCode());
+            joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));
+        }
 
-        return ResponseDto.success(memberJoinusVo);
+        return ResponseDto.success(joinusVo);
     }
 
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "加入会员")
     @GetMapping("joinus")
     public ResponseDto<AdamMemberJoinusVo> joinus() {
-        AdamMemberJoinusVo memberJoinusVo = AdamMemberJoinusVo.getNew();
-        String currentUid = CurrentUtil.getCurrentUid();
+        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo();
 
-//        AdamMemberSimpleVo memberSimpleVo = adamRdmService.getMemberSimpleVo();
-//        if (null != memberSimpleVo) {
-//            memberJoinusVo.setTitle(memberSimpleVo.getTitle());
-//            memberJoinusVo.setSubTitle(memberSimpleVo.getSubTitle());
-//        }
+        String currentUid = CurrentUtil.getCurrentUid();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
         if (StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN")) {// `lN`开头即未领取，这里做领取操作
             userInfoVo.setQrCode(adamRdmService.generateMemberUniqueSerialNumber(userInfoVo.getMobile()));
             adamRdmService.setUserInfoVoByUid(currentUid, userInfoVo);
         }
-        memberJoinusVo.setType(10);
-        memberJoinusVo.setState(1);
-        memberJoinusVo.setQrCode(userInfoVo.getQrCode());
-        memberJoinusVo.setCardface(adamRdmService.getMemberCardface(memberJoinusVo.getType()));
+        joinusVo.setType(10);
+        joinusVo.setState(1);
+        joinusVo.setQrCode(userInfoVo.getQrCode());
+        joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));
 
-        return ResponseDto.success(memberJoinusVo);
+        return ResponseDto.success(joinusVo);
     }
 
     /* ------------------------------------------------------------｜@API:RSC */

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

@@ -844,7 +844,25 @@ public class AdamRdmService {
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
 
-
+    public AdamMemberJoinusVo getMemberJoinusVo() {
+        long s = System.currentTimeMillis();
+        AdamMemberJoinusVo vo = (AdamMemberJoinusVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_JOINUS);
+        if (null == vo) {
+            vo = AdamMemberJoinusVo.getNew();
+            vo.setTitle("摩登天空会员卡");
+            vo.setSubTitle("摩登天空专属会员卡");
+            vo.setType(0);
+            vo.setState(0);
+            vo.setCardface("https://img.zhengzai.tv/member_card/member1.png");
+            vo.setInterestsDetail("·加入会员所获优惠及权益，不可向他人销售及转让\n" +
+                    "·如需在移动设备使用本商品，必须使用最新版APP\n" +
+                    "·做出不合适举动的用户将限制资格，或剥夺会员资格");
+
+            redisUtil.set(AdamRedisConst.INFO_MEMBER_JOINUS, vo);
+        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
+        return vo;
+    }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */