Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/user/UserAttrDto.java

@@ -10,6 +10,7 @@ public class UserAttrDto extends PageDto implements Serializable {
 
     public static final String SPEC_OPEN_ID = "100201911001";//用户微信OPENID
     public static final String SPEC_UNION_ID = "100201911002";//用户微信UNIONID
+    public static final String SPEC_MALL_OPEN_ID = "100201911003"; // 商城openId
 
     public static final String SPEC_PROPERTY_USER_ID = "100202106001";//物业系统用户ID
 

java110-bean/src/main/java/com/java110/dto/user/UserDto.java

@@ -60,6 +60,7 @@ public class UserDto extends PageDto implements Serializable {
 
     private String openId;
     private String unionId;
+    private String mallOpenId;
 
     private String statusCd = "0";
 
@@ -346,4 +347,12 @@ public class UserDto extends PageDto implements Serializable {
     public void setUnionId(String unionId) {
         this.unionId = unionId;
     }
+
+    public String getMallOpenId() {
+        return mallOpenId;
+    }
+
+    public void setMallOpenId(String mallOpenId) {
+        this.mallOpenId = mallOpenId;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/user/ApiUserDataVo.java

@@ -22,6 +22,8 @@ public class ApiUserDataVo implements Serializable {
 
     private String openId;
 
+    private String mallOpenId;
+
     private String key;
 
     private int age;
@@ -133,4 +135,12 @@ public class ApiUserDataVo implements Serializable {
     public void setKey(String key) {
         this.key = key;
     }
+
+    public String getMallOpenId() {
+        return mallOpenId;
+    }
+
+    public void setMallOpenId(String mallOpenId) {
+        this.mallOpenId = mallOpenId;
+    }
 }

service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java

@@ -131,6 +131,10 @@ public class UserInnerServiceSMOImpl implements IUserInnerServiceSMO {
                 if ("100201911001".equals(userAttrDto.getSpecCd())) {
                     userDto.setOpenId(userAttrDto.getValue());
                 }
+
+                if (UserAttrDto.SPEC_MALL_OPEN_ID.equals(userAttrDto.getSpecCd())){
+                    userDto.setMallOpenId(userAttrDto.getValue());
+                }
             }