Browse Source

修改

master
wangpengfei 4 months ago
parent
commit
9c4e624ae4
  1. 6
      src/main/java/com/yxt/pay/api/wxpay/WxPayVo.java
  2. 3
      src/main/java/com/yxt/pay/biz/refund/WxRefundService.java
  3. 45
      src/main/resources/application-pro.yml

6
src/main/java/com/yxt/pay/api/wxpay/WxPayVo.java

@ -23,10 +23,10 @@ public class WxPayVo {
public WxPayVo(int source) {
if (source == 0) {//云菜窖
appId = "wx4724e3a3c27f36b5";
mchId = "1703297075";
appId = "wx11565021714ba796";
mchId = "1664882765";
secret = "yxtcxjshbyxgs1234567898765432101";
appSecret = "971fd3b8aa7b08ce3e8a5f3e502b1a8d";
appSecret = "ba375af8df820800938c18cefbf39b7f";
// appId ="wxc1a7e6792a779a52";
// mchId ="1575565631";
// secret="YxtYdscWxPayKey12345678987654321";

3
src/main/java/com/yxt/pay/biz/refund/WxRefundService.java

@ -145,17 +145,20 @@ public class WxRefundService extends MybatisBaseService<WxRefundMapper,RefundOrd
//你的业务代码
return rb.success().setData(refund);
}else if(refundResponse.getStatus().equals(Status.PROCESSING)){
log.info("退款失败"+refund);
return rb.success().setMsg("退款申请处理中,请稍等").setData(refund);
}else{
payOrder.setState(4);
orderService.updateById(payOrder);
refundOrder.setState(3);
baseMapper.updateById(refundOrder);
log.info("退款失败"+refund);
return rb.setCode("500").setMsg("申请退款失败").setData(refund);
}
}catch (Exception e){
refundOrder.setState(3);
baseMapper.updateById(refundOrder);
log.info("退款失败,error:"+e.getMessage());
return rb.setMsg("退款失败,error=" + e.getMessage());
// throw new ResultException(ResultEnum.ERROR,e.toString());
}

45
src/main/resources/application-pro.yml

@ -3,7 +3,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
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
# password: Yxt@67508182
cloud:
nacos:
@ -21,26 +21,27 @@ spring:
password: 123456
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://nhx.yxtsoft.com/wxPay/
urlPrex: https://ordermall.yxtsoft.com/ycjwxPay/
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
app-id: wx11565021714ba796
mch-id: 1664882765
mch-serial-no: 38BEAC853E883AD19261BAD8998E0D77A81EEF59
app-secret: ba375af8df820800938c18cefbf39b7f
api-key: YxtYcjWxPayKey123456789987654321
key-path: D:/webapps/ycj/apicertificate/apiclient_key.pem
cert_path: D:/webapps/ycj/apicertificate/apiclient_cert.pem
cert-p12-path: D:/webapps/ycj/apicertificate/apiclient_cert.p12
#农惠选
#domain:
# 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
Loading…
Cancel
Save