caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper711 2024-09-18 12:24:16 +08:00
commit ddcda57a08
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DB/version4.3toMASTER.sql
View File

@ -105,7 +105,7 @@ WHERE
sf.flow_type = 'REFUND' sf.flow_type = 'REFUND'
AND sf.store_id=b.store_id AND sf.store_id=b.store_id
AND sf.create_time BETWEEN b.start_time AND sf.create_time BETWEEN b.start_time
AND b.end_time),0) AND b.end_time),0);
UPDATE li_bill b UPDATE li_bill b
SET b.kanjia_refund_settlement_price =IFNULL(( SET b.kanjia_refund_settlement_price =IFNULL((

18
framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java
View File

@ -5,8 +5,6 @@ import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix; import cn.lili.cache.CachePrefix;
import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException; 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.security.context.UserContext;
import cn.lili.common.utils.CommonUtil; import cn.lili.common.utils.CommonUtil;
import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.Member;
@ -48,12 +46,6 @@ public class SmsUtilAliImplService implements SmsUtil {
@Autowired @Autowired
private SmsPluginFactory smsPluginFactory; private SmsPluginFactory smsPluginFactory;
@Autowired
private SmsTemplateProperties smsTemplateProperties;
@Autowired
private SystemSettingProperties systemSettingProperties;
@Override @Override
public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) { public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) {
//获取短信配置 //获取短信配置
@ -78,18 +70,18 @@ public class SmsUtilAliImplService implements SmsUtil {
switch (verificationEnums) { switch (verificationEnums) {
//登录 //登录
case LOGIN: { case LOGIN: {
templateCode = smsTemplateProperties.getLOGIN(); templateCode = smsSetting.getLoginTemplateCode();
break; break;
} }
//注册 //注册
case BIND_MOBILE: case BIND_MOBILE:
case REGISTER: { case REGISTER: {
templateCode = smsTemplateProperties.getREGISTER(); templateCode = smsSetting.getRegisterTemplateCode();
break; break;
} }
//找回密码 //找回密码
case FIND_USER: { case FIND_USER: {
templateCode = smsTemplateProperties.getFIND_USER(); templateCode = smsSetting.getFindPasswordTemplateCode();
break; break;
} }
//修改密码 //修改密码
@ -100,7 +92,7 @@ public class SmsUtilAliImplService implements SmsUtil {
} }
//更新为用户最新手机号 //更新为用户最新手机号
mobile = member.getMobile(); mobile = member.getMobile();
templateCode = smsTemplateProperties.getUPDATE_PASSWORD(); templateCode = smsSetting.getFindPasswordTemplateCode();
break; break;
} }
//设置支付密码 //设置支付密码
@ -108,7 +100,7 @@ public class SmsUtilAliImplService implements SmsUtil {
Member member = memberService.getById(UserContext.getCurrentUser().getId()); Member member = memberService.getById(UserContext.getCurrentUser().getId());
//更新为用户最新手机号 //更新为用户最新手机号
mobile = member.getMobile(); mobile = member.getMobile();
templateCode = smsTemplateProperties.getWALLET_PASSWORD(); templateCode = smsSetting.getWalletPasswordTemplateCode();
break; break;
} }
//如果不是有效的验证码手段，则此处不进行短信操作 //如果不是有效的验证码手段，则此处不进行短信操作

4
framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMPServiceImpl.java
View File

@ -137,7 +137,7 @@ public class WechatMPServiceImpl implements WechatMPService {
map.put("upload_time", DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(ZonedDateTime.now())); 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) { if (connect == null) {
return; return;
} }
@ -263,7 +263,7 @@ public class WechatMPServiceImpl implements WechatMPService {
private String out_trade_no; private String out_trade_no;
public OrderKey(Order order) { public OrderKey(Order order) {
this.order_number_type = 2; this.order_number_type = 1;
this.out_trade_no = order.getPayOrderNo(); this.out_trade_no = order.getPayOrderNo();
this.transaction_id = order.getReceivableNo(); this.transaction_id = order.getReceivableNo();
} }