From a8a3720ecdfe84c232d84d2082ca21c52837a348 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 15 Jun 2025 10:10:51 +0800 Subject: [PATCH] =?UTF-8?q?!1359=20fix(mall)=EF=BC=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=85=85=E5=80=BC=EF=BC=88=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E7=89=A9=E5=93=81=EF=BC=89=E8=AE=A2=E5=8D=95=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=BF=A1=E6=81=AF=E5=88=B0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/wallet/PayWalletRechargeServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java index d58e2b3c4..f1253f476 100644 --- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java +++ b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pay.service.wallet; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; @@ -17,6 +18,7 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO; import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletRechargeDO; import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletRechargePackageDO; import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletRechargeMapper; +import cn.iocoder.yudao.module.pay.enums.PayChannelEnum; import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum; import cn.iocoder.yudao.module.pay.enums.refund.PayRefundStatusEnum; import cn.iocoder.yudao.module.pay.enums.wallet.PayWalletBizTypeEnum; @@ -158,9 +160,8 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService { @Async public void sendWalletRechargerPaidMessage(Long payOrderId, PayWalletRechargeDO walletRecharge) { - // 1. 获得会员钱包信息 + // 1. 构建并发送模版消息 PayWalletDO wallet = payWalletService.getWallet(walletRecharge.getWalletId()); - // 2. 构建并发送模版消息 socialClientApi.sendWxaSubscribeMessage(new SocialWxaSubscribeMessageSendReqDTO() .setUserId(wallet.getUserId()).setUserType(wallet.getUserType()) .setTemplateTitle(WXA_WALLET_RECHARGER_PAID) @@ -169,8 +170,13 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService { .addMessage("amount2", fenToYuanStr(walletRecharge.getTotalPrice())) // 充值金额 .addMessage("time3", LocalDateTimeUtil.formatNormal(walletRecharge.getCreateTime())) // 充值时间 .addMessage("phrase4", "充值成功")); // 充值状态 - // 3. 调用接口上传虚拟物品发货信息 + + // 2. 调用接口上传虚拟物品发货信息 + // 注意：只有微信小程序支付的订单，才需要同步 PayOrderDO payOrder = payOrderService.getOrder(payOrderId); + if (ObjUtil.notEqual(payOrder.getChannelCode(), PayChannelEnum.WX_LITE.getCode())) { + return; + } SocialWxaOrderUploadShippingInfoReqDTO reqDTO = new SocialWxaOrderUploadShippingInfoReqDTO() .setTransactionId(payOrder.getChannelOrderNo()) .setOpenid(payOrder.getChannelUserId())