From bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 15 八月 2022 09:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index fc2b009..8151e13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -317,7 +317,7 @@
}
// 调用wx支付
String xml = WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "商品购买", orderCreateDTO.getOpenId(),
- orderNo, money);
+ orderNo, money,null);
log.info("微信支付返回参数:" + xml);
shopOrderVO.setPayResult(xml);
} catch (Exception e) {
@@ -906,7 +906,7 @@
}
// 调用wx支付
String xml = WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "商品购买", orderPayDTO.getOpenId(),
- orderDO.getOrderNo(), money);
+ orderDO.getOrderNo(), money,null);
log.info("微信支付返回参数:" + xml);
shopOrderVO.setPayResult(xml);
} catch (Exception e) {
--
Gitblit v1.7.1