From 0d81d8084152472f94ed622b69c6ccb8017b4a0b Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 16 Jan 2026 10:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=88=86=E8=B4=A6=E5=8F=8A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- njzscloud-svr/pom.xml | 2 +- .../order/service/OrderInfoService.java | 50 +++- .../wxPay/config/WxPayConfiguration.java | 10 + .../wxPay/config/WxPayProperties.java | 35 ++- .../supervisory/wxPay/contant/TemplateID.java | 4 +- .../wxPay/controller/PaymentController.java | 224 +++++++++++++-- .../wxPay/param/TemplateMessageParam.java | 12 + .../wxPay/service/PaymentService.java | 22 ++ .../service/impl/PaymentServiceImpl.java | 271 +++++++++++++++++- .../service/impl/WeChatPayServiceImpl.java | 3 + .../WechatTemplateMessageServiceImpl.java | 16 +- .../src/main/resources/application-dev.yml | 22 +- .../src/main/resources/application-prod.yml | 22 +- .../main/resources/cert/apiclient_cert.p12 | Bin 2766 -> 2766 bytes .../main/resources/cert/cz_apiclient_cert.p12 | Bin 0 -> 2766 bytes 15 files changed, 634 insertions(+), 59 deletions(-) create mode 100644 njzscloud-svr/src/main/resources/cert/cz_apiclient_cert.p12 diff --git a/njzscloud-svr/pom.xml b/njzscloud-svr/pom.xml index 2ed0d55..f7afa26 100644 --- a/njzscloud-svr/pom.xml +++ b/njzscloud-svr/pom.xml @@ -105,7 +105,7 @@ com.github.binarywang weixin-java-pay - 4.7.0 + 4.8.0 diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 2ec7e3a..cabeac3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -881,13 +881,14 @@ public class OrderInfoService extends ServiceImpl openId = new HashSet<>(); UserEntity orderUserEntity = userService.getById(orderInfo.getUserId()); param.setCfCompanyName(orderUserEntity.getNickname()); + OrderGoodsEntity entity = orderGoodsService.getById(orderInfo.getGoodsId()); + param.setGoodsName(entity.getGoodsName()); + BizCompanyEntity companyEntity = bizCompanyService.getById(orderInfo.getTransCompanyId()); + param.setCompanyName(companyEntity.getCompanyName()); + param.setCreateTime(orderInfo.getCreateTime()); + Set openId = new HashSet<>(); for (SysUserRoleEntity userRoleEntity : userIds) { UserEntity userEntity = userService.getById(userRoleEntity.getUserId()); if (null != userEntity && !Strings.isNullOrEmpty(userEntity.getOpenid())) { @@ -2203,6 +2204,45 @@ public class OrderInfoService extends ServiceImpl userIds = userRoleService.list(Wrappers.lambdaQuery(SysUserRoleEntity.class) + .eq(SysUserRoleEntity::getRoleId, roleEntity.getId())); + TemplateMessageParam param = new TemplateMessageParam(); + param.setTempType(TempType.AUDIT_PENDING.getVal()); + param.setSn(order.getSn()); + UserEntity orderUserEntity = userService.getById(order.getUserId()); + param.setCfCompanyName(orderUserEntity.getNickname()); + OrderGoodsEntity entity = orderGoodsService.getById(order.getGoodsId()); + param.setGoodsName(entity.getGoodsName()); + BizCompanyEntity companyEntity = bizCompanyService.getById(order.getTransCompanyId()); + param.setCompanyName(companyEntity.getCompanyName()); + param.setCreateTime(order.getCreateTime()); + Set openId = new HashSet<>(); + for (SysUserRoleEntity userRoleEntity : userIds) { + UserEntity userEntity = userService.getById(userRoleEntity.getUserId()); + if (null != userEntity && !Strings.isNullOrEmpty(userEntity.getOpenid())) { + if (openId.add(userEntity.getOpenid())) { + param.setUserId(userRoleEntity.getUserId()); + log.info("转办发送审核通知模板消息，参数：{}", param); + wechatTemplateMessageService.sendTemplateMessage(param); + } + } else { + log.info("转办未查到用户信息：{}", userRoleEntity.getUserId()); + } + } + } + } catch (Exception e) { + log.error("通知失败", e); + } } else { throw Exceptions.clierr("未查询到装货地址"); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayConfiguration.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayConfiguration.java index b8f0648..c0eb1aa 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayConfiguration.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayConfiguration.java @@ -1,6 +1,7 @@ package com.njzscloud.supervisory.wxPay.config; import com.github.binarywang.wxpay.config.WxPayConfig; +import com.github.binarywang.wxpay.service.ProfitSharingService; import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; import lombok.AllArgsConstructor; @@ -13,6 +14,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.StreamUtils; +/** + * @author ljw + */ @Configuration @ConditionalOnClass(WxPayService.class) @EnableConfigurationProperties(WxPayProperties.class) @@ -50,4 +54,10 @@ public class WxPayConfiguration { wxPayService.setConfig(config); return wxPayService; } + + @Bean + @ConditionalOnMissingBean + public ProfitSharingService profitSharingService(WxPayService wxPayService) { + return wxPayService.getProfitSharingService(); + } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayProperties.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayProperties.java index bfc1c78..ce65225 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayProperties.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/config/WxPayProperties.java @@ -5,36 +5,47 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * 微信支付配置 + * @author ljw */ @Data @ConfigurationProperties(prefix = "wechat.pay") public class WxPayProperties { - + /** - * 商户APPID + * 服务商商户APPID */ private String appId; - + /** - * 商户号 + * 服务商商户号 */ private String mchId; - + /** - * API密钥 + * 收款方商户号 + */ + private String subMchId; + + /** + * 分账方商户号 + */ + private String receiverMchId; + + /** + * 服务商API密钥 */ private String apiKey; - + /** - * 证书序列号 + * 服务商证书序列号 */ private String certSerialNo; - + /** - * 私钥文件路径 + * 服务商私钥文件路径 */ private String privateKeyPath; - + /** * 支付回调地址 */ @@ -44,5 +55,5 @@ public class WxPayProperties { * 退款回调地址 */ private String refundNotifyUrl; - + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/contant/TemplateID.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/contant/TemplateID.java index 514be0b..2c3e5ec 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/contant/TemplateID.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/contant/TemplateID.java @@ -6,7 +6,9 @@ public class TemplateID { public static final String DRIVER_TEMP_ID = "IwHV1nWwu8pO8Ppntyd7KzzV5S00dOEjbsgAFhz9tJM"; - public static final String AUDIT_PENDING = "0SzJv9l51KTvgXvKhQOwifR5pegR3gC1o3IAY8NpEcE"; + // public static final String AUDIT_PENDING = "0SzJv9l51KTvgXvKhQOwifR5pegR3gC1o3IAY8NpEcE"; + + public static final String AUDIT_PENDING = "KYt9UYPf104Xw_wIh6RwKCsK3x3Q6XO1yu9h-q2b3bI"; public static final String AUDIT_OK = "3peGD6joWVyZ7B29lfJH_gK0oRqharynt0sXlIHE4cg"; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java index e2056a3..22085e4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java @@ -1,5 +1,6 @@ package com.njzscloud.supervisory.wxPay.controller; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; @@ -8,6 +9,7 @@ import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; +import com.google.common.base.Strings; import com.njzscloud.common.core.ex.ExceptionMsg; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.core.utils.R; @@ -17,7 +19,11 @@ import com.njzscloud.common.wechat.WechatUtil; import com.njzscloud.common.wechat.param.Code2SessionParam; import com.njzscloud.common.wechat.result.Code2SessionResult; import com.njzscloud.supervisory.device.service.DeviceInfoService; +import com.njzscloud.supervisory.money.contant.MoneyChangeCategory; +import com.njzscloud.supervisory.money.contant.MoneyDetailType; import com.njzscloud.supervisory.money.contant.PayStatus; +import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity; +import com.njzscloud.supervisory.money.service.MoneyChangeDetailService; import com.njzscloud.supervisory.order.contant.MoneyWay; import com.njzscloud.supervisory.order.contant.OrderStatus; import com.njzscloud.supervisory.order.contant.PaymentStatus; @@ -30,15 +36,10 @@ import com.njzscloud.supervisory.order.pojo.result.PaymentContextResult; import com.njzscloud.supervisory.order.service.OrderExpenseItemsService; import com.njzscloud.supervisory.order.service.OrderGoodsService; import com.njzscloud.supervisory.order.service.OrderInfoService; -import com.njzscloud.supervisory.money.service.MoneyChangeDetailService; -import com.njzscloud.supervisory.money.contant.MoneyChangeCategory; -import com.njzscloud.supervisory.money.contant.MoneyDetailType; -import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity; import com.njzscloud.supervisory.wxPay.config.WxPayProperties; import com.njzscloud.supervisory.wxPay.dto.RefundRequestDto; import com.njzscloud.supervisory.wxPay.param.PaymentParam; import com.njzscloud.supervisory.wxPay.service.PaymentService; -import com.njzscloud.supervisory.wxPay.service.WeChatPayService; import com.njzscloud.supervisory.wxPay.utils.RequestHolder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -54,6 +55,7 @@ import java.time.LocalDateTime; /** * 支付相关接口 * 使用微信支付官方SDK的生产级实现 + * * @author ljw */ @Slf4j @@ -64,7 +66,6 @@ public class PaymentController { private final OrderExpenseItemsService orderExpenseItemsService; private final OrderInfoService orderInfoService; - private final WeChatPayService wechatPayService; private final WxPayService wxPayService; private final WxPayProperties properties; private final OrderGoodsService orderGoodsService; @@ -88,10 +89,8 @@ public class PaymentController { // 校验支付清单：id、名称、金额 boolean invalidItem = paymentParam.getItems().stream().anyMatch(it -> - it == null - || it.getId() == null - || it.getExpenseItemName() == null || it.getExpenseItemName().length() == 0 - || it.getSettleMoney() == null || it.getSettleMoney().signum() < 0 + it == null || it.getId() == null || Strings.isNullOrEmpty(it.getExpenseItemName()) || it.getSettleMoney() == null + || it.getSettleMoney().signum() < 0 ); if (invalidItem) { throw Exceptions.clierr("支付清单项不合法（id/名称/金额）"); @@ -134,18 +133,25 @@ public class PaymentController { String outTradeNo = generateOutTradeNo(ctx.getSn()); WxPayUnifiedOrderRequest wxRequest = new WxPayUnifiedOrderRequest(); wxRequest.setOutTradeNo(outTradeNo); - wxRequest.setBody("订单支付-" + ctx.getSn()); + wxRequest.setBody("订单支付-108-" + ctx.getSn()); // 转换为分 wxRequest.setTotalFee(ctx.getSettleMoney().multiply(new BigDecimal("100")).intValue()); - wxRequest.setOpenid(getCurrentUserOpenid(paymentParam.getWxCode())); wxRequest.setTradeType("JSAPI"); wxRequest.setSpbillCreateIp(RequestHolder.getClientIP()); // 需要配置实际的回调地址 wxRequest.setNotifyUrl(properties.getNotifyUrl()); + // 设置分账标识为Y，开启分账功能 + wxRequest.setProfitSharing("Y"); + // 在服务商模式下，设置收款方子商户号 + wxRequest.setSubMchId(properties.getSubMchId()); + wxRequest.setSubOpenid(getCurrentUserOpenid(paymentParam.getWxCode())); - // 调用微信支付服务 - WxPayMpOrderResult result = (WxPayMpOrderResult) wechatPayService.createJsapiOrder(wxRequest); - + // 调用微信支付服务（使用服务商WxPayService，因为需要分账权限验证） + log.info("开始创建微信支付JSAPI订单，使用服务商WxPayService，商户号：{}，收款方商户号：{}，分账商户号：{}", + properties.getMchId(), properties.getSubMchId(), properties.getReceiverMchId()); + log.info("开始创建微信支付JSAPI订单，入参为：{}", JSON.toJSONString(wxRequest)); + WxPayMpOrderResult result = wxPayService.createOrder(wxRequest); + log.info("创建微信支付JSAPI订单，返回结果为：{}", JSON.toJSONString(result)); // 更新订单状态为待支付 orderInfoService.lambdaUpdate() .eq(OrderInfoEntity::getId, paymentParam.getOrderId()) @@ -188,17 +194,23 @@ public class PaymentController { } /** - * 获取当前用户openid + * 获取当前用户openid（使用小程序APPID） */ public String getCurrentUserOpenid(String wxCode) { - // 调用微信API获取openId和unionId - Code2SessionResult sessionResult = WechatUtil.code2Session(new Code2SessionParam().setJs_code(wxCode)); + // 使用小程序APPID（子商户）来获取openid，因为前端wx.login()使用的是子商户APPID + Code2SessionParam param = new Code2SessionParam() + .setJs_code(wxCode); + + log.info("获取openid，使用小程序APPID，code：{}", wxCode); + + Code2SessionResult sessionResult = WechatUtil.code2Session(param); Integer errcode = sessionResult.getErrcode(); if (errcode != null && errcode != 0) { log.error("微信登录失败, errcode: {}, errmsg: {}", errcode, sessionResult.getErrmsg()); throw new UserLoginException(ExceptionMsg.CLI_ERR_MSG, "微信登录失败"); } + log.info("获取openid成功：{}", sessionResult.getOpenid()); return sessionResult.getOpenid(); } @@ -234,6 +246,55 @@ public class PaymentController { return null; } + /** + * 根据订单ID获取微信交易ID + */ + private String getTransactionIdByOrderId(Long orderId) { + log.debug("开始获取交易ID，订单ID：{}", orderId); + + // 从资金明细的扩展信息中获取交易ID + MoneyChangeDetailEntity detail = moneyChangeDetailService.getByOrderIdAndType(orderId, MoneyDetailType.WX); + + if (detail == null) { + log.warn("未找到订单的资金明细记录，订单ID：{}", orderId); + return null; + } + + log.debug("找到资金明细记录，ID：{}，扩展信息：{}", detail.getId(), detail.getExtendInfo()); + + if (detail.getExtendInfo() == null) { + log.warn("资金明细扩展信息为空，订单ID：{}", orderId); + return null; + } + + // 解析JSON格式的扩展信息获取transactionId + try { + // 使用简单的字符串解析，实际项目中建议使用JSON库 + String extendInfo = detail.getExtendInfo(); + log.debug("解析扩展信息：{}", extendInfo); + + if (extendInfo.contains("transactionId")) { + int startIndex = extendInfo.indexOf("\"transactionId\":\"") + 16; + int endIndex = extendInfo.indexOf("\"", startIndex); + if (startIndex > 15 && endIndex > startIndex) { + String transactionId = extendInfo.substring(startIndex, endIndex); + log.info("成功获取交易ID：{}，订单ID：{}", transactionId, orderId); + return transactionId; + } else { + log.warn("交易ID格式不正确，startIndex：{}，endIndex：{}，订单ID：{}", startIndex, endIndex, orderId); + } + } else { + log.warn("扩展信息中不包含transactionId，订单ID：{}", orderId); + } + } catch (Exception e) { + log.error("解析交易ID异常，订单ID：{}，扩展信息：{}，错误：{}", orderId, detail.getExtendInfo(), e.getMessage(), e); + } + + log.warn("获取交易ID失败，订单ID：{}", orderId); + return null; + } + + /** * 微信支付回调接口 */ @@ -268,6 +329,26 @@ public class PaymentController { log.info("支付回调：资金明细状态更新为已支付，订单ID：{}", entity.getId()); } + // 执行分账 + log.info("支付回调：开始执行分账，订单ID：{}，支付金额：{}元，交易ID：{}", + entity.getId(), entity.getSettleMoney(), notifyResult.getTransactionId()); + try { + paymentService.profitSharingAsync(entity.getId(), notifyResult.getTransactionId(), entity.getSettleMoney()); + log.info("支付回调：分账成功，订单ID：{}", entity.getId()); + } catch (Exception e) { + log.error("支付回调：分账失败，订单ID：{}，支付金额：{}元，交易ID：{}，错误：{}", + entity.getId(), entity.getSettleMoney(), notifyResult.getTransactionId(), e.getMessage(), e); + // 分账失败不影响支付成功，但需要记录 + } + + // 保存交易ID到资金明细的扩展信息中 + if (payDetail != null) { + // 将交易ID保存到扩展信息中，格式：{"transactionId":"xxx"} + String extendInfo = String.format("{\"transactionId\":\"%s\"}", notifyResult.getTransactionId()); + payDetail.setExtendInfo(extendInfo); + moneyChangeDetailService.updateById(payDetail); + } + if (out) { DeviceInfoService.open(orderSn); } @@ -321,9 +402,64 @@ public class PaymentController { throw Exceptions.clierr("退款金额总和不能超过订单已结算金额"); } refundRequest.setOutTradeNo(orderInfo.getOutTradeNo()); + + // 如果是微信支付，需要先执行分账回退 + if (SettlementWay.CASH.getVal().equals(ctx.getOiPayWay())) { + log.info("退款处理：开始分账回退，订单ID：{}，退款金额：{}元，支付方式：{}", + orderInfo.getId(), refundRequest.getRefundAmount(), ctx.getOiPayWay()); + try { + paymentService.profitSharingReturn(orderInfo.getId(), refundRequest.getRefundAmount()); + log.info("退款前分账回退成功，订单ID：{}，退款金额：{}", orderInfo.getId(), refundRequest.getRefundAmount()); + } catch (Exception e) { + log.error("退款前分账回退失败，订单ID：{}，退款金额：{}元，错误：{}", + orderInfo.getId(), refundRequest.getRefundAmount(), e.getMessage(), e); + throw Exceptions.clierr("分账回退失败，无法退款"); + } + } + paymentService.refund(refundRequest, ctx, Boolean.FALSE); - if (SettlementWay.MONTH.getVal().equals(ctx.getOiPayWay()) || SettlementWay.BALANCE.getVal().equals(ctx.getOiPayWay())) { + + // 微信支付的退款处理 + if (SettlementWay.CASH.getVal().equals(ctx.getOiPayWay())) { + // 计算剩余金额 = 原结算金额 - 已退款金额 - 本次退款金额 + BigDecimal remainingAmount = ctx.getSettleMoney() + .subtract(ctx.getRefundMoney() == null ? BigDecimal.ZERO : ctx.getRefundMoney()) + .subtract(refundRequest.getRefundAmount()); + + // 如果剩余金额大于0，说明是部分退款，需要重新分账 + if (remainingAmount.compareTo(BigDecimal.ZERO) > 0) { + log.info("部分退款：检测到剩余金额{}元，开始重新分账，订单ID：{}", remainingAmount, orderInfo.getId()); + try { + // 查询原始交易ID + String transactionId = getTransactionIdByOrderId(orderInfo.getId()); + if (transactionId != null) { + log.info("部分退款：获取到交易ID：{}，开始重新分账", transactionId); + paymentService.reProfitSharing(orderInfo.getId(), transactionId, remainingAmount); + log.info("部分退款后重新分账成功，订单ID：{}，剩余金额：{}元，交易ID：{}", + orderInfo.getId(), remainingAmount, transactionId); + } else { + log.warn("部分退款后无法获取交易ID，跳过重新分账，订单ID：{}", orderInfo.getId()); + log.warn("请检查资金明细表中是否正确存储了交易ID信息"); + } + } catch (Exception e) { + log.error("部分退款后重新分账失败，订单ID：{}，剩余金额：{}元，错误：{}", + orderInfo.getId(), remainingAmount, e.getMessage(), e); + // 重新分账失败不影响退款成功，但需要记录 + } + } else { + log.info("部分退款：剩余金额为0，无需重新分账，订单ID：{}", orderInfo.getId()); + } + // 更新订单状态为已退款 + orderInfoService.lambdaUpdate() + .eq(OrderInfoEntity::getId, refundRequest.getOrderId()) + .set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan) + .set(OrderInfoEntity::getRefundMoney, + (ctx.getRefundMoney() == null ? BigDecimal.ZERO : ctx.getRefundMoney()).add(refundRequest.getRefundAmount())) + .set(OrderInfoEntity::getRefundTime, LocalDateTime.now()) + .update(); + } else if (SettlementWay.MONTH.getVal().equals(ctx.getOiPayWay()) || SettlementWay.BALANCE.getVal().equals(ctx.getOiPayWay())) { + // 月结和余额支付的退款处理 orderInfoService.lambdaUpdate() .eq(OrderInfoEntity::getId, refundRequest.getOrderId()) .set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiTuiKuan) @@ -380,4 +516,54 @@ public class PaymentController { return WxPayNotifyResponse.fail(e.getMessage()); } } + + /** + * 发起支付（使用生产级微信支付SDK） + */ + @PostMapping("/payTest") + @Transactional(rollbackFor = Exception.class) + public void payTest() { + // 构建微信支付请求 + WxPayUnifiedOrderRequest wxRequest = new WxPayUnifiedOrderRequest(); + wxRequest.setOutTradeNo("53456346xdfgsdfg"); + wxRequest.setBody("订单支付-108-"); + // 转换为分 + BigDecimal settleMoney = new BigDecimal("0.01"); + wxRequest.setTotalFee(settleMoney.multiply(new BigDecimal("100")).intValue()); + // wxRequest.setOpenid("oaepd1zd7umBcg0v-dnVAN4urVc0"); + wxRequest.setSubOpenid("oaepd1zd7umBcg0v-dnVAN4urVc0"); + wxRequest.setTradeType("JSAPI"); + wxRequest.setSpbillCreateIp(RequestHolder.getClientIP()); + // 需要配置实际的回调地址 + wxRequest.setNotifyUrl(properties.getNotifyUrl()); + // 设置分账标识为Y，开启分账功能 + wxRequest.setProfitSharing("Y"); + // 在服务商模式下，设置子商户号 + wxRequest.setSubMchId(properties.getSubMchId()); + + // 调用微信支付服务（使用服务商WxPayService，因为需要分账权限验证） + try { + log.info("测试方法：开始创建微信支付JSAPI订单，使用服务商WxPayService，商户号：{}，收款方商户号：{}，分账商户号：{}", + properties.getMchId(), properties.getSubMchId(), properties.getReceiverMchId()); + log.info("测试方法：开始创建微信支付JSAPI订单，入参为：{}", JSON.toJSONString(wxRequest)); + WxPayMpOrderResult result = wxPayService.createOrder(wxRequest); + log.info("测试方法：创建微信支付JSAPI订单，返回结果为：{}", JSON.toJSONString(result)); + } catch (WxPayException e) { + log.error("测试方法：创建订单失败", e); + throw new RuntimeException(e); + } + } + + /** + * 退款测试 + */ + @PostMapping("/refundTest") + @Transactional(rollbackFor = Exception.class) + public void refundTest(@RequestBody RefundRequestDto refundRequest) { + log.info("测试方法：开始微信退款，使用服务商WxPayService，商户号：{}，收款方商户号：{}，分账商户号：{}", + properties.getMchId(), properties.getSubMchId(), properties.getReceiverMchId()); + PaymentContextResult ctx = orderInfoService.paymentContext(refundRequest.getOrderId()); + paymentService.refund(refundRequest, ctx, Boolean.FALSE); + } + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/param/TemplateMessageParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/param/TemplateMessageParam.java index 99be810..7672fe4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/param/TemplateMessageParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/param/TemplateMessageParam.java @@ -5,6 +5,8 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; +import java.time.LocalDateTime; + /** * @author ljw */ @@ -59,4 +61,14 @@ public class TemplateMessageParam { */ private String licensePlate; + /** + * 清运公司 + */ + private String companyName; + + /** + * 时间 + */ + private LocalDateTime createTime; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/PaymentService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/PaymentService.java index 8a5a19f..99af2b7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/PaymentService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/PaymentService.java @@ -1,8 +1,11 @@ package com.njzscloud.supervisory.wxPay.service; +import com.github.binarywang.wxpay.exception.WxPayException; import com.njzscloud.supervisory.order.pojo.result.PaymentContextResult; import com.njzscloud.supervisory.wxPay.dto.RefundRequestDto; +import java.math.BigDecimal; + /** * 退款服务接口 * @author ljw @@ -14,4 +17,23 @@ public interface PaymentService { */ void refund(RefundRequestDto refundRequest, PaymentContextResult ctx, Boolean isChange); + /** + * 执行分账（支付成功后） + */ + void profitSharing(Long orderId, String transactionId, BigDecimal totalAmount) throws WxPayException; + + /** + * 分账回退 + */ + void profitSharingReturn(Long orderId, BigDecimal refundAmount) throws WxPayException; + + /** + * 重新分账剩余金额（用于部分退款后） + */ + void reProfitSharing(Long orderId, String transactionId, BigDecimal remainingAmount) throws WxPayException; + + /** + * 执行分账（支付成功后） + */ + void profitSharingAsync(Long orderId, String transactionId, BigDecimal totalAmount) throws WxPayException; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/PaymentServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/PaymentServiceImpl.java index 56f1c0b..a43bc63 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/PaymentServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/PaymentServiceImpl.java @@ -1,6 +1,14 @@ package com.njzscloud.supervisory.wxPay.service.impl; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.github.binarywang.wxpay.bean.profitsharing.request.ProfitSharingRequest; +import com.github.binarywang.wxpay.bean.profitsharing.request.ProfitSharingReturnRequest; +import com.github.binarywang.wxpay.bean.profitsharing.result.ProfitSharingResult; +import com.github.binarywang.wxpay.bean.profitsharing.result.ProfitSharingReturnResult; +import com.github.binarywang.wxpay.exception.WxPayException; +import com.github.binarywang.wxpay.service.ProfitSharingService; import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.supervisory.money.contant.MoneyChangeCategory; import com.njzscloud.supervisory.money.contant.MoneyDetailType; @@ -17,12 +25,15 @@ import com.njzscloud.supervisory.wxPay.service.PaymentService; import com.njzscloud.supervisory.wxPay.service.WeChatPayService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.math.RoundingMode; /** * 退款服务实现类 + * * @author ljw */ @Slf4j @@ -30,11 +41,100 @@ import java.math.BigDecimal; @RequiredArgsConstructor public class PaymentServiceImpl implements PaymentService { + // 分账比例：千分之一 + private static final int PROFIT_SHARING_RATIO = 1; + private static final int PROFIT_SHARING_BASE = 1000; + private final WxPayProperties properties; private final WeChatPayService wechatPayService; + private final ProfitSharingService profitSharingService; private final MoneyAccountService moneyAccountService; private final MoneyChangeDetailService moneyChangeDetailService; + /** + * 执行分账（千分之一给特约商户） + */ + @Override + public void profitSharing(Long orderId, String transactionId, BigDecimal totalAmount) throws WxPayException { + log.info("========== 开始执行分账 =========="); + log.info("分账参数 - 订单ID：{}，交易ID：{}，总金额：{}元", orderId, transactionId, totalAmount); + + // 计算分账金额：总金额 * (1/1000) + BigDecimal sharingAmount = totalAmount.multiply(BigDecimal.valueOf(PROFIT_SHARING_RATIO)) + .divide(BigDecimal.valueOf(PROFIT_SHARING_BASE), 2, RoundingMode.DOWN); + + log.info("分账金额计算 - 总金额：{}元，分账比例：{}/{}，分账金额：{}元", + totalAmount, PROFIT_SHARING_RATIO, PROFIT_SHARING_BASE, sharingAmount); + + if (sharingAmount.compareTo(BigDecimal.ZERO) <= 0) { + log.info("分账金额为0，跳过分账，订单ID：{}", orderId); + log.info("========== 分账跳过结束 =========="); + return; + } + + log.info("分账商户信息 - 特约商户：{}，收款商户：{}，分账商户：{}", properties.getMchId(), properties.getSubMchId(), + properties.getReceiverMchId()); + + // 构建分账请求 + ProfitSharingRequest request = new ProfitSharingRequest(); + request.setTransactionId(transactionId); + String outOrderNo = "PS_" + orderId + "_" + System.currentTimeMillis(); + request.setOutOrderNo(outOrderNo); + + log.info("分账请求构建 - 分账单号：{}，交易ID：{}", outOrderNo, transactionId); + + // 创建分账接收方JSON字符串 + // 仅分账给 receiver-mch-id（1649452354），比例为千分之一；收款方为 subMchId（不作为接收方再次出现） + StringBuilder receiversJson = new StringBuilder("["); + int receiverMoney = sharingAmount.multiply(BigDecimal.valueOf(100)).intValue(); + receiversJson.append("{\"type\":\"MERCHANT_ID\",\"account\":\"").append(properties.getReceiverMchId()).append("\",") + .append("\"amount\":").append(receiverMoney) + .append(",\"description\":\"分账商户108\"}"); + receiversJson.append("]"); + request.setReceivers(receiversJson.toString()); + // 指定分账发生在收款子商户下 + request.setSubMchId(properties.getSubMchId()); + + // 计算子商户留存金额（用于日志） + BigDecimal subMerchantAmount = totalAmount.subtract(sharingAmount); + + log.info("分账接收方配置 - 特约商户分账：{}元({}分)，子商户（留存）：{}元", + sharingAmount, receiverMoney, + subMerchantAmount); + log.info("分账接收方JSON：{}", receiversJson); + + try { + // 调用分账接口 + log.info("调用微信分账接口..."); + ProfitSharingResult result = profitSharingService.profitSharing(request); + + log.info("分账成功！订单ID：{}，总金额：{}元", orderId, totalAmount); + log.info("分账详情 - 特约商户分账：{}元，子商户分账：{}元", sharingAmount, subMerchantAmount); + log.info("分账结果 - 分账单号：{}，微信返回状态：{}", result.getOutOrderNo(), result); + + // 将分账单号保存到资金明细的扩展信息中 + try { + MoneyChangeDetailEntity payDetail = moneyChangeDetailService.getByOrderIdAndType(orderId, MoneyDetailType.WX); + if (payDetail != null && payDetail.getExtendInfo() != null) { + // 解析现有的extendInfo，添加分账单号 + JSONObject extendJson = JSON.parseObject(payDetail.getExtendInfo()); + extendJson.put("profitSharingOrderNo", outOrderNo); + payDetail.setExtendInfo(extendJson.toJSONString()); + moneyChangeDetailService.updateById(payDetail); + log.info("分账单号已保存到资金明细，订单ID：{}，分账单号：{}", orderId, outOrderNo); + } + } catch (Exception e) { + log.warn("保存分账单号到资金明细失败，订单ID：{}，分账单号：{}，错误：{}", orderId, outOrderNo, e.getMessage()); + } + + log.info("========== 分账执行成功 =========="); + } catch (WxPayException e) { + log.error("分账执行失败！订单ID：{}，错误信息：{}", orderId, e.getMessage(), e); + log.error("失败详情 - 交易ID：{}，分账单号：{}，金额：{}元", transactionId, outOrderNo, totalAmount); + throw e; + } + } + /** * 申请退款 */ @@ -46,7 +146,7 @@ public class PaymentServiceImpl implements PaymentService { // 根据支付方式处理退款 if (SettlementWay.CASH.getVal().equals(ctx.getOiPayWay())) { - //微信退款 生成退款单号 + // 微信退款 生成退款单号 String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr(); // 微信退全款 int money = ctx.getSettleMoney().multiply(new BigDecimal("100")).intValue(); @@ -124,5 +224,174 @@ public class PaymentServiceImpl implements PaymentService { log.info("公司账户余额恢复成功，账户ID：{}，恢复金额：{}", ctx.getCompanyAccountId(), refundAmount); } + /** + * 分账回退 + */ + @Override + public void profitSharingReturn(Long orderId, BigDecimal refundAmount) throws WxPayException { + log.info("========== 开始执行分账回退 =========="); + log.info("分账回退参数 - 订单ID：{}，退款金额：{}元", orderId, refundAmount); + + // 计算需要回退的分账金额：退款金额 * (1/1000) + BigDecimal returnAmount = refundAmount.multiply(BigDecimal.valueOf(PROFIT_SHARING_RATIO)) + .divide(BigDecimal.valueOf(PROFIT_SHARING_BASE), 2, RoundingMode.DOWN); + + log.info("分账回退金额计算 - 退款金额：{}元，回退比例：{}/{}，回退金额：{}元", + refundAmount, PROFIT_SHARING_RATIO, PROFIT_SHARING_BASE, returnAmount); + + if (returnAmount.compareTo(BigDecimal.ZERO) <= 0) { + log.info("分账回退金额为0，跳过分账回退，订单ID：{}", orderId); + log.info("========== 分账回退跳过结束 =========="); + return; + } + + log.info("分账回退商户信息 - 回退商户：{}，回退类型：MERCHANT_ID", properties.getReceiverMchId()); + + // 构建分账回退请求 + ProfitSharingReturnRequest request = new ProfitSharingReturnRequest(); + String outReturnNo = "PSR_" + orderId + "_" + System.currentTimeMillis(); + request.setOutReturnNo(outReturnNo); + request.setReturnAccountType("MERCHANT_ID"); + // 从分账商户回退 + request.setReturnAccount(properties.getReceiverMchId()); + request.setDescription("订单退款分账回退108"); + // 设置回退金额（分） + int returnMoney = returnAmount.multiply(BigDecimal.valueOf(100)).intValue(); + request.setReturnAmount(returnMoney); + // 指定回退操作针对的子商户（收款方） + request.setSubMchId(properties.getSubMchId()); + + // 从资金明细中获取原始分账单号 + String outOrderNo = null; + try { + MoneyChangeDetailEntity payDetail = moneyChangeDetailService.getByOrderIdAndType(orderId, MoneyDetailType.WX); + if (payDetail != null && payDetail.getExtendInfo() != null) { + JSONObject extendJson = JSON.parseObject(payDetail.getExtendInfo()); + outOrderNo = extendJson.getString("profitSharingOrderNo"); + log.info("从资金明细中获取到分账单号：{}，订单ID：{}", outOrderNo, orderId); + } + } catch (Exception e) { + log.warn("从资金明细中获取分账单号失败，订单ID：{}，错误：{}", orderId, e.getMessage()); + } + + // 如果没有找到分账单号，使用模糊匹配（不推荐，可能会导致回退失败） + if (outOrderNo == null) { + outOrderNo = "PS_" + orderId + "_*"; + log.warn("未找到分账单号，使用模糊匹配：{}，订单ID：{}", outOrderNo, orderId); + } + + request.setOutOrderNo(outOrderNo); + + log.info("分账回退请求构建 - 回退单号：{}，原始分账单号：{}，回退金额：{}元({}分)", + outReturnNo, outOrderNo, returnAmount, returnMoney); + + try { + // 调用分账回退接口 + log.info("调用微信分账回退接口..."); + ProfitSharingReturnResult result = profitSharingService.profitSharingReturn(request); + + log.info("分账回退成功！订单ID：{}，退款金额：{}元", orderId, refundAmount); + log.info("分账回退详情 - 回退金额：{}元，从商户：{}回退", returnAmount, properties.getMchId()); + log.info("分账回退结果 - 回退单号：{}，微信返回状态：{}", result.getOutReturnNo(), result); + log.info("========== 分账回退执行成功 =========="); + } catch (WxPayException e) { + log.error("分账回退执行失败！订单ID：{}，错误信息：{}", orderId, e.getMessage(), e); + log.error("失败详情 - 退款金额：{}元，回退金额：{}元，回退单号：{}", refundAmount, returnAmount, outReturnNo); + throw e; + } + } + + /** + * 重新分账剩余金额（用于部分退款后） + */ + @Override + public void reProfitSharing(Long orderId, String transactionId, BigDecimal remainingAmount) throws WxPayException { + log.info("========== 开始执行重新分账 =========="); + log.info("重新分账参数 - 订单ID：{}，交易ID：{}，剩余金额：{}元", orderId, transactionId, remainingAmount); + + // 计算新的分账金额：剩余金额 * (1/1000) + BigDecimal sharingAmount = remainingAmount.multiply(BigDecimal.valueOf(PROFIT_SHARING_RATIO)) + .divide(BigDecimal.valueOf(PROFIT_SHARING_BASE), 2, RoundingMode.DOWN); + + log.info("重新分账金额计算 - 剩余金额：{}元，分账比例：{}/{}，分账金额：{}元", + remainingAmount, PROFIT_SHARING_RATIO, PROFIT_SHARING_BASE, sharingAmount); + + if (sharingAmount.compareTo(BigDecimal.ZERO) <= 0) { + log.info("重新分账金额为0，跳过重新分账，订单ID：{}", orderId); + log.info("========== 重新分账跳过结束 =========="); + return; + } + + log.info("重新分账商户信息 - 分账商户：{}，收款商户：{}", properties.getReceiverMchId(), properties.getSubMchId()); + + // 构建重新分账请求 + ProfitSharingRequest request = new ProfitSharingRequest(); + request.setTransactionId(transactionId); + String outOrderNo = "RE_PS_" + orderId + "_" + System.currentTimeMillis(); + request.setOutOrderNo(outOrderNo); + + log.info("重新分账请求构建 - 分账单号：{}，交易ID：{}", outOrderNo, transactionId); + + // 创建分账接收方JSON字符串（仅给分账接收方分一部分，收款子商户保持留存） + StringBuilder receiversJson = new StringBuilder("["); + int receiverMoney = sharingAmount.multiply(BigDecimal.valueOf(100)).intValue(); + receiversJson.append("{\"type\":\"MERCHANT_ID\",\"account\":\"").append(properties.getReceiverMchId()).append("\",") + .append("\"amount\":").append(receiverMoney) + .append(",\"description\":\"部分退款后重新分账-分账商户\"}"); + receiversJson.append("]"); + request.setReceivers(receiversJson.toString()); + // 指定分账发生在收款子商户下 + request.setSubMchId(properties.getSubMchId()); + + BigDecimal subMerchantAmount = remainingAmount.subtract(sharingAmount); + log.info("重新分账接收方配置 - 特约商户分账：{}元({}分)，子商户（留存）：{}元", + sharingAmount, receiverMoney, + subMerchantAmount); + log.info("重新分账接收方JSON：{}", receiversJson); + + try { + // 调用分账接口 + log.info("调用微信重新分账接口..."); + ProfitSharingResult result = profitSharingService.profitSharing(request); + + log.info("重新分账成功！订单ID：{}，剩余金额：{}元", orderId, remainingAmount); + log.info("重新分账详情 - 特约商户分账：{}元，子商户分账：{}元", sharingAmount, subMerchantAmount); + log.info("重新分账结果 - 分账单号：{}，微信返回状态：{}", result.getOutOrderNo(), result); + log.info("========== 重新分账执行成功 =========="); + } catch (WxPayException e) { + log.error("重新分账执行失败！订单ID：{}，错误信息：{}", orderId, e.getMessage(), e); + log.error("失败详情 - 交易ID：{}，分账单号：{}，剩余金额：{}元", transactionId, outOrderNo, remainingAmount); + throw e; + } + } + + /** + * 异步执行分账（支付成功后，支持重试） + * 延迟10秒执行，避免订单处理中导致的分账失败 + */ + @Override + @Async + public void profitSharingAsync(Long orderId, String transactionId, BigDecimal totalAmount) { + log.info("异步分账任务启动，订单ID：{}，交易ID：{}，总金额：{}元", orderId, transactionId, totalAmount); + + try { + // 延迟10秒执行分账，避免 ORDER_NOT_READY 错误 + Thread.sleep(10000); + log.info("延迟10秒后开始执行分账，订单ID：{}", orderId); + + // 调用同步分账方法 + profitSharing(orderId, transactionId, totalAmount); + log.info("异步分账执行成功，订单ID：{}", orderId); + + } catch (InterruptedException e) { + log.error("异步分账延迟被中断，订单ID：{}，错误：{}", orderId, e.getMessage()); + Thread.currentThread().interrupt(); // 恢复中断状态 + } catch (Exception e) { + log.error("异步分账执行失败，订单ID：{}，交易ID：{}，总金额：{}元，错误：{}", + orderId, transactionId, totalAmount, e.getMessage(), e); + // 异步执行失败不抛出异常，避免影响主流程 + } + } + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WeChatPayServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WeChatPayServiceImpl.java index c615b2e..dd2b399 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WeChatPayServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WeChatPayServiceImpl.java @@ -5,6 +5,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult; import com.github.binarywang.wxpay.bean.result.WxPayRefundResult; +import com.njzscloud.supervisory.wxPay.config.WxPayProperties; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import com.njzscloud.supervisory.wxPay.service.WeChatPayService; @@ -21,6 +22,7 @@ import org.springframework.stereotype.Service; public class WeChatPayServiceImpl implements WeChatPayService { private final WxPayService wxPayService; + private final WxPayProperties wxPayProperties; @Override public Object createJsapiOrder(WxPayUnifiedOrderRequest request) throws WxPayException { @@ -96,6 +98,7 @@ public class WeChatPayServiceImpl implements WeChatPayService { .notifyUrl(notifyUrl) .build(); + refundRequest.setSubMchId(wxPayProperties.getSubMchId()); WxPayRefundResult refundResult = wxPayService.refund(refundRequest); return refundResult.getRefundId(); } catch (WxPayException e) { diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WechatTemplateMessageServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WechatTemplateMessageServiceImpl.java index 5ab3212..1470ab3 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WechatTemplateMessageServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/service/impl/WechatTemplateMessageServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.web.client.RestTemplate; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -122,8 +123,8 @@ public class WechatTemplateMessageServiceImpl implements WechatTemplateMessageSe @Override public void sendTemplateMessage(TemplateMessageParam param) { UserEntity userEntity = userService.getById(param.getUserId()); -// UserEntity userEntity = new UserEntity(); -// userEntity.setOpenid("owC-r2Bf1axK1C2MQ6nOaCDbKuHw"); + // UserEntity userEntity = new UserEntity(); + // userEntity.setOpenid("owC-r2Bf1axK1C2MQ6nOaCDbKuHw"); if (!Strings.isNullOrEmpty(userEntity.getOpenid())) { Map data; if (TempType.TRANS_COMPANY.getVal().equals(param.getTempType())) { @@ -147,10 +148,13 @@ public class WechatTemplateMessageServiceImpl implements WechatTemplateMessageSe // 待审核 // 构建模板数据 data = new HashMap<>(); - data.put("character_string5", new TemplateData(param.getSn())); - data.put("thing11", new TemplateData(param.getGoodsName())); - data.put("thing9", new TemplateData(param.getCfCompanyName())); - data.put("car_number13", new TemplateData(param.getLicensePlate())); + data.put("character_string2", new TemplateData(param.getSn())); + data.put("thing3", new TemplateData(truncateForThingField(param.getCfCompanyName()))); + data.put("thing5", new TemplateData(param.getGoodsName())); + data.put("thing6", new TemplateData(truncateForThingField(param.getCompanyName()))); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm"); + String formattedTime = param.getCreateTime().format(formatter); + data.put("time1", new TemplateData(formattedTime)); sendMessage(userEntity.getOpenid(), TemplateID.AUDIT_PENDING, data, null, "pages/adminPage/jianGuan"); } else if (TempType.AUDIT_OK.getVal().equals(param.getTempType())) { // 审核通过 diff --git a/njzscloud-svr/src/main/resources/application-dev.yml b/njzscloud-svr/src/main/resources/application-dev.yml index 5517cc0..bb5c3bb 100644 --- a/njzscloud-svr/src/main/resources/application-dev.yml +++ b/njzscloud-svr/src/main/resources/application-dev.yml @@ -68,13 +68,21 @@ wechat: app-secret: 66c98dc487a372acb4f1931b38fee8ff base-url: https://api.weixin.qq.com pay: - app-id: wx989ea47a5ddf9bfb - mch-id: 1729703110 - # API密钥（32位字符串） - api-key: KXM36nZCXji1sQt75tGk77k7b2K5RBpf - # 证书序列号 - cert-serial-no: 1BCB1533688F349541C7B636EF67C666828BADBA - # 文件路径 + # 服务商 app-id + app-id: wxc09dc9d9bcc94edc + # 服务商 mch-id + mch-id: 1659535913 + # 收款方 sub-mch-id + sub-mch-id: 1729703110 + # 分账方 sub-mch-id + receiver-mch-id: 1649452354 + # 服务商API密钥（32位字符串） + api-key: 00ba7ceab606427071d5d755ea99e976 +# api-key: KXM36nZCXji1sQt75tGk77k7b2K5RBpf + # 服务商证书序列号 + cert-serial-no: 615FBF704AB2838EE8B387F633B340640E078F4B +# cert-serial-no: 1BCB1533688F349541C7B636EF67C666828BADBA + # 服务商文件路径 private-key-path: classpath:cert/apiclient_cert.p12 # private-key-path: D:/project/再昇云/代码/njzscloud/njzscloud-svr/src/main/resources/cert/apiclient_cert.p12 # 支付回调地址 diff --git a/njzscloud-svr/src/main/resources/application-prod.yml b/njzscloud-svr/src/main/resources/application-prod.yml index 0037142..ae83832 100644 --- a/njzscloud-svr/src/main/resources/application-prod.yml +++ b/njzscloud-svr/src/main/resources/application-prod.yml @@ -58,13 +58,21 @@ wechat: app-secret: 66c98dc487a372acb4f1931b38fee8ff base-url: https://api.weixin.qq.com pay: - app-id: wx989ea47a5ddf9bfb - mch-id: 1729703110 - # API密钥（32位字符串） - api-key: KXM36nZCXji1sQt75tGk77k7b2K5RBpf - # 证书序列号 - cert-serial-no: 1BCB1533688F349541C7B636EF67C666828BADBA - # 文件路径 + # 服务商 app-id + app-id: wxc09dc9d9bcc94edc + # 服务商 mch-id + mch-id: 1659535913 + # 收款方 sub-mch-id + sub-mch-id: 1729703110 + # 分账方 sub-mch-id + receiver-mch-id: 1649452354 + # 服务商API密钥（32位字符串） + api-key: 00ba7ceab606427071d5d755ea99e976 + # api-key: KXM36nZCXji1sQt75tGk77k7b2K5RBpf + # 服务商证书序列号 + cert-serial-no: 615FBF704AB2838EE8B387F633B340640E078F4B + # cert-serial-no: 1BCB1533688F349541C7B636EF67C666828BADBA + # 服务商文件路径 private-key-path: classpath:cert/apiclient_cert.p12 # private-key-path: D:/project/再昇云/代码/njzscloud/njzscloud-svr/src/main/resources/cert/apiclient_cert.p12 # 支付回调地址 diff --git a/njzscloud-svr/src/main/resources/cert/apiclient_cert.p12 b/njzscloud-svr/src/main/resources/cert/apiclient_cert.p12 index aa26919be82d90d4abfcc4d022a18b9efb64c7c2..6c9f0779ab681f8739ab6349b79508913b044896 100644 GIT binary patch delta 2569 zcmV+k3ikER70wlqU4L4Vx8?w>`f&mR2mpYB1h`oAMQCIfCz@JFHEP&n)Sy$+0jAoV zcKJ$;6~yzFqyY`9mg7Cz`guB=S=u&wNQHhKYt<0Tt@Ztm_AHcgX7yIt)$gG`!^6!D z&HS?@iG@2@wYujq={a!E1-Z5xarOv3cDvoT`ArZ2$6|s0oqrDM#VJ*I{{1^*49iu< zbca!A@1XW;E`ipsroW_SRyf9&bE~ob29sb> zl|uKUr?(K!RDV_28jx0$?sbUZqzV4x8}tn5PXG6rt1&wf9_&A>|E^4k_g?~A#-zf?wT$F|3l74Eij_yzd z?%(H|m!kaWzSe_j%Mq)K!uG&&UF8-j=0k_3Yq#zU&{t7(Bf-=(CYjYHw{Ix*F^|aR zbS*@=gUM0QX;x>eL2~gOsQT1fdtB!iVvtgp?k#eW5 z`s?SutbZXt{Ex%{ax_-Qog|d4vd}H{P40qJWBtH5AI7@r31x-#u9<6ImZPB4SZzHz z(x^ATEqyfN@#O+@J0Dnt+h}SxGd#Nb4NO)6Ex+Lx#T-UJWDK0)i~c(`cwwxu?9yID zn;t^-_-n#v9`m@$p4yS;Um|Gz0>ouvj%^Samw!nz25?{?rs(6-w3&%UVB}2-#cxdi zStr6TmU-=g0K#Ls3xk`bcE~?h?@QTOO?RC+TYbZ z$#mHj62YoVtW*c`!PM%HV(XQo=AxD-Jb#~J0^lw_kkr|W;d#O4w+0N#1 zus{F%UM<4t;LAK2Q}X{1kBiAbx7NhVhKVnlShcBNqwlDzh`;1du%V`{0lN{EWDQc| z5<`0v@je5Z8vkCzmPEZzPF&hvQbFp95Me@Gqy%lOc}FJPhWmUp`C7!F!(1Nm*nj>l zzh-L`A>HlM9+MC)c+Sehp*E!#qd5ZL1kKk7rl7*BU9h`NE9f#7>q}ttw_Yp-(h{pr zQ7{;qaC`E*Kaq}kvuG|r3ae*Bvo&*T7Liw|ke~no5=T1;*3Bc>z$1x3*4#ctZV(&&F?x;@g% zu^F88A%_J<_4?g)!T^SNlZ&-dcVjMX!-uJA(x}x)!9w)?g*fv>8q9BpmUpPc2Hh51 zPBhqwskNCt`pEh+5Yr*kSnnHHxoD3VI{d`VtY@ZTGr*pxmK#R^Qs*6eg4|?g#6lE* zL!WdAP#e_d&WiK(W%1og7%Yq8l~)^vkD=j2)l(nn0go zmn^>Z(@v`P_`^AHheFd@{i6ept{4F78KY06auLEpv{I>G3K*Jnr<9DR`OFN%u;~>f zcz`&e!+?=-p?K^2J@>cd%5eTWKdCx@Pv9(gkJJ%7Us^(sKsC?yKoD;lxflz|yL4h{ zF50-H%4Q@}c&Rt+{r4q_sD)j=6S?+^z9WSECagIU@HG#-iuL+J17obB5;I@L+4d5R zeNVWjkwC{_9L}bH!DNs@)eUSh%EV&- zl3kz?bVMeLy#lhniBI@~HnwqpvHGp}q)&bGZGWmEnKDp8v++VoE$nxP*-G)lp6bpe z90HT3+@4D<2|(ad0^-7MHKpPc3g?K4V)UIx9*{8t&wNFvpC%{WhDbC<!9R@~`@%ZNx?ZpYJym~N~ zQRx3gN6CZ{2CcmF6T56tQ421Y4Voxsm)f7*E8MZ%g2jKbW%ID58|bi|KTA^{wldvw z?xV8E0@IVYHv7Q({T_*@!%D%H_?2lSP(TeS^Yp1BS{!kN(Y>%{22Ad2Cug{1+c!! zN@GjZzZ^tdytpzIV`(66?|#`&rR8u90s^KQe^?UofxKFm zXol|D4Ur?8)m3E2vw~6U(Au@Ve^=ko30IYgtqQRvyq~C(N%PO4+gkW5#$3oy)ZN(Z zcL~cx|1nxHBL)d7hDe6@4FL%iF%|?Ay$wIm7U|7S2jb2NBXY%1Yv5L(^pk1|MjolB feCZnh#^8yTY`}oaN`)c)VA%u+b;D&+hWx3+Rz@P> delta 2569 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