~API:会员卡权益描述根据类型分别展示;

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

@@ -26,8 +26,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_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

@@ -105,20 +105,19 @@ public class AdamMemberController {
     @GetMapping("joininfo")
     public ResponseDto<AdamMemberJoinusVo> joininfo() {
         String currentUid = CurrentUtil.getCurrentUid();
-        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo();
 
         AdamUserInfoVo userInfoVo = null;
         if (!StringUtils.isEmpty(currentUid)) {
             userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
         }
+        AdamMemberJoinusVo joinusVo;
         if (null == userInfoVo || StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN")) {
-            joinusVo.setState(0);
+            joinusVo = adamRdmService.getMemberJoinusVo(0);
         } else {
             AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+            joinusVo = adamRdmService.getMemberJoinusVo(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             joinusVo.setState(1);
-            joinusVo.setType(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             joinusVo.setQrCode(userInfoVo.getQrCode());
-            joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));
         }
 
         return ResponseDto.success(joinusVo);
@@ -128,7 +127,7 @@ public class AdamMemberController {
     @ApiOperation(value = "领取会员卡")
     @GetMapping("joinus")
     public ResponseDto<AdamMemberJoinusVo> joinus() {
-        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo();
+//        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo(10);
 
         String currentUid = CurrentUtil.getCurrentUid();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
@@ -143,10 +142,9 @@ public class AdamMemberController {
             );
         }
         AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
-        joinusVo.setType(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
+        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
         joinusVo.setState(1);
         joinusVo.setQrCode(userInfoVo.getQrCode());
-        joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));
 
         try {
             feignAdamPlatformClient.initScore(currentUid);

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

@@ -401,14 +401,13 @@ public class AdamUserController {
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
         userProfileVo.setUserInfo(adamRdmService.ratingProvince(userInfoVo).desensitize(reviewUserInfo).rating(userMemberVo));
 
-        AdamMemberJoinusVo memberJoinusVo = adamRdmService.getMemberJoinusVo();
+        AdamMemberJoinusVo memberJoinusVo;
         if (org.springframework.util.StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN")) {
-            memberJoinusVo.setState(0);
+            memberJoinusVo = adamRdmService.getMemberJoinusVo(0);
         } else {
+            memberJoinusVo = adamRdmService.getMemberJoinusVo(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             memberJoinusVo.setState(1);
-            memberJoinusVo.setType(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             memberJoinusVo.setQrCode(userInfoVo.getQrCode());
-            memberJoinusVo.setCardface(adamRdmService.getMemberCardface(memberJoinusVo.getType()));
         }
         userProfileVo.setMemberJoinusVo(memberJoinusVo);
 

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

@@ -843,25 +843,32 @@ public class AdamRdmService {
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
 
-    public String getMemberCardface(int type) {
-        return (String) redisUtil.get(AdamRedisConst.INFO_MEMBER_CARDFACE.concat(String.valueOf(type)));
-    }
-
-    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
-
-    public AdamMemberJoinusVo getMemberJoinusVo() {
+    public AdamMemberJoinusVo getMemberJoinusVo(int type) {
+        String key = AdamRedisConst.INFO_MEMBER_JOINUS.concat(String.valueOf(type));
         long s = System.currentTimeMillis();
-        AdamMemberJoinusVo vo = (AdamMemberJoinusVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_JOINUS);
+        AdamMemberJoinusVo vo = (AdamMemberJoinusVo) redisUtil.get(key);
         if (null == vo) {
             vo = AdamMemberJoinusVo.getNew();
             vo.setTitle("摩登天空会员卡");
             vo.setSubTitle("摩登天空专属会员卡");
-            vo.setType(0);
+            vo.setType(type);
             vo.setState(0);
-            vo.setCardface(this.getMemberCardface(0));
-            vo.setInterestsDetail("1、加入登登登VIP俱乐部所获优惠及权益，不可向他人销售及转让\\r\\n2、如需在移动设备使用本商品，必须使用最新版APP\\r\\n3、做出不合适举动的用户将限制资格，或剥夺会员资格");
+            switch (type) {
+                case 0:
+                    vo.setCardface("https://img.zhengzai.tv/member_card/member1.png");
+                    break;
+                case 10:
+                    vo.setCardface("https://img.zhengzai.tv/member_card/member1.png");
+                    break;
+                case 50:
+                    vo.setCardface("https://img.zhengzai.tv/member_card/member2.png");
+                    break;
+            }
+            String interestsDetail = type == 50 ? "优先购票&入场：<br />会员享有超过百场演出会员享有优先购票权<br />会员享有超过百场演出会员享有优先入场权<br /><br />商品优享会员价：<br />会员享有本站商城内超过百款周边商品和音像制品的会员优享价<br /><br />专属活动&商品&内容：<br />超过百场演出会员专属通道<br />会员专属的演出以及线上线下活动<br />会员专属的视频音频节目<br />会员享有限定款商品及音像制品的专属购买权利<br /><br />不定期惊喜：<br />免费观演以及免费商品的抽奖权利<br />意想不到的惊喜：<br />我们会时不时制造一些意外的惊喜"
+                    : "摩登天空会员卡权益描述：<br />每人限领1张<br /><br />会员权益：<br />关注「摩登天空服务号」注册即可成为摩登天空会员，享受购票&购物积分<br />积分有效期：历史上购买过商品演出的积分将于2022年1月15日过期；之后过期时间为每年1月1日，保留次年12月份积分<br /><br />使用须知：<br />1.每人限领1张<br />2.积分不能兑换，不可转让<br />3.积分及优惠券，一经使用，概不退换";
+            vo.setInterestsDetail(interestsDetail);
 
-            redisUtil.set(AdamRedisConst.INFO_MEMBER_JOINUS, vo);
+            redisUtil.set(key, vo);
         }
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/test/java/TestAdam.java

@@ -13,9 +13,9 @@ public class TestAdam {
         Scanner scanner = new Scanner(System.in);
         int dbs = scanner.nextInt();
         String[] keys = {
-                "adam:info:member:cardface0",
-                "adam:info:member:cardface10",
-                "adam:info:member:cardface50",
+                "adam:info:member:joinus:0",
+                "adam:info:member:joinus:10",
+                "adam:info:member:joinus:50",
                 "adam:incr:member_no",
                 "adam:ad:info",
                 "adam:blacklist:member:uid",