Browse Source

FIX: 修改锁时间

xdd 2 days ago
parent
commit
e12b6b5897

+ 2 - 2
fs-admin/src/test/java/com/fs/store/controller/FsStorePaymentControllerTest.java

@@ -317,8 +317,8 @@ public class FsStorePaymentControllerTest {
         PayProcessContext processContext = new PayProcessContext();
         processContext.setOrderId(null);
         processContext.setPayType(null);
-        processContext.setPaymentId(1334828L);
-        processContext.setPayCode("1947198650681655296");
+        processContext.setPaymentId(1373304L);
+        processContext.setPayCode("1980533834124152832");
         String json = configService.selectConfigByKey("store.pay");
         FsPayConfig fsPayConfig = JSON.parseObject(json, FsPayConfig.class);
         processContext.setFsPayConfig(fsPayConfig);

+ 4 - 4
fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -477,7 +477,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 }
                 R process = payment.createOrder(processContext);
                 if("200".equals(String.valueOf(process.get("code")))){
-                    redisCache.setCacheObject("isPaying:"+param.getOrderId(),1,3,TimeUnit.MINUTES);
+                    redisCache.setCacheObject("isPaying:"+param.getOrderId(),1,10,TimeUnit.MINUTES);
 
                     return process;
                 }
@@ -3307,7 +3307,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 
             R process = payment.createOrder(processContext);
             if("200".equals(String.valueOf(process.get("code")))){
-                redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),3, TimeUnit.MINUTES);
+                redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),10, TimeUnit.MINUTES);
                 return process;
             }
         } catch (WxErrorException e) {
@@ -3390,7 +3390,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     mt.setPaymentId(storePayment.getPaymentId());
                     mt.setTradeNo(result.getHf_seq_id());
                     fsStorePaymentMapper.updateFsStorePayment(mt);
-                    redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),3, TimeUnit.MINUTES);
+                    redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),10, TimeUnit.MINUTES);
                     return R.ok().put("result",result.getPay_info());
                 }else{
                     return R.error(result.getResp_desc());
@@ -3796,7 +3796,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     mt.setPaymentId(storePayment.getPaymentId());
                     mt.setTradeNo(result.getHf_seq_id());
                     fsStorePaymentMapper.updateFsStorePayment(mt);
-                    redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),3, TimeUnit.MINUTES);
+                    redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),10, TimeUnit.MINUTES);
                     return R.ok().put("result",result.getPay_info());
                 }
                 else{