Prechádzať zdrojové kódy

fix: 事务异常范围

xdd 1 týždeň pred
rodič
commit
343556147c

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

@@ -115,7 +115,8 @@ public class FsStorePaymentControllerTest {
     @Test
     public void refund(){
         String[] data = new String[]{
-                "1909799684457627648"
+                "851491647274359744"
+//                "1909799684457627648"
 //                "1909589366116712448",
 //                "1909522277674778624",
 //                "1909492344919425024",
@@ -197,7 +198,7 @@ public class FsStorePaymentControllerTest {
 
     @Test
     public void queryOrder() throws Exception {
-        String payCode = "1908055054582022144";
+        String payCode = "1909873348586766336";
         FsStorePayment payment = fsStorePaymentService.selectFsStorePaymentByCode(payCode);
 
         RequestDTO<QueryOrderRestDTO> requestDTO = new RequestDTO<>();

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

@@ -333,7 +333,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 processContext.setOrderId(param.getOrderId());
                 processContext.setPayType(param.getPayType());
                 processContext.setPaymentId(storePayment.getPaymentId());
-                processContext.setPayCode(payCode);
+                processContext.setPayCode(storePayment.getPayCode());
                 processContext.setFsPayConfig(fsPayConfig);
                 processContext.setUserId(order.getUserId());
                 processContext.setGoodsInfo("商城订单支付");
@@ -2969,7 +2969,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             processContext.setOrderId(param.getOrderId());
             processContext.setPayType(null);
             processContext.setPaymentId(storePayment.getPaymentId());
-            processContext.setPayCode(payCode);
+            processContext.setPayCode(storePayment.getPayCode());
             processContext.setFsPayConfig(fsPayConfig);
             processContext.setUserId(order.getUserId());
             processContext.setGoodsInfo("商城订单支付");