~OPT:API返回非必要属性处理;

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

 package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +11,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @ApiModel(value = "AdamEntersVo", description = "入场人")
+@JsonIgnoreProperties(value = {"uid", "state", "deletedAt"})
 @Data
 public class AdamEntersVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -9143065766410946012L;

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

 package com.liquidnet.service.adam.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.adam.entity.AdamRealName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 @ApiModel(value = "AdamRealInfoVo", description = "实名信息")
+@JsonIgnoreProperties(value = {"uid"})
 @Data
 public class AdamRealInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -3469256375584132928L;

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

 package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.entity.AdamThirdParty;
 import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @ApiModel(value = "ThirdPartInfoVo", description = "用户第三方信息")
+@JsonIgnoreProperties(value = {"uid"})
 @Data
 public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -3239086191919676121L;

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

 package com.liquidnet.service.adam.dto.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.SensitizeUtil;
-import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
-@ApiModel(value = "AdamUserInfoVo", description = "用户详情")
+@ApiModel(value = "AdamUserInfoSimpleVo", description = "用户简易信息")
 @Data
 public class AdamUserInfoSimpleVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = 8479869354894030303L;

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import io.swagger.annotations.ApiModel;
@@ -13,6 +14,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 @ApiModel(value = "AdamUserMemberVo", description = "会员用户信息")
+@JsonIgnoreProperties(value = {"uid"})
 @Data
 public class AdamUserMemberVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 9027553500608702757L;

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

@@ -66,7 +66,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
                 SqlMapping.get("adam_addresses.add",
                         vo.getAddressesId(), currentUid, vo.getName(), vo.getPhone(),
                         vo.getProvince(), vo.getProvinceId(), vo.getCity(), vo.getCityId(),
-                        vo.getCounty(), vo.getCountyId(), vo.getAddress(), vo.getIsDefault(), vo.getState(), now
+                        vo.getCounty(), vo.getCountyId(), vo.getAddress(), vo.getIsDefault(), 1, now
                 )
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);

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

@@ -75,7 +75,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
         s = System.currentTimeMillis();
         String msg = SqlMapping.get("adam_enters.add",
-                vo.getEntersId(), vo.getUid(), vo.getType(), vo.getName(), vo.getMobile(), vo.getIdCard(), vo.getIsDefault(), vo.getState(), now
+                vo.getEntersId(), currentUid, vo.getType(), vo.getName(), vo.getMobile(), vo.getIdCard(), vo.getIsDefault(), 1, now
         );
         log.debug("#SQL.GET耗时:{}ms", System.currentTimeMillis() - s);
 
@@ -161,7 +161,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         queueUtils.sendMsgByRedis(
                 MQConst.AdamQueue.SQL_UCENTER.getKey(),
                 SqlMapping.get("adam_enters.edit",
-                        updateVo.getType(), updateVo.getName(), updateVo.getMobile(), updateVo.getIdCard(), updateVo.getIsDefault(), updateVo.getState(), now, updateVo.getEntersId()
+                        updateVo.getType(), updateVo.getName(), updateVo.getMobile(), updateVo.getIdCard(), updateVo.getIsDefault(), now, updateVo.getEntersId()
                 )
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);

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

@@ -247,7 +247,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 
                     toMqSqls.add(SqlMapping.get("adam_user_member.add"));
                     operationObjs.add(new Object[]{
-                            initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
+                            handleMemberOrderVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
                             initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
                     });
                 } else {// 续费
@@ -268,7 +268,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 
                     toMqSqls.add(SqlMapping.get("adam_user_member.update"));
                     operationObjs.add(new Object[]{
-                            updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid()
+                            updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, handleMemberOrderVo.getUid()
                     });
                 }
             }
@@ -458,7 +458,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     initMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
                     upsertUserMemberObjs = CollectionUtil.linkedListObjectArr(),
                     initMemberOrderExtObjs = CollectionUtil.linkedListObjectArr();
-            existUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
+            existUserMemberVo = adamRdmService.getUserMemberVoByUid(currentUid);
             if (null != existUserMemberVo) {// 已是会员
                 AdamUserMemberVo updateExistUserMemberVo = AdamUserMemberVo.getNew();
                 BeanUtils.copyProperties(existUserMemberVo, updateExistUserMemberVo);
@@ -472,12 +472,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                 updateExistUserMemberVo.setUpdatedAt(now);
                 toMqSqls.add(SqlMapping.get("adam_user_member.update"));
                 upsertUserMemberObjs.add(new Object[]{
-                        updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid()
+                        updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, currentUid
                 });
-                adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), updateExistUserMemberVo);
+                adamRdmService.setUserMemberVoByUid(currentUid, updateExistUserMemberVo);
             } else {// 新会员
                 initUserMemberVo = AdamUserMemberVo.getNew();
-                initUserMemberVo.setUid(initMemberOrderVo.getUid());
+                initUserMemberVo.setUid(currentUid);
                 initUserMemberVo.setMemberId(memberCodeVo.getMemberId());
                 initUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
                 initUserMemberVo.setState(1);
@@ -486,25 +486,25 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 
                 toMqSqls.add(SqlMapping.get("adam_user_member.add"));
                 upsertUserMemberObjs.add(new Object[]{
-                        initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
+                        currentUid, initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
                         initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
                 });
-                adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), initUserMemberVo);
+                adamRdmService.setUserMemberVoByUid(currentUid, initUserMemberVo);
             }
             long s = System.currentTimeMillis();
-            memberOrderVos = adamRdmService.getMemberOrderVosByUid(initMemberOrderVo.getUid());
-            adamRdmService.addMemberOrderVoByUid(initMemberOrderVo.getUid(), memberOrderVos, initMemberOrderVo);
+            memberOrderVos = adamRdmService.getMemberOrderVosByUid(currentUid);
+            adamRdmService.addMemberOrderVoByUid(currentUid, memberOrderVos, initMemberOrderVo);
 //            adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             toMqSqls.add(SqlMapping.get("adam_member_code.exchange"));
             updateMemberCodeObjs.add(new Object[]{
-                    1, now, initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), now, memberCodeVo.getCode()
+                    1, now, initMemberOrderVo.getOrderNo(), currentUid, now, memberCodeVo.getCode()
             });
 
             toMqSqls.add(SqlMapping.get("adam_member_order.add"));
             initMemberOrderObjs.add(new Object[]{
-                    initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), initMemberOrderVo.getMode(), initMemberOrderVo.getPrice(),
+                    initMemberOrderVo.getOrderNo(), currentUid, initMemberOrderVo.getMode(), initMemberOrderVo.getPrice(),
                     initMemberOrderVo.getPricePaid(), initMemberOrderVo.getMemberName(), initMemberOrderVo.getMemberId(), initMemberOrderVo.getMemberPriceId(),
                     initMemberOrderVo.getDays(), initMemberOrderVo.getState(), initMemberOrderVo.getMemberNo(),
                     initMemberOrderVo.getBirthday(), initMemberOrderVo.getArea(),
@@ -521,7 +521,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     memberOrderExtVo.getExpressPhone(), memberOrderExtVo.getExpressAddress()
             });
 
-            AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(initMemberOrderVo.getUid());
+            AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
             // 生日、地区同步到用户资料
             toMqSqls.add(SqlMapping.get("adam_user_info.update_by_member"));
             LinkedList<Object[]> updateUserInfoObjs = this.syncUserInfoProcessing(now, userInfoVo, initMemberOrderVo);
@@ -542,11 +542,11 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
             adamRdmService.setMemberCodeVoByCode(memberCodeVo.getCode(), memberCodeVo);
             if (null != initMemberOrderVo) {
                 if (null != existUserMemberVo) {// 已是会员
-                    adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), existUserMemberVo);
+                    adamRdmService.setUserMemberVoByUid(currentUid, existUserMemberVo);
                 } else {// 新会员
-                    adamRdmService.delUserMemberVoByUid(initMemberOrderVo.getUid());
+                    adamRdmService.delUserMemberVoByUid(currentUid);
                 }
-                adamRdmService.rmvMemberOrderVoByUid(initMemberOrderVo.getUid(), memberOrderVos, initMemberOrderVo.getOrderNo());
+                adamRdmService.rmvMemberOrderVoByUid(currentUid, memberOrderVos, initMemberOrderVo.getOrderNo());
             }
             return ResponseDto.failure(ErrorMapping.get("10214"));
         }

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

@@ -126,14 +126,15 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 initUserMobileLocateObjs = CollectionUtil.linkedListObjectArr();
         if (StringUtils.isEmpty(uid)) {// 不存在UID，手机号未注册
             userInfoVo = AdamUserInfoVo.getNew();
+            String registerUid = IDGenerator.nextSnowId();
 
-            userInfoVo.setUid(IDGenerator.nextSnowId());
+            userInfoVo.setUid(registerUid);
             userInfoVo.setMobile(param.getMobile());
             userInfoVo.setNickname(param.getNickname());
             userInfoVo.setAvatar(param.getAvatar());
             userInfoVo.setIsComplete(0);
             userInfoVo.setState(1);
-            userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
+            userInfoVo.setQrCode("lN".concat(registerUid).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
             userInfoVo.setCreateAt(now);
 
             String[] mobileLocateArr = adamRdmService.getMobileLocateArr(param.getMobile());
@@ -142,7 +143,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 String cliIpAddr = CurrentUtil.getCliIpAddr();
                 String headerCliSource = CurrentUtil.getHeaderCliSource();
                 initUserMobileLocateObjs.add(new Object[]{
-                        userInfoVo.getUid(), userInfoVo.getMobile(), 1,
+                        registerUid, userInfoVo.getMobile(), 1,
                         mobileLocateArr[0], mobileLocateArr[1], mobileLocateArr[2], mobileLocateArr[3], mobileLocateArr[4],
                         userInfoVo.getMobile(), cliIpAddr, headerCliSource, now, cliIpAddr, headerCliSource, now, now
                 });
@@ -150,26 +151,26 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 userInfoVo.setCity(mobileLocateArr[1]);
             }
 
-            adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
+            adamRdmService.setUserInfoVoByUid(registerUid, userInfoVo);
 
             toMqSqls.add(SqlMapping.get("adam_user.add"));
-            initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
+            initUserObjs.add(new Object[]{registerUid, userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
             toMqSqls.add(SqlMapping.get("adam_user_info.add"));
-            initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getAvatar(), userInfoVo.getQrCode()});
+            initUserInfoObjs.add(new Object[]{registerUid, userInfoVo.getNickname(), userInfoVo.getAvatar(), userInfoVo.getQrCode()});
 
             AdamThirdPartInfoVo thirdPartInfoVo = AdamThirdPartInfoVo.getNew();
             BeanUtils.copyProperties(param, thirdPartInfoVo);
             thirdPartInfoVo.setCreatedAt(now);
-            thirdPartInfoVo.setUid(userInfoVo.getUid());
+            thirdPartInfoVo.setUid(registerUid);
             thirdPartInfoVo.setState(1);// 1-绑定
 
             toMqSqls.add(SqlMapping.get("adam_third_party.add"));
-            initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
+            initThirdPartObjs.add(new Object[]{registerUid, thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
 
             s = System.currentTimeMillis();
-            adamRdmService.addThirdPartVoListByUid(thirdPartInfoVo.getUid(), null, thirdPartInfoVo);
-            adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), thirdPartInfoVo.getUid());
-            adamRdmService.setUidByMobile(param.getMobile(), thirdPartInfoVo.getUid());
+            adamRdmService.addThirdPartVoListByUid(registerUid, null, thirdPartInfoVo);
+            adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), registerUid);
+            adamRdmService.setUidByMobile(param.getMobile(), registerUid);
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             s = System.currentTimeMillis();
@@ -225,7 +226,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UCENTER.getKey(),
                 SqlMapping.get(
                         "adam_third_party.add",
-                        thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
+                        uid, thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
                 )
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
@@ -253,7 +254,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UCENTER.getKey(),
                 SqlMapping.get(
                         "adam_third_party.add",
-                        bindThirdPartVo.getUid(), bindThirdPartVo.getOpenId(), bindThirdPartVo.getAvatar(), bindThirdPartVo.getNickname(), bindThirdPartVo.getPlatform(), bindThirdPartVo.getState(), bindThirdPartVo.getCreatedAt()
+                        bindUid, bindThirdPartVo.getOpenId(), bindThirdPartVo.getAvatar(), bindThirdPartVo.getNickname(), bindThirdPartVo.getPlatform(), bindThirdPartVo.getState(), bindThirdPartVo.getCreatedAt()
                 )
         );
     }

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

@@ -29,7 +29,7 @@ adam_addresses.close=UPDATE adam_addresses SET `state`=2, updated_at=?, deleted_
 
 # ----------------------------------------------------
 adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?) 
-adam_enters.edit=UPDATE adam_enters SET `type`=?, `name`=?, mobile=?, id_card=?, is_default=?, `state`=?, updated_at=? where enters_id=? 
+adam_enters.edit=UPDATE adam_enters SET `type`=?, `name`=?, mobile=?, id_card=?, is_default=?, updated_at=? WHERE enters_id=? 
 adam_enters.update.is_default=UPDATE adam_enters set is_default=?, updated_at=? where enters_id=? 
 adam_enters.remove=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
 adam_enters.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=?, comment='close' where uid=? 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -184,7 +184,7 @@ public class OrderUtils {
         String resultData = HttpUtil.get(adamUrl + "/adam/member/check/depth/new?uid=" + uid, null, header);
         ResponseDto<AdamUserMemberVo> vo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamUserMemberVo>>() {
         });
-        if (null != vo.getData() && null != vo.getData().getUid() && vo.getData().isActive()) {
+        if (null != vo.getData() && vo.getData().isActive()) {
             return vo.getData();
         } else {
             return null;