From 7d5d34b9ff67d87844339d65d3f02c4377eaf144 Mon Sep 17 00:00:00 2001 From: yang_shj Date: Tue, 1 Mar 2022 14:10:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:0=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/libraries/bcprov_ext_jdk15on_1_46.xml | 15 ------ payment-base-app/pom.xml | 50 +++++++++++++++++++ .../service/imp/MerchantServiceImp.java | 14 ++++-- .../com/base/springcloud/util/WxpayUtils.java | 2 +- 4 files changed, 62 insertions(+), 19 deletions(-) delete mode 100644 .idea/libraries/bcprov_ext_jdk15on_1_46.xml diff --git a/.idea/libraries/bcprov_ext_jdk15on_1_46.xml b/.idea/libraries/bcprov_ext_jdk15on_1_46.xml deleted file mode 100644 index b13b5ac..0000000 --- a/.idea/libraries/bcprov_ext_jdk15on_1_46.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml index d5087e5..1c640a7 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -157,5 +157,55 @@ + + + commons-httpclient + commons-httpclient + 3.0.1 + + + commons-logging + commons-logging + 1.1 + + + commons-codec + commons-codec + 1.3 + + + commons-lang + commons-lang + 2.3 + + + bcprov-ext-jdk15on + bcprov-ext-jdk15on + 1.4.6 + + + hiiposm_engine_simple + hiiposm_engine_simple + 2.3.4 + + + securityAPI-client + securityAPI-client + 1.0.0 + + + + + + nexus-releases + maven-releases + http://maven.hnrr.com.cn/repository/maven-releases/ + + + nexus-snapshots + maven-snapshots + http://maven.hnrr.com.cn/repository/maven-snapshots/ + + \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index a2ed6dc..8b23617 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java @@ -2,10 +2,14 @@ package com.base.springcloud.service.imp; import com.base.springcloud.bo.MerchantConfigBO; import com.base.springcloud.bo.OrderBO; +import com.base.springcloud.constant.PaymentConstant; import com.base.springcloud.dao.MerchantConfigMapper; import com.base.springcloud.entity.MerchantConfig; +import com.base.springcloud.entity.WxpayTradeVo; import com.base.springcloud.service.MerchantService; import com.base.springcloud.util.FtpUtil; +import com.base.springcloud.util.WxpayUtils; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -185,8 +189,8 @@ public class MerchantServiceImp implements MerchantService { /*public static void main(String[] args) { WxpayTradeVo wxpayTradeVo = new WxpayTradeVo(); - wxpayTradeVo.setAppid("wxd678efh567hg6787"); - wxpayTradeVo.setMchid("1230000109"); + wxpayTradeVo.setAppid("wxa91984b310053c3d"); + wxpayTradeVo.setMchid("1610494969"); wxpayTradeVo.setDescription("Image形象店-深圳腾大-QQ公仔"); wxpayTradeVo.setOut_trade_no("20220301095644"); wxpayTradeVo.setNotify_url("https://www.weixin.qq.com/wxpay/pay.php"); @@ -194,6 +198,10 @@ public class MerchantServiceImp implements MerchantService { wxTradeAmountVo.setTotal(1l); wxTradeAmountVo.setCurrency("CNY"); wxpayTradeVo.setAmount(wxTradeAmountVo); - ObjectNode objectNode = WxpayUtils.getWxpay(wxpayTradeVo, PaymentConstant.NATIVE,"114233","1069818635","13587645303"); + ObjectNode objectNode = WxpayUtils.getWxpay(wxpayTradeVo, + PaymentConstant.NATIVE, + "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"); }*/ } \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java b/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java index f12e360..2b5ba04 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java +++ b/payment-base-app/src/main/java/com/base/springcloud/util/WxpayUtils.java @@ -95,7 +95,7 @@ public class WxpayUtils { * @param serialNo * @return */ - public static void refund(WxpayRefundVo tradeVo, String mchid, String privateKey, String certificate, String serialNo) { + public static void refund(WxpayRefundVo tradeVo, String mchid, String privateKey, String certificate, String serialNo) { // ... String responseBody = response(JSON.toJSONString(tradeVo), REFUND_URL, mchid, privateKey, certificate, serialNo); log.info("======>>> wxrefund response body: ", responseBody);