Merge branch 'dev'

src/main/java/com/izouma/nineth/service/MintOrderService.java

@@ -123,7 +123,6 @@ public class MintOrderService {
     }
 
     @Transactional
-    @RedisLock(value = "'mintOrderLock'+#{userId}", expire = 30)
     public void create(Long userId, List<Long> assetIds) {
         User user = userRepo.findByIdAndDelFalse(userId).orElseThrow(new BusinessException("用户不存在"));
         User blackHole = userRepo.findByIdAndDelFalse(Constants.BLACK_HOLE_USER_ID)
@@ -198,6 +197,7 @@ public class MintOrderService {
      * @param addressId      地址
      */
 //    @Transactional
+    @RedisLock(value = "'mintOrderLock'+#{userId}", expire = 30)
     public MintOrder create(User user, List<Long> assetId, Long mintActivityId, Long addressId) {
         // 参加的活动
         MintActivity mintActivity = mintActivityRepo.findByIdAndDelFalse(mintActivityId)