From 0e85e266a6535c858e397c6aabbe03e2cb069d8b Mon Sep 17 00:00:00 2001
From: sdif <xiaoping_0000@163.com>
Date: Sat, 7 Oct 2023 14:40:16 +0800
Subject: [PATCH] 区分APP和小程序支付类型
---
pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java | 5 +++++
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java b/pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java
index 7a7cd4a..cf407c8 100644
--- a/pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java
@@ -117,4 +117,9 @@ public class TotalOrderBo extends BaseEntity {
* pc是否同意退款1-完成退款，2-取消退款
*/
private Integer isPcRefundStatus;
+
+ /**
+ * 区分APP和小程序支付（0小程序1APP）
+ */
+ private Integer paymentType;
}
diff --git a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
index 0759e90..d841d2f 100644
--- a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
@@ -745,13 +745,21 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
orderRequest.setBody(bo.getOrderTitle());
orderRequest.setOutTradeNo(totalOrder.getOrderSn());
orderRequest.setTotalFee(money);// 元转成分
- if(StringUtils.isNotEmpty(openId)){
+ if(null != bo.getPaymentType()){
+ if(bo.getPaymentType() == 0){
+ orderRequest.setOpenid(openId);
+ orderRequest.setTradeType("JSAPI");
+ }else if(bo.getPaymentType() == 1){
+ orderRequest.setTradeType("APP");
+ }
+ }else {
orderRequest.setOpenid(openId);
+ orderRequest.setTradeType("JSAPI");
}
orderRequest.setSpbillCreateIp("127.0.0.1");
orderRequest.setNotifyUrl("https://peizheng.shanpeikj.com/api/applet/totalOrder/orderPayCallBack");
- orderRequest.setTradeType("JSAPI");
+
payment = iPayService.createOrder(orderRequest);
} catch (Exception e) {
--
libgit2 0.26.0