From bd927f5c9f26d5ae89a272e56a4b3bd655bd148f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:19:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
index 09249ea..4c81f60 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComBatteryCommodityOrderServiceImpl.java
@@ -58,16 +58,14 @@
private ComBatteryTradeOrderService tradeOrderService;
@Value("${min.app.isTest}")
private Boolean isTest;
- @Value("${min.app.isRefundTest}")
- private Boolean isRefundTest;
@Value("${min.app.appid}")
private String appid;
@Value("${min.app.payKey}")
private String payKey;
@Value("${min.app.mchId}")
private String mchId;
- @Value("${min.app.currencyNotifyUrl}")
- private String currencyNotifyUrl;
+// @Value("${min.app.currencyNotifyUrl}")
+// private String currencyNotifyUrl;
@Resource
private ComBatteryCommodityOrderCollageTeamMapper orderCollageTeamMapper;
@Resource
@@ -368,8 +366,8 @@
money = BigDecimal.valueOf(0.01);
}
// 调用wx支付
- result = WxPayUtils.getUnifiedorder(appid, mchId, payKey, currencyNotifyUrl + PayCpmstant.BATTERY_STORE_PAY_NOTIFY_URL
- , remark, openId, orderNo, money,null);
+// result = WxPayUtils.getUnifiedorder(appid, mchId, payKey, currencyNotifyUrl + PayCpmstant.BATTERY_STORE_PAY_NOTIFY_URL
+// , remark, openId, orderNo, money,null);
log.info("用户购买商品微信支付返回参数:" + result);
return result;
}
--
Gitblit v1.7.1