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

Compare commits

base: angelo:7ed89abcc051f7b8d951282f633bab6a3428d542
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
..
compare: angelo:a22ae8289d4b52fa923b3b384e142607e5772183
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:master

No commits in common. "7ed89abcc051f7b8d951282f633bab6a3428d542" and "a22ae8289d4b52fa923b3b384e142607e5772183" have entirely different histories.
7ed89abcc0 ... a22ae8289d

2 changed files with 2 additions and 2 deletions
Show Stats 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 so.pay_time payTime, cm.phone, top.*, cm.member_code, cm.member_name, select 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