angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
zhangheng 2025-09-23 10:25:39 +08:00
parent 9ca1e812e5 7ed89abcc0
commit e81d233aef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
View File

@ -62,7 +62,7 @@ public class TOnlinePaymentServiceImpl extends ServiceImpl<TOnlinePaymentMapper,
}else{ }else{
tOnlinePaymentExt.setOrderTypeVal("充值订单"); tOnlinePaymentExt.setOrderTypeVal("充值订单");
if(ObjectUtil.isEmpty(tOnlinePaymentExt.getMemberCode())){ if(ObjectUtil.isEmpty(tOnlinePaymentExt.getMemberCode())){
tOnlinePaymentExt.setOrderTypeVal("注册订单"); tOnlinePaymentExt.setOrderTypeVal("");
} }
} }
} }

2
bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml
View File

@ -30,7 +30,7 @@
<!-- 查询列表 --> <!-- 查询列表 -->
<select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt"> <select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt">
select top.*, cm.member_code, cm.member_name, select so.pay_time payTime, cm.phone, top.*, cm.member_code, cm.member_name,
so.order_type orderType so.order_type orderType
from T_ONLINE_PAYMENT top from T_ONLINE_PAYMENT top
left join cu_member cm left join cu_member cm