Merge branch 'dev' into test

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

@@ -84,11 +84,11 @@ public interface IAdamRdmService {
 
     void delShotMemberOrderVoByOrderNo(String uid, String orderNo);
 
-    boolean setMemberNoByMemberId(String memberId, long val);
+    boolean setMaxMemberNo(int val);
 
-    long incrMemberNoByMemberId(String memberId);
+    int incrMemberNo();
 
-    Object getMemberMaxNoByMemberId(String memberId);
+    int getMaxMemberNo();
 
     boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo);
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/pom.xml

@@ -17,7 +17,15 @@
     <dependencies>
         <dependency>
             <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-service-adam-api</artifactId>
+            <artifactId>liquidnet-common-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-mq</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -27,10 +35,16 @@
         </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
+            <artifactId>liquidnet-common-cache-redisson</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-adam-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-api-feign-kylin</artifactId>

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

@@ -34,7 +34,7 @@ public class AdamRedisConst {
 
     public static final String INCR = ADAM.concat("incr:");
 
-    public static final String INCR_MEMBER_NO = INCR.concat(":member_no:");
+    public static final String INCR_MEMBER_NO = INCR.concat("member_no");
 
     public static final String INFO_MEMBERS = ADAM.concat(":list:members");
     public static final String INFO_MEMBERS_INFO = ADAM.concat(":list:members:info:");

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

@@ -370,18 +370,19 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public boolean setMemberNoByMemberId(String memberId, long val) {
-        return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO.concat(memberId), val);
+    public boolean setMaxMemberNo(int val) {
+        return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, val);
     }
 
     @Override
-    public long incrMemberNoByMemberId(String memberId) {
-        return redisUtil.incr(AdamRedisConst.INCR_MEMBER_NO.concat(memberId), 1);
+    public int incrMemberNo() {
+        return (int) redisUtil.incr(AdamRedisConst.INCR_MEMBER_NO, 1);
     }
 
     @Override
-    public Object getMemberMaxNoByMemberId(String memberId) {
-        return redisUtil.get(AdamRedisConst.INCR_MEMBER_NO.concat(memberId));
+    public int getMaxMemberNo() {
+        Object o = redisUtil.get(AdamRedisConst.INCR_MEMBER_NO);
+        return null == o ? -1 : (int) o;
     }
 
     @Override

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
@@ -25,32 +27,38 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
     @Autowired
     IAdamRdmService adamRdmService;
 
+    private static final String LOCK_KEY_UMEMBER_NO = "adam:lk:member_no";
+
     @Override
     public String getNextMemberNo(String memberId) {
-        Object memberMaxNoByMemberId = adamRdmService.getMemberMaxNoByMemberId(memberId);
-        if (null == memberMaxNoByMemberId) {
-            // TODO: 2021/6/8 +锁：查取MONGO当前最大会员号
-
-            Query query = Query.query(Criteria.where("memberId").is(memberId)).with(Sort.by(Sort.Direction.DESC, "memberNo")).limit(1);
+        int memberMaxNo = adamRdmService.getMaxMemberNo();
+        if (-1 == memberMaxNo) {
+            if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3000)) {
+                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());
+                    AdamUserMemberVo latestMaxMemberNoVo = mongoTemplate.findOne(query, AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
 
-            if (null == latestMaxMemberNoVo) {
-                AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(memberId);
+                    if (null == latestMaxMemberNoVo) {
+                        AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(memberId);
 
-                adamRdmService.setMemberNoByMemberId(memberId, memberVo.getStartNo());
+                        adamRdmService.setMaxMemberNo(memberVo.getStartNo());
+                    } else {
+                        adamRdmService.setMaxMemberNo(Integer.parseInt(latestMaxMemberNoVo.getMemberNo()));
+                    }
+                }
+                RedisLockUtil.unlock(LOCK_KEY_UMEMBER_NO);
             } else {
-                adamRdmService.setMemberNoByMemberId(memberId, Long.parseLong(latestMaxMemberNoVo.getMemberNo()));
+                return null;
             }
-            return String.valueOf(adamRdmService.incrMemberNoByMemberId(memberId));
-        } else {
-            String nextMemberNoStr = String.valueOf(adamRdmService.incrMemberNoByMemberId(memberId));
-            if (Pattern.matches("([\\d])\\1{" + (nextMemberNoStr.length() - 1) + "}", nextMemberNoStr)) {
-                // 不能是完全相同的数字
-                nextMemberNoStr = String.valueOf(adamRdmService.incrMemberNoByMemberId(memberId));
-            }
-            return nextMemberNoStr;
         }
+        String nextMemberNoStr = String.valueOf(adamRdmService.incrMemberNo());
+        if (Pattern.matches("([\\d])\\1{" + (nextMemberNoStr.length() - 1) + "}", nextMemberNoStr)) {
+            // 不能是完全相同的数字
+            nextMemberNoStr = String.valueOf(adamRdmService.incrMemberNo());
+        }
+        return nextMemberNoStr;
     }
 
 //    @Override

liquidnet-bus-service/liquidnet-service-adam/pom.xml

@@ -17,14 +17,7 @@
     </modules>
 
     <dependencies>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-swagger</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-web</artifactId>
-        </dependency>
+
     </dependencies>
 
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -130,7 +130,7 @@ CREATE TABLE `kylin_performances`
     `sponsor`         varchar(255) NOT NULL DEFAULT '' COMMENT '主办方',
     `contacts`        varchar(255) NOT NULL DEFAULT '' COMMENT '联系人',
     `mobile`          varchar(255) NOT NULL DEFAULT '' COMMENT '联系电话',
-    `describes`       varchar(255) NOT NULL DEFAULT '' COMMENT '演出简介',
+    `describes`       text  NULL DEFAULT NULL COMMENT '演出简介',
     `details`         longtext              DEFAULT NULL COMMENT '演出详情',
     `notice_image`    text                  DEFAULT NULL COMMENT '购票须知',
     `time_start`      datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '演出开始时间',

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/DataController.java

+package com.liquidnet.service.kylin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
+import com.liquidnet.service.kylin.service.impl.DataImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api(tags = "数据迁移 (会重复)")
+@RestController
+@RequestMapping("data")
+public class DataController {
+
+    @Autowired
+    private DataImpl data;
+
+    @PostMapping("performance")
+    @ApiOperation("演出数据迁移")
+    public ResponseDto<Boolean> performance() {
+        Boolean result = data.performance();
+        return ResponseDto.success(result);
+    }
+}