From e5a548af24df3a6c3242e21beecdf4dcb2e27593 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Mon, 10 Feb 2025 11:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin&from=E3=80=91=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=201=E3=80=81=E5=90=8E=E5=8F=B0=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BE=AE=E4=BF=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0=E8=AF=81=E4=B9=A6=202?= =?UTF-8?q?=E3=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96=E9=80=80?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=8C=E5=B7=B2=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E9=80=80=E6=AC=BE=EF=BC=8C=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90=E9=80=80=E6=AC=BE?= =?UTF-8?q?=203=E3=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E5=8F=B7=E6=94=B9=E4=B8=BA8084?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hcy/admin/config/wxpay/WxPayConfiguration.java | 14 +++++++++++++- .../front/service/order/impl/OrderServiceImpl.java | 9 +++++++-- front/src/main/resources/application.yml | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/admin/src/main/java/com/hcy/admin/config/wxpay/WxPayConfiguration.java b/admin/src/main/java/com/hcy/admin/config/wxpay/WxPayConfiguration.java index fd770ec..1a5f4f9 100644 --- a/admin/src/main/java/com/hcy/admin/config/wxpay/WxPayConfiguration.java +++ b/admin/src/main/java/com/hcy/admin/config/wxpay/WxPayConfiguration.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; +import com.hcy.common.config.wx.WxPayCustomConfig; import com.hcy.common.entity.pay.DevPay; import com.hcy.common.entity.system.SystemConfig; import com.hcy.common.entity.wxpay.SystemWxPayConfig; @@ -38,7 +39,8 @@ public class WxPayConfiguration { @Bean("mpWxPayService") public WxPayService mpWxPayService() { Boolean flag = Boolean.FALSE; - WxPayConfig payConfig = new WxPayConfig(); + WxPayCustomConfig payConfig = new WxPayCustomConfig(); +// WxPayConfig payConfig = new WxPayConfig(); DevPay devPay = devPayMapper.getEntityByPayWay(OrderPlayTypeEnum.WECHAT_PAY.getType()); String config = devPay.getConfig(); SystemWxPayConfig systemWxPayConfig = JSON.parseObject(config, SystemWxPayConfig.class); @@ -54,6 +56,16 @@ public class WxPayConfiguration { payConfig.setPrivateCertContent(StringUtils.trimToNull(systemWxPayConfig.getApiclientCert()).getBytes()); flag = Boolean.TRUE; } + payConfig.setPublicKeyId("PUB_KEY_ID_0117052034742025012300326100001464"); + payConfig.setPublicKey("-----BEGIN PUBLIC KEY-----\n" + + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7xtJgD6ML1dL3AnCHJ7G\n" + + "lwoSpdZKCb0yoL3D0la47yXgiFcwA+PXum/d5uTBQ3rxXIV1YMPNF7JhA2nPYC9O\n" + + "xTnA+bvAL9e4EP9x3Ocs5Uc9J+p/NxO+FcbD8Qbp6eDM2Rn5iir3TMze0ppMwDCE\n" + + "LtVlSCo5DysLjuL6Ub71QBN0aaOJ5SFQtyRXTizm+sDvL7JvHRbOy+lJsyIN83EW\n" + + "NzWuBMUR5gs7KgCRPSQvAOIXGcfxYP1kYlCbkYHzACDhpKB3ZDQHWIlwVMuCsYb/\n" + + "O4/0gPK/xizNdtjM2SDz/IijWOfVhBb9rup+hccbns4Zi/8hn0+CiiZpBVbWxak2\n" + + "iQIDAQAB\n" + + "-----END PUBLIC KEY-----\n"); // 可以指定是否使用沙箱环境 payConfig.setUseSandboxEnv(false); WxPayService wxPayService = new WxPayServiceImpl(); diff --git a/front/src/main/java/com/hcy/front/service/order/impl/OrderServiceImpl.java b/front/src/main/java/com/hcy/front/service/order/impl/OrderServiceImpl.java index 2846fda..35a0310 100644 --- a/front/src/main/java/com/hcy/front/service/order/impl/OrderServiceImpl.java +++ b/front/src/main/java/com/hcy/front/service/order/impl/OrderServiceImpl.java @@ -469,8 +469,8 @@ public class OrderServiceImpl extends ServiceImpl implements orderRefundDetailVo.setDeductionRatioMoney(new BigDecimal("0")); }else{ orderRefundDetailVo.setDeductionRatioMoney(model.getOrderAmount() - .multiply(orderRefund.getPracticalDeductionRatio() == null ? orderRefund.getDeductionRatio() - : orderRefund.getPracticalDeductionRatio()) +// .multiply(orderRefund.getPracticalDeductionRatio() == null ? orderRefund.getDeductionRatio() +// : orderRefund.getPracticalDeductionRatio()) .divide(new BigDecimal("100"),2,RoundingMode.HALF_UP)); } vo.setOrderRefundDetailVo(orderRefundDetailVo); @@ -877,7 +877,12 @@ public class OrderServiceImpl extends ServiceImpl implements log.info("createAndRefund,退款返回结果:{}", wxPayRefundV3Result.toString()); orderRefund.setRefundTime(TimeUtil.timestamp()); orderRefund.setTransactionId(wxPayRefundV3Result.getRefundId()); + // 更新退款订单状态 + orderRefund.setRefundStatus(OrderRefundStatusEnum.SUCCESS.getStatus()); orderRefundMapper.updateById(orderRefund); + // 更新订单状态 + model.setOrderStatus(OrderStatusEnum.CLOSE.getStatus()); + orderMapper.updateById(model); break; case 2: User user = userMapper.selectOne(new QueryWrapper() diff --git a/front/src/main/resources/application.yml b/front/src/main/resources/application.yml index 3707050..ddf5946 100644 --- a/front/src/main/resources/application.yml +++ b/front/src/main/resources/application.yml @@ -4,7 +4,7 @@ like: # upload-directory: E:\img\ # 服务配置 server: - port: 8086 + port: 8084 servlet: context-path: /