fix:去除MONGO;

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

 package com.liquidnet.service.adam.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.entity.AdamAddresses;
+
+import java.util.List;
 
 /**
  * <p>
@@ -23,5 +23,5 @@ public interface IAdamAddressesService {
 
     void remove(String uid, String addressesId);
 
-    AdamAddressesVo queryDefault(String uid);
+    AdamAddressesVo queryDefault(List<AdamAddressesVo> vos, String uid, boolean downgrade);
 }

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

@@ -3,6 +3,8 @@ package com.liquidnet.service.adam.service;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 
+import java.util.List;
+
 /**
  * <p>
  * 入场人 服务类
@@ -20,5 +22,5 @@ public interface IAdamEntersService {
 
     void remove(String uid, String entersId);
 
-    AdamEntersVo queryDefault(String uid);
+    AdamEntersVo queryDefault(List<AdamEntersVo> vos, String uid, boolean downgrade);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamSwitchAdminController.java

@@ -39,6 +39,17 @@ public class AdamSwitchAdminController {
         return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_BUY_MEMBER));
     }
 
+    @RequiresPermissions("adam:switch:max:memberno")
+    @ApiOperation(value = "会员用户最大ID_NO")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "会员用户最大ID_NO", example = "15000"),
+    })
+    @PostMapping("set/memberno")
+    public ResponseDto<Object> purchaseStartMemberNo(@Max(1) @Min(0) @RequestParam int opt) {
+        redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, opt);
+        return ResponseDto.success(redisUtil.get(AdamRedisConst.INCR_MEMBER_NO));
+    }
+
     @RequiresPermissions("adam:switch:gray:login")
     @ApiOperation(value = "开放/限制校验证码")
     @ApiImplicitParams({

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

@@ -124,7 +124,7 @@ public class AdamAddressesController {
     @ApiOperation(value = "获取默认收货地址")
     @PostMapping("query/def")
     public ResponseDto<AdamAddressesVo> queryDef() {
-        AdamAddressesVo vo = adamAddressesService.queryDefault(CurrentUtil.getCurrentUid());
+        AdamAddressesVo vo = adamAddressesService.queryDefault(null, CurrentUtil.getCurrentUid(), true);
         if (null != vo) {
             vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
         }

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

@@ -180,7 +180,7 @@ public class AdamEntersController {
     @ApiOperation(value = "获取默认入场人")
     @PostMapping("query/def")
     public ResponseDto<AdamEntersVo> queryDef() {
-        AdamEntersVo vo = adamEntersService.queryDefault(CurrentUtil.getCurrentUid());
+        AdamEntersVo vo = adamEntersService.queryDefault(null, CurrentUtil.getCurrentUid(), true);
         if (null != vo) {
             vo.setName(SensitizeUtil.chineseName(vo.getName()));
             vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));

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

@@ -248,7 +248,7 @@ public class AdamMemberOrderController {
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "会员订单详情")
     @GetMapping("info/{orderNo}")
-    public ResponseDto<AdamMemberOrderVo> getMemberOrderList(@NotBlank(message = "订单号不能为空") @PathVariable String orderNo) {
+    public ResponseDto<AdamMemberOrderVo> getMemberOrder(@NotBlank(message = "订单号不能为空") @PathVariable String orderNo) {
         AdamMemberOrderVo mOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
         if (null != mOrderVo) {
             AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(mOrderVo.getMemberId());

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.entity.AdamRealName;
 import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.util.QueueUtils;
@@ -9,7 +8,6 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -26,8 +24,8 @@ import java.util.List;
 @Slf4j
 @Service
 public class AdamRealNameServiceImpl implements IAdamRealNameService {
-    @Autowired
-    MongoTemplate mongoTemplate;
+//    @Autowired
+//    MongoTemplate mongoTemplate;
     @Autowired
     RedisUtil redisUtil;
     @Autowired
@@ -36,9 +34,9 @@ public class AdamRealNameServiceImpl implements IAdamRealNameService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void add(AdamRealName realName) {
-        long s = System.currentTimeMillis();
-        mongoTemplate.insert(realName, AdamRealInfoVo.class.getSimpleName());
-        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+//        long s = System.currentTimeMillis();
+//        mongoTemplate.insert(realName, AdamRealInfoVo.class.getSimpleName());
+//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
         List<Object> paramList = Arrays.asList(
                 realName.getRealNameId(),
@@ -49,7 +47,7 @@ public class AdamRealNameServiceImpl implements IAdamRealNameService {
                 realName.getState(),
                 realName.getCreatedAt()
         );
-        s = System.currentTimeMillis();
+        long s = System.currentTimeMillis();
         queueUtils.sendMsgByRedis(
                 MQConst.AdamQueue.SQL_UCENTER.getKey(),
                 SqlMapping.get("adam_real_name.add", paramList.toArray())

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.core.JwtValidator;
-import com.liquidnet.commons.lang.util.BsonUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
@@ -11,15 +10,9 @@ import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.adam.util.QueueUtils;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 
@@ -39,8 +32,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
-    @Autowired
-    MongoTemplate mongoTemplate;
+//    @Autowired
+//    MongoTemplate mongoTemplate;
     @Autowired
     AdamRdmService adamRdmService;
     @Autowired
@@ -56,17 +49,17 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
         userInfoVo.setCreateAt(null);
         Document updateDoc = Document.parse(JsonUtils.toJson(userInfoVo));
         updateDoc.replace("updatedAt", userInfoVo.getUpdatedAt());
-        long s = System.currentTimeMillis();
-        UpdateResult updateResult = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("uid").is(userInfoVo.getUid())).getQueryObject(),
-                new Document("$set", updateDoc)
-        );
-        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        if (updateResult.getModifiedCount() <= 0) {
-            log.warn("Invalid update MDB.AdamUserInfoVo:{}", JsonUtils.toJson(userInfoVo));
-        }
+//        long s = System.currentTimeMillis();
+//        UpdateResult updateResult = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).updateOne(
+//                Query.query(Criteria.where("uid").is(userInfoVo.getUid())).getQueryObject(),
+//                new Document("$set", updateDoc)
+//        );
+//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+//        if (updateResult.getModifiedCount() <= 0) {
+//            log.warn("Invalid update MDB.AdamUserInfoVo:{}", JsonUtils.toJson(userInfoVo));
+//        }
 
-        s = System.currentTimeMillis();
+        long s = System.currentTimeMillis();
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
@@ -105,17 +98,18 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 //        AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
 //        updateInfoVo.setUpdatedAt(now);
 //        updateInfoVo.setMobile(mobile);
-        long s = System.currentTimeMillis();
-        Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("uid").is(uid)).getQueryObject(),
-                new Document("$set", new Document("mobile", mobile).append("updatedAt", now)),
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
-        );
-        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        log.debug("edit mobile - before doc:{}", JsonUtils.toJson(doc));
-        AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
+//        long s = System.currentTimeMillis();
+//        Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
+//                Query.query(Criteria.where("uid").is(uid)).getQueryObject(),
+//                new Document("$set", new Document("mobile", mobile).append("updatedAt", now)),
+//                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
+//        );
+//        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+//        log.debug("edit mobile - before doc:{}", JsonUtils.toJson(doc));
+//        AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
+        AdamUserInfoVo beforeUserInfoVo = adamRdmService.getUserInfoVoByUid(uid);
 
-        s = System.currentTimeMillis();
+        long s = System.currentTimeMillis();
         adamRdmService.delUidByMobile(beforeUserInfoVo.getMobile());
         adamRdmService.setUidByMobile(mobile, uid);
         beforeUserInfoVo.setMobile(mobile);

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

@@ -2,15 +2,10 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
-import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.util.regex.Pattern;
@@ -20,8 +15,8 @@ import static com.liquidnet.service.adam.constant.AdamRedisConst.LOCK_KEY_UMEMBE
 @Slf4j
 @Service
 public class AdamUserMemberServiceImpl implements IAdamUserMemberService {
-    @Autowired
-    MongoTemplate mongoTemplate;
+//    @Autowired
+//    MongoTemplate mongoTemplate;
     @Autowired
     AdamRdmService adamRdmService;
 
@@ -33,17 +28,17 @@ public class AdamUserMemberServiceImpl implements IAdamUserMemberService {
             if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3)) {
                 memberMaxNo = adamRdmService.getMaxMemberNo();
                 if (-1 == memberMaxNo) {
-                    Query query = Query.query(Criteria.where("memberId").is(memberId)).with(Sort.by(Sort.Direction.DESC, "memberNo")).limit(1);
-
-                    AdamUserMemberVo latestMaxMemberNoVo = mongoTemplate.findOne(query, AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
-
-                    if (null == latestMaxMemberNoVo) {
+//                    Query query = Query.query(Criteria.where("memberId").is(memberId)).with(Sort.by(Sort.Direction.DESC, "memberNo")).limit(1);
+//
+//                    AdamUserMemberVo latestMaxMemberNoVo = mongoTemplate.findOne(query, AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
+//
+//                    if (null == latestMaxMemberNoVo) {
                         AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(memberId);
 
                         adamRdmService.setMaxMemberNo(memberVo.getStartNo());
-                    } else {
-                        adamRdmService.setMaxMemberNo(Integer.parseInt(latestMaxMemberNoVo.getMemberNo()));
-                    }
+//                    } else {
+//                        adamRdmService.setMaxMemberNo(Integer.parseInt(latestMaxMemberNoVo.getMemberNo()));
+//                    }
                 }
                 RedisLockUtil.unlock(LOCK_KEY_UMEMBER_NO);
             } else {