From 1987c54a9986885fb8e1ab491783cbd6f5e9f6bc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 23 七月 2023 18:50:25 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 452e419..b8b2113 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -15,7 +15,6 @@
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.account.OrderPayment;
import com.ruoyi.order.domain.pojo.account.OrderRefund;
-import com.ruoyi.order.domain.pojo.account.PaymentMessage;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.pojo.order.OrderGoods;
@@ -26,7 +25,6 @@
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.order.tools.request.ecommerce.profitsharing.ProfitSharingApplyRequest;
-import com.ruoyi.order.tools.request.pay.combine.CombineTransactionsJsRequest;
import com.ruoyi.order.tools.service.ProfitsSharingService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.DelayTaskEnum;
@@ -43,6 +41,8 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
+import com.wechat.pay.java.core.Config;
+import com.wechat.pay.java.core.RSAConfig;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
import com.wechat.pay.java.service.payments.jsapi.model.*;
@@ -59,10 +59,6 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
-
-import com.wechat.pay.java.core.Config;
-import com.wechat.pay.java.core.RSAConfig;
-import com.wechat.pay.java.service.payments.jsapi.JsapiService;
/**
* <p>
@@ -719,27 +715,17 @@
request.setDescription(order.getGoodsInfo());
request.setNotifyUrl(this.notifyUrl);
request.setOutTradeNo(order.getOrderId());
- Payer payer = new Payer(); payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
-
+ Payer payer = new Payer();
+ payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
request.setPayer(payer);
-
- //设置订单允许分账 秒杀活动才允许分账
- /* if(order.getOrderFrom()==2){
- SettleInfo settleInfo=new SettleInfo();
- settleInfo.setProfitSharing(true);
- request.setSettleInfo(settleInfo);
- }*/
-
-
//返回前端唤醒支付结果信息
- PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request);
-
+ /*PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request);
appPlaceOrderVo.setAppId(this.appId);
appPlaceOrderVo.setTimeStamp(res.getTimeStamp());
appPlaceOrderVo.setNonceStr(res.getNonceStr());
appPlaceOrderVo.setPackageStr(res.getPackageVal());
appPlaceOrderVo.setTradeType(res.getSignType());
- appPlaceOrderVo.setPaySign(res.getPaySign());
+ appPlaceOrderVo.setPaySign(res.getPaySign());*/
//减去优惠券
@@ -1079,7 +1065,7 @@
//返回前端唤醒支付结果信息
- PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request);
+ /*PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request);
appPlaceOrderVo.setAppId(this.appId);
appPlaceOrderVo.setTimeStamp(res.getTimeStamp());
@@ -1087,7 +1073,7 @@
appPlaceOrderVo.setPackageStr(res.getPackageVal());
appPlaceOrderVo.setTradeType(res.getSignType());
appPlaceOrderVo.setPaySign(res.getPaySign());
-
+*/
//生成自动取消订单延时任务
Integer delayTime = 30;
--
Gitblit v1.7.1