diff --git a/src/main/java/com/yxt/pay/api/wxpay/WxPayVo.java b/src/main/java/com/yxt/pay/api/wxpay/WxPayVo.java index 2cdba92..bb80e7e 100644 --- a/src/main/java/com/yxt/pay/api/wxpay/WxPayVo.java +++ b/src/main/java/com/yxt/pay/api/wxpay/WxPayVo.java @@ -24,10 +24,13 @@ public class WxPayVo { public WxPayVo(int source) { if (source == 0) {//云菜窖 appId = "wx4724e3a3c27f36b5"; - mchId = "1664882765"; + mchId = "1703297075"; secret = "yxtcxjshbyxgs1234567898765432101"; appSecret = "971fd3b8aa7b08ce3e8a5f3e502b1a8d"; - +// appId ="wxc1a7e6792a779a52"; +// mchId ="1575565631"; +// secret="YxtYdscWxPayKey12345678987654321"; +// appSecret ="10d6c42370127e0389881907560cc43c"; } else if (source == 1) { } else if (source == 2) { diff --git a/src/main/java/com/yxt/pay/biz/refund/WxRefundService.java b/src/main/java/com/yxt/pay/biz/refund/WxRefundService.java index a370664..4030394 100644 --- a/src/main/java/com/yxt/pay/biz/refund/WxRefundService.java +++ b/src/main/java/com/yxt/pay/biz/refund/WxRefundService.java @@ -73,6 +73,7 @@ public class WxRefundService extends MybatisBaseService().eq("sid",refundOrderDto.getOrderSid())); @@ -93,6 +94,7 @@ public class WxRefundService extends MybatisBaseService().eq("sid",orderSid)); RefundOrder refundOrder=baseMapper.selectOne(new QueryWrapper().eq("orderSid",payOrder.getSid()).eq("state","1")); try { @@ -132,8 +134,10 @@ public class WxRefundService extends MybatisBaseService().eq("outTradeNo",parse.getOutTradeNo())); + RefundOrder refundOrder=baseMapper.selectOne(new QueryWrapper().eq("outTradeNo",parse.getOutTradeNo()).eq("state","1")); PayOrder payOrder=orderService.getOne(new QueryWrapper().eq("sid",refundOrder.getOrderSid())); //parse.getRefundStatus().equals("SUCCESS");说明退款成功 RefundBusinessQuery query=new RefundBusinessQuery(); diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index fd134f1..e8c4377 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -4,6 +4,7 @@ spring: url: jdbc:mysql://127.0.0.1:3306/yxt_pay?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true username: root password: 1LAiGz$t1*Iw +# password: Yxt@67508182 cloud: nacos: discovery: @@ -21,5 +22,25 @@ spring: port: 6379 timeout: 0 # 连接超时时间(毫秒) +#domain: +# urlPrex: https://ordermall.yxtsoft.com/wxPay/ +#wx: +# app-id: wxc1a7e6792a779a52 +# mch-id: 1575565631 +# mch-serial-no: 71526A02963F372CD690620F793A9E65F22A93D1 +# app-secret: 10d6c42370127e0389881907560cc43c +# api-key: YxtYdscWxPayKey12345678987654321 +# key-path: D:/webapps/share-store/apicertificate/apiclient_key.pem +# cert_path: D:/webapps/share-store/apicertificate/apiclient_cert.pem +# cert-p12-path: D:/webapps/share-store/apicertificate/apiclient_cert.p12 domain: - urlPrex: https://supervise.yxtsoft.com/wxPay/ \ No newline at end of file + urlPrex: https://nhx.yxtsoft.com/wxPay/ +wx: + app-id: wx4724e3a3c27f36b5 + mch-id: 1703297075 + mch-serial-no: 77087B8EE84AD0AE037DD2580AD05203561ECA85 + app-secret: 971fd3b8aa7b08ce3e8a5f3e502b1a8d + api-key: yxtcxjshbyxgs1234567898765432101 + key-path: D:/webapps/lipinka/apicertificate/apiclient_key.pem + cert_path: D:/webapps/lipinka/apicertificate/apiclient_cert.pem + cert-p12-path: D:/webapps/lipinka/apicertificate/apiclient_cert.p12 \ No newline at end of file