yonge 2 år sedan
förälder
incheckning
9b759f17b0

+ 6 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -267,7 +267,12 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 	        request.setScene("OFFLINE");
 	        request.setMemo(null);
 	        request.setGoodsName(payParam.getOrderSubject());
-	        request.setFundProcessType("DELAY_SETTLE");//需要分账
+	        if (payParam.getTenantId() == 1) {
+                // 延时分账
+		        request.setFundProcessType("DELAY_SETTLE");
+            }else {
+		        request.setFundProcessType("REAL_TIME");
+            }
 	        
 	        if(StringUtils.equals(payParam.getPayChannel(), "alipay_qr") || StringUtils.equals(payParam.getPayChannel(), "alipay_wap")) {
 		        request.setChannel("ALIPAY");

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -341,10 +341,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void queryOrderStatus() throws Exception {
         //yqPayQuery(null);
         adaPayQuery(null);
-        reConfirmOrder(null, null);
+        //reConfirmOrder(null, null);
     }
 
     private void yqPayQuery(List<StudentPaymentOrder> payingOrders) throws Exception {