Merge remote-tracking branch 'origin/dev_passwd_login' into pre

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

@@ -33,24 +33,28 @@ public class AdamMemberOrderParam implements Serializable {
     @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
     @NotBlank(message = "生日不能为空")
     private String birthday;
-    @ApiModelProperty(position = 16, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
+    @ApiModelProperty(position = 16, required = true, value = "收获地址")
+    @Size(min = 1, max = 64, message = "收获地址长度限制1-64位字符")
+    @NotBlank(message = "收获地址不能为空")
+    private String addressId;
+    @ApiModelProperty(position = 17, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
     @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效")
     @NotBlank(message = "支付终端不能为空")
     private String deviceFrom;
-    @ApiModelProperty(position = 17, required = true, value = "支付方式", allowableValues = "alipay,wepay")
+    @ApiModelProperty(position = 20, required = true, value = "支付方式", allowableValues = "alipay,wepay")
     @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效")
     @NotBlank(message = "支付方式不能为空")
     private String payType;
-    @ApiModelProperty(position = 18, required = false, value = "App内Apple支付必传")
+    @ApiModelProperty(position = 21, required = false, value = "App内Apple支付必传")
     private String productId;
-    @ApiModelProperty(position = 19, required = false, value = "微信内网页及小程序支付必传")
+    @ApiModelProperty(position = 22, required = false, value = "微信内网页及小程序支付必传")
     private String openId;
     @ApiModelProperty(position = 23, required = false, value = "取消支付，点击取消支付宝回调地址")
     private String showUrl;
     @ApiModelProperty(position = 24, required = false, value = "支付成功，点击完成支付宝回调地址")
     private String returnUrl;
-    @ApiModelProperty(position = 19, required = false, value = "姓名[未实名时必传]", example = "王武")
+    @ApiModelProperty(position = 30, required = false, value = "姓名[未实名时必传]", example = "王武")
     private String name;
-    @ApiModelProperty(position = 20, required = false, value = "身份证件号[未实名时必传]", example = "111111111111111111")
+    @ApiModelProperty(position = 31, required = false, value = "身份证件号[未实名时必传]", example = "111111111111111111")
     private String idCard;
 }

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

@@ -36,8 +36,8 @@ public class AdamUserInfoParam implements java.io.Serializable {
     @ApiModelProperty(position = 16, required = true, value = "常住地/区域[100]", example = "北京 北京市 朝阳区")
 //    @NotBlank(message = "常住地不能为空")
     private String area;
-    @ApiModelProperty(position = 17, required = true, value = "签名[15]", example = "...................")
-//    @Size(max = 15, message = "已超出签名长度限制")
+    @ApiModelProperty(position = 17, required = true, value = "签名[30]", example = "...................")
+//    @Size(max = 30, message = "已超出签名长度限制")
     private String signature;
     @ApiModelProperty(position = 18, required = true, value = "标签[500]", example = "[{\"val\":\"MMS01\",\"desc\":\"民歌\",\"tagVos\":[{\"val\":\"MMS0101\",\"desc\":\"A\"},{\"val\":\"MMS0102\",\"desc\":\"B\"}]},{\"val\":\"MMS02\",\"desc\":\"house\",\"tagVos\":[{\"val\":\"MMS0201\",\"desc\":\"C\"}]}]")
 //    @NotNull

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

 package com.liquidnet.service.adam.dto.vo;
 
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
 @ApiModel(value = "AdamLoginInfoVo", description = "登录成功响应数据")
-@Data
 public class AdamLoginInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 4209754800686327524L;
     @ApiModelProperty(position = 11, value = "TOKEN")
@@ -29,14 +28,84 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 18, value = "微信用户unionid（微信小程序登录返回，用于给小程序用户推送信息）")
     private String wechatUnionid;
 
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public AdamUserInfoVo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(AdamUserInfoVo userInfo) {
+        this.userInfo = userInfo;
+    }
+
+    public AdamRealInfoVo getRealNameInfo() {
+        return realNameInfo;
+    }
+
+    public void setRealNameInfo(AdamRealInfoVo realNameInfo) {
+        this.realNameInfo = realNameInfo;
+    }
+
+    public List<AdamThirdPartInfoVo> getThirdPartInfo() {
+        return thirdPartInfo;
+    }
+
+    public void setThirdPartInfo(List<AdamThirdPartInfoVo> thirdPartInfo) {
+        this.thirdPartInfo = thirdPartInfo;
+    }
+
+    public AdamMemberSimpleVo getMemberVo() {
+        return memberVo;
+    }
+
+    public void setMemberVo(AdamMemberSimpleVo memberVo) {
+        this.memberVo = memberVo;
+    }
+
+    public AdamUserMemberVo getUserMemberVo() {
+        return userMemberVo;
+    }
+
+    public void setUserMemberVo(AdamUserMemberVo userMemberVo) {
+        this.userMemberVo = userMemberVo;
+    }
+
+    public String getWechatOpenid() {
+        return wechatOpenid;
+    }
+
+    public void setWechatOpenid(String wechatOpenid) {
+        this.wechatOpenid = wechatOpenid;
+    }
+
+    public String getWechatUnionid() {
+        return wechatUnionid;
+    }
+
+    public void setWechatUnionid(String wechatUnionid) {
+        this.wechatUnionid = wechatUnionid;
+    }
+
     private static final AdamLoginInfoVo obj = new AdamLoginInfoVo();
 
     public static AdamLoginInfoVo getNew() {
         try {
             return (AdamLoginInfoVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            e.printStackTrace();
+            return new AdamLoginInfoVo();
         }
-        return new AdamLoginInfoVo();
+    }
+
+    public AdamLoginInfoVo desensitize() {
+        this.userInfo.setPasswd(null);
+//        this.userInfo.setPayCode(null);
+        this.userInfo.setMobile(SensitizeUtil.custom(userInfo.getMobile(), 3, 4));
+        return this;
     }
 }

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamMemberOrderExtVo", description = "用户会员订单扩展信息")
+@Data
+public class AdamMemberOrderExtVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -1718738306110269600L;
+    @ApiModelProperty(position = 1, value = "订单号")
+    private String orderNo;
+    @ApiModelProperty(position = 2, value = "快递状态")
+    private Integer expressStatus;
+    @ApiModelProperty(position = 3, value = "收件人")
+    private String expressReceiver;
+    @ApiModelProperty(position = 4, value = "收件人电话")
+    private String expressPhone;
+    @ApiModelProperty(position = 5, value = "收件人地址")
+    private String expressAddress;
+
+    private static final AdamMemberOrderExtVo obj = new AdamMemberOrderExtVo();
+
+    public static AdamMemberOrderExtVo getNew() {
+        try {
+            return (AdamMemberOrderExtVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamMemberOrderExtVo();
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.dto.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
+import com.liquidnet.service.adam.entity.AdamMemberOrderExt;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -61,9 +62,12 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 20, value = "客户端版本")
     private String version;
 
-    @ApiModelProperty(position = 21, value = "会员须知")
+    @ApiModelProperty(position = 21, value = "会员订单扩展信息")
+    private AdamMemberOrderExtVo extendVo;
+
+    @ApiModelProperty(position = 30, value = "会员须知")
     private String memberNotes;
-    @ApiModelProperty(position = 22, value = "会员码信息")
+    @ApiModelProperty(position = 31, value = "会员码信息")
     private AdamMemberCodeVo memberCodeVo;
 
     public static final AdamMemberOrderVo obj = new AdamMemberOrderVo();

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

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "AdamRscPolymer01Vo", description = "票务下单所需信息")
+@Data
+public class AdamRscPolymer01Vo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = -4945093532123934888L;
+    @ApiModelProperty(position = 1, value = "会员身份[0-非会员,1-会员]")
+    private int membership;
+    @ApiModelProperty(position = 2, value = "收货地址")
+    private AdamAddressesVo addressesVo;
+    @ApiModelProperty(position = 3, value = "入场人列表")
+    private List<AdamEntersVo> entersVos;
+
+    private static final AdamRscPolymer01Vo obj = new AdamRscPolymer01Vo();
+
+    public static AdamRscPolymer01Vo getNew() {
+        try {
+            return (AdamRscPolymer01Vo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamRscPolymer01Vo();
+        }
+    }
+}

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

@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @ApiModel(value = "AdamUserInfoVo", description = "用户详情")
+@Data
 public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = 8479869354894030303L;
     @ApiModelProperty(position = 10, value = "用户ID[64]")
@@ -66,148 +67,10 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
         return new AdamUserInfoVo();
     }
 
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getPasswd() {
-//        return passwd;
-        return "*";
-    }
-
-    public void setPasswd(String passwd) {
-        this.passwd = passwd;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public AdamTagVo getSex() {
-        return sex;
-    }
-
-    public void setSex(AdamTagVo sex) {
-        this.sex = sex;
-    }
-
-    public String getBirthday() {
-        return birthday;
-    }
-
-    public void setBirthday(String birthday) {
-        this.birthday = birthday;
-    }
-
-    public String getArea() {
-        return area;
-    }
-
-    public void setArea(String area) {
-        this.area = area;
-    }
-
-    public String getSignature() {
-        return signature;
-    }
-
-    public void setSignature(String signature) {
-        this.signature = signature;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getBackground() {
-        return background;
-    }
-
-    public void setBackground(String background) {
-        this.background = background;
-    }
-
-    public List<AdamTagParentVo> getTagMe() {
-        return tagMe;
-    }
-
-    public void setTagMe(List<AdamTagParentVo> tagMe) {
-        this.tagMe = tagMe;
-    }
-
-    public LocalDateTime getCreateAt() {
-        return createAt;
-    }
-
-    public void setCreateAt(LocalDateTime createAt) {
-        this.createAt = createAt;
-    }
-
-    public LocalDateTime getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(LocalDateTime updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public LocalDateTime getClosedAt() {
-        return closedAt;
-    }
-
-    public void setClosedAt(LocalDateTime closedAt) {
-        this.closedAt = closedAt;
-    }
-
-    public Integer getIsComplete() {
-        return isComplete;
-    }
-
-    public void setIsComplete(Integer isComplete) {
-        this.isComplete = isComplete;
-    }
-
-    public String getRongCloudToken() {
-        return rongCloudToken;
-    }
-
-    public void setRongCloudToken(String rongCloudToken) {
-        this.rongCloudToken = rongCloudToken;
-    }
-
-    public String getQrCode() {
-        return qrCode;
-    }
-
-    public void setQrCode(String qrCode) {
-        this.qrCode = qrCode;
+    public AdamUserInfoVo desensitize() {
+        this.setPasswd(null);
+//        this.userInfo.setPayCode(null);
+        this.setMobile(SensitizeUtil.custom(this.getMobile(), 3, 4));
+        return this;
     }
 }

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

@@ -15,9 +15,10 @@ public interface IAdamMemberOrderService {
     /**
      * 购买会员或会员码
      *
+     * @param uid
      * @param param
      */
-    ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param);
+    ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(String uid, AdamMemberOrderParam param);
 
     /**
      * 支付回调

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -2,6 +2,8 @@ config-server-git: dev111
 #application-dev-begin
 #这里后续添加公共参数值
 liquidnet:
+  secret:
+    passwd-salt: NTZiYzg4
   security:
     username: user
     password: user123

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -2,6 +2,8 @@ config-server-git: test
 #application-test-begin
 #这里后续添加公共参数值
 liquidnet:
+  secret:
+    passwd-salt: NTZiYzg4
   security:
     username: user
     password: user123

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------
@@ -132,6 +132,7 @@ global-auth:
     - ${liquidnet.info.context}/plz/ad
     - ${liquidnet.info.context}/wxa/code2session
     - ${liquidnet.info.context}/wx/oauth2/access_token
+    - ${liquidnet.info.context}/rsc/**
 
 # -----------------------------------------------------------
 

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-notify.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-platform.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------
@@ -121,11 +121,9 @@ spring:
 #    type: org.apache.tomcat.jdbc.pool.DataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     hikari:
-      # 迁移数据暂设500
-      maximum-pool-size: 500
-      # 迁移数据暂设10分钟
-      connection-timeout: 600000
-      minimum-idle: 8
+      maximum-pool-size: 50
+      connection-timeout: 60000
+      minimum-idle: 10
       connection-test-query: SELECT 1
 # -----------------------------------------------------------
 

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet.yml

@@ -14,7 +14,7 @@ knife4j:
   enable: true
   production: ${liquidnet.knife4j.disable}
   basic:
-    enable: false
+    enable: true
     username: ${liquidnet.security.username}
     password: ${liquidnet.security.password}
 # -----------------------------------------------------------

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberOrderExt.java

+package com.liquidnet.service.adam.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户会员订单扩展信息表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AdamMemberOrderExt implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    private String orderNo;
+
+    /**
+     * 快递状态:0-待揽收|1-已揽收|2-在途中|3-已签收｜4-已拒收
+     */
+    private Integer expressStatus;
+
+    /**
+     * 收件人
+     */
+    private String expressReceiver;
+
+    /**
+     * 收件人电话
+     */
+    private String expressPhone;
+
+    /**
+     * 收件人地址
+     */
+    private String expressAddress;
+
+    private String comment;
+
+
+}

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamMemberOrderExtMapper.java

+package com.liquidnet.service.adam.mapper;
+
+import com.liquidnet.service.adam.entity.AdamMemberOrderExt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户会员订单扩展信息表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-11
+ */
+public interface AdamMemberOrderExtMapper extends BaseMapper<AdamMemberOrderExt> {
+
+}

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderExtMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamMemberOrderExtMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -325,6 +325,20 @@ create table adam_member_code
 
 create unique index uidx_amember_code_id on adam_member_code (code);
 # MDB.idx:code,state
+-- >>------------------------------------------------------------------------------------ |20210811用于会员改版前支持用户购买会员选礼包收货地址
+drop table if exists adam_member_order_ext;
+create table adam_member_order_ext
+(
+    mid              bigint unsigned auto_increment primary key,
+    order_no         varchar(64) not null,
+    express_status   tinyint comment '快递状态:0-待揽收|1-已揽收|2-在途中|3-已签收｜4-已拒收',
+    express_receiver varchar(120) comment '收件人',
+    express_phone    varchar(30) comment '收件人电话',
+    express_address  text comment '收件人地址',
+    comment          text
+) engine = InnoDB comment '用户会员订单扩展信息表';
+
+create unique index uidx_amember_order_ext_id on adam_member_order_ext (order_no);
 -- >>------------------------------------------------------------------------------------
 -- >>------------------------------------------------------------------------------------
 -- >>------------------------------------------------------------------------------------

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

@@ -131,7 +131,7 @@ public class AdamAddressesController {
         return ResponseDto.success(vo);
     }
 
-    /* ------------------------------------------------------------｜API */
+    /* ------------------------------------------------------------｜@API:RSC */
 
     @ApiOperationSupport(order = 99)
     @ApiOperation(value = "@API:收货地址", notes = "查取用户指定收货地址详情")

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

@@ -191,8 +191,10 @@ public class AdamEntersController {
         return ResponseDto.success(vo);
     }
 
+    /* ------------------------------------------------------------｜@API:RSC */
+
     @ApiOperationSupport(order = 99)
-    @ApiOperation(value = "@API:入场人详情", notes = "查取用户指定入场人详情")
+    @ApiOperation(value = "@API:入场人详情", notes = "查取用户指定入场人详情，响应说明[`success`: true-成功返回信息,false-未查询到信息]")
     @GetMapping("query/depth")
     public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersId,
                                                    @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {

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

@@ -63,7 +63,7 @@ public class AdamMemberController {
         return ResponseDto.success(adamRdmService.getMemberAgreement());
     }
 
-    /* ------------------------------------------------------------｜API */
+    /* ------------------------------------------------------------｜@API:RSC */
 
     @ApiOperationSupport(order = 99)
     @ApiOperation(value = "@API:是否会员", notes = "根据UID判断用户是否会员，响应参数[`data`:true-是,false-否]")

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

@@ -99,13 +99,10 @@ public class AdamMemberOrderController {
             if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
                 return ResponseDto.failure(ErrorMapping.get("10101"));
             }
-            AdamRealInfoVo vo = adamUserService.identity(currentUid, param.getName(), param.getIdCard());
-            if (null == vo) {
-                return ResponseDto.failure(ErrorMapping.get("10000"));
-            }
+            adamUserService.identity(currentUid, param.getName(), param.getIdCard());
         }
 
-        return adamMemberOrderService.buyMemberOrMemberCode(param);
+        return adamMemberOrderService.buyMemberOrMemberCode(currentUid, param);
     }
 
     /**
@@ -190,6 +187,12 @@ public class AdamMemberOrderController {
         return ResponseDto.success(0);
     }
 
+    /**
+     * 购买会员黑名单校验
+     *
+     * @param uid 用户ID
+     * @return true-命中黑名单
+     */
     private boolean checkMobileOrUid(String uid) {
         List<String> blacklist = adamRdmService.getBlacklistForMember();
         return !CollectionUtils.isEmpty(blacklist) && blacklist.contains(uid);

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

+package com.liquidnet.service.adam.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo;
+import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
+import com.liquidnet.service.adam.service.AdamRdmService;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@ApiSupport(order = 10080)
+@Api(tags = "@API:RSC")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("rsc")
+public class AdamRscController {
+    @Autowired
+    AdamRdmService adamRdmService;
+
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "@API:入场人列表", notes = "查取用户指定入场人列表")
+    @GetMapping("inquire/enters")
+    public ResponseDto<List<AdamEntersVo>> querysForDepth(@NotBlank(message = "入场人ID不能为空（多个ID以,分隔）") @RequestParam String entersIds,
+                                                          @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUidEntersIds(uid, entersIds.split(","));
+        return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
+    }
+
+    @ApiOperationSupport(order = 20)
+    @ApiOperation(value = "@API:票务下单所需信息查询", notes = "包括是否会员、收货地址及入场人信息")
+    @GetMapping("inquire/of_buy_ticket")
+    public ResponseDto<AdamRscPolymer01Vo> queryForBuyTicket(@RequestParam(required = false) String addressId,
+                                                             @RequestParam(required = false) String entersIds,
+                                                             @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+        AdamRscPolymer01Vo vo = AdamRscPolymer01Vo.getNew();
+
+        AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
+        vo.setMembership((null != userMemberInfo && userMemberInfo.isActive()) ? 1 : 0);
+
+        if (!StringUtils.isEmpty(addressId)) {
+            AdamAddressesVo addressesVo = adamRdmService.getAddressesVoByUidAddressesId(uid, addressId);
+            vo.setAddressesVo(addressesVo);
+        }
+
+        if (!StringUtils.isEmpty(entersIds)) {
+            List<AdamEntersVo> entersVos = adamRdmService.getEntersVoByUidEntersIds(uid, entersIds.split(","));
+            vo.setEntersVos(entersVos);
+        }
+
+        return ResponseDto.success(vo);
+    }
+}

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

@@ -309,8 +309,7 @@ public class AdamUserController {
 
         Map<String, Object> map = CollectionUtil.mapStringObject();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
-        userInfoVo.setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
-        map.put("userInfo", userInfoVo);
+        map.put("userInfo", userInfoVo.desensitize());
         map.put("realNameInfo", adamRdmService.getRealInfoVoByUid(currentUid));
         map.put("thirdPartInfo", adamRdmService.getThirdPartVoListByUid(currentUid));
         map.put("userMemberVo", adamRdmService.getUserMemberVoByUid(currentUid));

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

@@ -267,19 +267,18 @@ public class AdamRdmService {
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
-        if (!CollectionUtils.isEmpty(vos)) {
-            return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
-        }
-        return null;
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
-        return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
+        List<AdamEntersVo> vos = this.getEntersVoByUid(uid);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
     public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds) {
         List<String> entersIdList = Arrays.asList(entersIds);
-        return this.getEntersVoByUid(uid).stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
+        List<AdamEntersVo> vos = this.getEntersVoByUid(uid);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
     }
 
     public void delEntersVoByUid(String uid) {
@@ -327,14 +326,12 @@ public class AdamRdmService {
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
-        if (!CollectionUtils.isEmpty(vos)) {
-            return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
-        }
-        return null;
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
-        return this.getAddressesVoByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
+        List<AdamAddressesVo> vos = this.getAddressesVoByUid(uid);
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     public void delAddressesVoByUid(String uid) {
@@ -453,15 +450,7 @@ public class AdamRdmService {
 
     public AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId) {
         List<AdamMemberPriceVo> vos = this.getMemberPriceVoByMemberId(memberId);
-        if (!CollectionUtils.isEmpty(vos)) {
-//            for (AdamMemberPriceVo r : vos) {
-//                if (memberPriceId.equals(r.getMemberPriceId())) {
-//                    return r;
-//                }
-//            }
-            return vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny().orElse(null);
-        }
-        return null;
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny().orElse(null);
     }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_ID, List<AdamMemberRightsVo>> */
@@ -530,10 +519,7 @@ public class AdamRdmService {
     }
 
     public AdamMemberOrderVo getMemberOrderVoByOrderNo(List<AdamMemberOrderVo> vos, String orderNo) {
-        if (!CollectionUtils.isEmpty(vos)) {
-            return vos.stream().filter(r -> r.getOrderNo().equals(orderNo)).findAny().orElse(null);
-        }
-        return null;
+        return CollectionUtils.isEmpty(vos) ? null : vos.stream().filter(r -> r.getOrderNo().equals(orderNo)).findAny().orElse(null);
     }
 
     public void delMemberOrderVoByUid(String uid) {

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

@@ -48,7 +48,11 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param) {
+    public ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(String currentUid, AdamMemberOrderParam param) {
+        AdamAddressesVo addressesVo = adamRdmService.getAddressesVoByUidAddressesId(currentUid, param.getAddressId());
+        if (null == addressesVo) {
+            return ResponseDto.failure(ErrorMapping.get("10106"));
+        }
         AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(param.getMemberId());
         if (null == memberVo) {
             return ResponseDto.failure(ErrorMapping.get("10201"));
@@ -124,13 +128,24 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         memberOrderVo.setDeviceFrom(param.getDeviceFrom());
         memberOrderVo.setPayType(param.getPayType());
         memberOrderVo.setState(0);// 0-待支付
-        memberOrderVo.setUid(CurrentUtil.getCurrentUid());
+        memberOrderVo.setUid(currentUid);
         memberOrderVo.setPrice(param.getPrice());
         memberOrderVo.setClientIp(clientIp);
         String headerCliVersion = CurrentUtil.getHeaderCliVersion(), headerCliSource = CurrentUtil.getHeaderCliSource();
         memberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource);
         memberOrderVo.setVersion(null == headerCliVersion ? "" : headerCliVersion);
 
+
+        AdamMemberOrderExtVo memberOrderExtVo = AdamMemberOrderExtVo.getNew();
+        memberOrderExtVo.setOrderNo(orderNo);
+        memberOrderExtVo.setExpressStatus(-1);
+        memberOrderExtVo.setExpressReceiver(addressesVo.getName());
+        memberOrderExtVo.setExpressPhone(addressesVo.getPhone());
+        memberOrderExtVo.setExpressAddress(addressesVo.getProvince() + addressesVo.getCity() + addressesVo.getCounty() + addressesVo.getAddress());
+
+        memberOrderVo.setExtendVo(memberOrderExtVo);
+
+
         if (!adamRdmService.setShotMemberOrderVoByOrderNo(orderNo, memberOrderVo)) {
             log.warn("###购买会员创建订单失败[memberOrderVo:{}]", JsonUtils.toJson(memberOrderVo));
             return ResponseDto.failure(ErrorMapping.get("10210"));
@@ -201,7 +216,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             BeanUtils.copyProperties(shotMemberOrderVo, handleMemberOrderVo);
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(),
-                    updateMemberOrderObjs = CollectionUtil.linkedListObjectArr();
+                    updateMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
+                    initMemberOrderExtObjs = CollectionUtil.linkedListObjectArr();
             LocalDateTime now = LocalDateTime.now();
             if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
                 existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid());
@@ -293,12 +309,28 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
                     handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
             });
-            s = System.currentTimeMillis();
-            queueUtils.sendMsgByRedis(
-                    MQConst.AdamQueue.SQL_UMEMBER.getKey(),
-                    SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs)
-            );
-            log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+
+            AdamMemberOrderExtVo memberOrderExtVo = handleMemberOrderVo.getExtendVo();
+            if (null != memberOrderExtVo) {
+                toMqSqls.add(SqlMapping.get("adam_member_order_ext.add"));
+                initMemberOrderExtObjs.add(new Object[]{
+                        memberOrderExtVo.getOrderNo(), memberOrderExtVo.getExpressStatus(), memberOrderExtVo.getExpressReceiver(),
+                        memberOrderExtVo.getExpressPhone(), memberOrderExtVo.getExpressAddress()
+                });
+                s = System.currentTimeMillis();
+                queueUtils.sendMsgByRedis(
+                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+                        SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs, initMemberOrderExtObjs)
+                );
+                log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+            } else {
+                s = System.currentTimeMillis();
+                queueUtils.sendMsgByRedis(
+                        MQConst.AdamQueue.SQL_UMEMBER.getKey(),
+                        SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs)
+                );
+                log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+            }
 
             return ResponseDto.success();
         } catch (Exception e) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -3,12 +3,11 @@
 40003=登录已过期
 # ------------------------ 4开头错误码作系统保留
 
-10000=请求频繁，稍后再试
-10001=授权失败
+10000=操作过于频繁，请稍后再试
 10001=授权失败
 10002=验证码发送失败
-10003=发送过于频繁，请稍后再试
-10004=验证码错误，请重新输入
+10003=请输入正确手机号
+10004=请输入正确验证码
 10005=手机号获取失败，请更换登录方式
 10006=第三方账号未注册
 10007=该第三方账号已经被其他用户绑定
@@ -17,7 +16,7 @@
 10010=该手机号已被其它账号绑定
 10011=性别标签无效
 10012=音乐风格标签无效
-10013=
+10013=账号与密码不匹配
 10014=
 10015=入场人ID不能为空
 10016=收货地址ID不能为空

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -48,6 +48,9 @@ adam_member_code.exchange=UPDATE adam_member_code SET `state`=?, updated_at=?, u
 adam_member_order.add=INSERT INTO adam_member_order (order_no, `uid`, `mode`, price, price_paid, member_name, member_id, member_price_id, `days`, `state`, member_no, birthday, device_from, pay_type, pay_no, payment_at, created_at, client_ip, `source`, version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 adam_member_order.update=UPDATE adam_member_order SET `state`=?, member_no=?, payment_at=?, updated_at=? WHERE order_no=? 
 
+# ----------------------------------------------------
+adam_member_order_ext.add=INSERT INTO adam_member_order_ext (order_no, express_status, express_receiver, express_phone, express_address) values (?,?,?,?,?)
+
 # ----------------------------------------------------
 adam_user_member.add=INSERT INTO adam_user_member (`uid`, member_id, member_no, `state`, expiry_at, created_at) VALUES (?,?,?,?,?,?) 
 adam_user_member.update=UPDATE adam_user_member SET `state`=?, expiry_at=?, updated_at=? WHERE `uid`=? 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DataMigrationProcessorService.java

@@ -14,7 +14,7 @@ import java.util.List;
 public abstract class DataMigrationProcessorService {
     public static final String MEMBER_NAME = "摩登天空会员";
     public static final String MEMBER_ID = "1";
-    public static final String DG_MBL = "'13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873','15116988001','18611238122','18618244266','15810953641','18844355048','15600619088','15910772493','18511002336','13552662400','15011554195'";
+    public static final String DG_MBL = "'18634375237','18800114459','13724286255','13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873','15116988001','18611238122','18618244266','15810953641','18844355048','15600619088','15910772493','18511002336','13552662400','15011554195'";
     public static final String DG_UID = "'2026628','544327','1997335','773650','809406','1167451','423063','677171','2199391','1837426','2109356','2322832','2337671','2334986','522474','2147432','2337752','2337199'";
     public static List<String> reUidList = new ArrayList<>();
     static {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -60,8 +60,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         if (null != dg) {
             sqlCount = sqlCount + " and uid%" + dG + "=" + dg;
         }
-        String field = "uid,mobile,username,sex,birthday,area,sign,face_url,back_url,created_at,updated_at,is_complete,rong_cloud_token,rong_cloud_tag";
-//                     1-uid,2-mobile,3-username,4-sex,5-birthday,6-area,7-sign,8-face_url,9-back_url,10-created_at,11-updated_at,12-is_complete,13-rong_cloud_token,14-rong_cloud_tag
+        String field = "uid,mobile,username,sex,birthday,area,sign,face_url,back_url,created_at,updated_at,is_complete,rong_cloud_token,rong_cloud_tag,password";
+//                     1-uid,2-mobile,3-username,4-sex,5-birthday,6-area,7-sign,8-face_url,9-back_url,10-created_at,11-updated_at,12-is_complete,13-rong_cloud_token,14-rong_cloud_tag,15-password
         String sql = sqlCount.replace("count(1)", field);
         boolean smFlg = "1".equals(flg);
         if (smFlg) {
@@ -103,6 +103,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         user.setUid(uid);
                         String mobile = row.getString(2);
                         user.setMobile(mobile);
+                        user.setPasswd(row.getString(15));
                         LocalDateTime createdAt = row.getLocalDateTime(10), updatedAt = row.getLocalDateTime(11);
                         user.setIsComplete(row.getInt(12));
                         user.setCreatedAt(createdAt);
@@ -125,6 +126,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         AdamUserInfoVo vo = AdamUserInfoVo.getNew();
                         vo.setUid(user.getUid());
                         vo.setMobile(user.getMobile());
+                        vo.setPasswd(user.getPasswd());
                         vo.setNickname(userInfo.getNickname());
                         vo.setState(user.getState());
                         vo.setSex(sex);