diff --git a/DB/version4.3toMASTER.sql b/DB/version4.3toMASTER.sql index eba294c6..84de6e6b 100644 --- a/DB/version4.3toMASTER.sql +++ b/DB/version4.3toMASTER.sql @@ -105,7 +105,7 @@ WHERE sf.flow_type = 'REFUND' AND sf.store_id=b.store_id AND sf.create_time BETWEEN b.start_time - AND b.end_time),0) + AND b.end_time),0); UPDATE li_bill b SET b.kanjia_refund_settlement_price =IFNULL(( 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(); }