合并dev_paimai

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

@@ -1,8 +1,12 @@
 package com.izouma.nineth.service;
 
+import com.izouma.nineth.annotations.RedisLock;
 import com.izouma.nineth.config.GeneralProperties;
-import com.izouma.nineth.domain.Order;
-import com.izouma.nineth.domain.SysConfig;
+import com.izouma.nineth.config.RedisKeys;
+import com.izouma.nineth.domain.*;
+import com.izouma.nineth.dto.PayQuery;
+import com.izouma.nineth.enums.AuctionOrderStatus;
+import com.izouma.nineth.enums.MintOrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.*;
@@ -16,6 +20,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @ConditionalOnProperty(value = "general.notify-server", havingValue = "true")

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

@@ -118,7 +118,7 @@ public class OrderService {
                         SmsService smsService, ErrorOrderRepo errorOrderRepo, ShowCollectionRepo showCollectionRepo,
                         ShowroomService showroomService, CollectionPrivilegeRepo collectionPrivilegeRepo,
                         UserBankCardRepo userBankCardRepo, CacheService cacheService, UserPropertyRepo userPropertyRepo,
-                        UserBalanceService userBalanceService, ProxyManager<String> proxyManager,) {
+                        UserBalanceService userBalanceService, ProxyManager<String> proxyManager) {
         this.orderRepo = orderRepo;
         this.collectionRepo = collectionRepo;
         this.userAddressRepo = userAddressRepo;

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

@@ -35,6 +35,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @AllArgsConstructor