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

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

This commit is contained in:
cabbage 2025-07-23 17:34:17 +08:00
parent ad552506f1 23d556c78a
commit 4dc86fe750
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java
View File

@ -33,4 +33,6 @@ public class TOnlinePaymentExt extends TOnlinePayment {
private Integer orderType; private Integer orderType;
private String orderTypeVal; private String orderTypeVal;
private Long rechargeId;
} }

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

@ -30,12 +30,13 @@
<!-- 查询列表 --> <!-- 查询列表 -->
<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 top.*, cm.member_code, cm.member_name,smr.Pk_id as rechargeId
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
on cm.pk_id = top.pk_creator on cm.pk_id = top.pk_creator
left join sa_order so on so.ORDER_CODE = top.business_code left join sa_order so on so.ORDER_CODE = top.business_code
left join cu_member_recharge smr on smr.RECHARGE_CODE = top.business_code
where top.del_flag = 0 where top.del_flag = 0
and top.pk_country = #{pkCountry} and top.pk_country = #{pkCountry}
<if test="param.memberCode != null and param.memberCode != ''"> <if test="param.memberCode != null and param.memberCode != ''">