From 42b3c72977aeab9b0d1d61bf184f1f1d3bd9c13b Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Sat, 14 Sep 2024 16:11:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E4=BF=A1=E6=81=AF=E5=BD=95=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF=EF=BC=8C=E7=9F=AD=E4=BF=A1=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=BD=BF=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E7=9F=AD=E4=BF=A1CODE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/impl/SmsUtilAliImplService.java | 18 +++++------------- .../serviceimpl/WechatMPServiceImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java index 5fb22310..1f994e7e 100644 --- a/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java @@ -5,8 +5,6 @@ import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.properties.SmsTemplateProperties; -import cn.lili.common.properties.SystemSettingProperties; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.CommonUtil; import cn.lili.modules.member.entity.dos.Member; @@ -48,12 +46,6 @@ public class SmsUtilAliImplService implements SmsUtil { @Autowired private SmsPluginFactory smsPluginFactory; - @Autowired - private SmsTemplateProperties smsTemplateProperties; - - @Autowired - private SystemSettingProperties systemSettingProperties; - @Override public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) { //获取短信配置 @@ -78,18 +70,18 @@ public class SmsUtilAliImplService implements SmsUtil { switch (verificationEnums) { //登录 case LOGIN: { - templateCode = smsTemplateProperties.getLOGIN(); + templateCode = smsSetting.getLoginTemplateCode(); break; } //注册 case BIND_MOBILE: case REGISTER: { - templateCode = smsTemplateProperties.getREGISTER(); + templateCode = smsSetting.getRegisterTemplateCode(); break; } //找回密码 case FIND_USER: { - templateCode = smsTemplateProperties.getFIND_USER(); + templateCode = smsSetting.getFindPasswordTemplateCode(); break; } //修改密码 @@ -100,7 +92,7 @@ public class SmsUtilAliImplService implements SmsUtil { } //更新为用户最新手机号 mobile = member.getMobile(); - templateCode = smsTemplateProperties.getUPDATE_PASSWORD(); + templateCode = smsSetting.getFindPasswordTemplateCode(); break; } //设置支付密码 @@ -108,7 +100,7 @@ public class SmsUtilAliImplService implements SmsUtil { Member member = memberService.getById(UserContext.getCurrentUser().getId()); //更新为用户最新手机号 mobile = member.getMobile(); - templateCode = smsTemplateProperties.getWALLET_PASSWORD(); + templateCode = smsSetting.getWalletPasswordTemplateCode(); break; } //如果不是有效的验证码手段，则此处不进行短信操作 diff --git a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPServiceImpl.java b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPServiceImpl.java index 73cb6f91..4053e3a3 100644 --- a/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPServiceImpl.java @@ -137,7 +137,7 @@ public class WechatMPServiceImpl implements WechatMPService { map.put("upload_time", DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now())); //支付者，支付者信息 - Connect connect = connectService.queryConnect(ConnectQueryDTO.builder().userId(UserContext.getCurrentUser().getId()).unionType(SourceEnum.WECHAT_MP_OPEN_ID.name()).build()); + Connect connect = connectService.queryConnect(ConnectQueryDTO.builder().userId(order.getMemberId()).unionType(SourceEnum.WECHAT_MP_OPEN_ID.name()).build()); if (connect == null) { return; } @@ -263,7 +263,7 @@ public class WechatMPServiceImpl implements WechatMPService { private String out_trade_no; public OrderKey(Order order) { - this.order_number_type = 2; + this.order_number_type = 1; this.out_trade_no = order.getPayOrderNo(); this.transaction_id = order.getReceivableNo(); }