~API:加入会员+会员类型逻辑;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberJoinusVo.java

@@ -12,7 +12,7 @@ public class AdamMemberJoinusVo implements java.io.Serializable, Cloneable {
     private String qrCode;
     @ApiModelProperty(position = 11, value = "标题[50]", example = "摩登天空会员卡")
     private String title;
-    @ApiModelProperty(position = 12, value = "副标题[50]", example = "摩登天空会员卡副标题")
+    @ApiModelProperty(position = 12, value = "副标题[50]", example = "摩登天空专属会员卡")
     private String subTitle;
     @ApiModelProperty(position = 13, value = "卡面[200]", example = "https://img.zhengzai.tv/member_card/member1.png")
     private String cardface;

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

@@ -111,7 +111,8 @@ public class AdamMemberController {
         if (null == userInfoVo || StringUtils.startsWithIgnoreCase(userInfoVo.getQrCode(), "lN")) {
             joinusVo.setState(0);
         } else {
-            joinusVo.setType(10);
+            AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+            joinusVo.setType(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
             joinusVo.setQrCode(userInfoVo.getQrCode());
             joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));
         }
@@ -137,7 +138,8 @@ public class AdamMemberController {
                     SqlMapping.get("adam_user_info.update_qr_code", userInfoVo.getQrCode(), currentUid)
             );
         }
-        joinusVo.setType(10);
+        AdamUserMemberVo userMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
+        joinusVo.setType(null != userMemberVo && userMemberVo.isActive() ? 50 : 10);
         joinusVo.setState(1);
         joinusVo.setQrCode(userInfoVo.getQrCode());
         joinusVo.setCardface(adamRdmService.getMemberCardface(joinusVo.getType()));

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

@@ -859,9 +859,7 @@ public class AdamRdmService {
             vo.setType(0);
             vo.setState(0);
             vo.setCardface(this.getMemberCardface(0));
-            vo.setInterestsDetail("·加入会员所获优惠及权益，不可向他人销售及转让\n" +
-                    "·如需在移动设备使用本商品，必须使用最新版APP\n" +
-                    "·做出不合适举动的用户将限制资格，或剥夺会员资格");
+            vo.setInterestsDetail("1、加入登登登VIP俱乐部所获优惠及权益，不可向他人销售及转让\\r\\n2、如需在移动设备使用本商品，必须使用最新版APP\\r\\n3、做出不合适举动的用户将限制资格，或剥夺会员资格");
 
             redisUtil.set(AdamRedisConst.INFO_MEMBER_JOINUS, vo);
         }

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

@@ -46,6 +46,7 @@ public class TestAdam {
                 "adam:info:morder:331587681810022407979836",
 
                 "adam:info:member:simple",
+                "adam:info:member:joinus",
                 "adam:info:member:category:1",
                 "adam:info:member:agreement",
                 "adam:info:member:rights:1",