## Opt - 在线支付明细增加体系名称&体系查询条件
This commit is contained in:
parent
5ebe4bc601
commit
8df523a554
|
@ -32,6 +32,14 @@ public class TOnlinePaymentExt extends TOnlinePayment {
|
||||||
|
|
||||||
private Integer orderType;
|
private Integer orderType;
|
||||||
private String orderTypeVal;
|
private String orderTypeVal;
|
||||||
|
/**
|
||||||
|
* 体系ID
|
||||||
|
*/
|
||||||
|
private Integer vertexId;
|
||||||
|
/**
|
||||||
|
* 体系名称
|
||||||
|
*/
|
||||||
|
private String vertexName;
|
||||||
|
|
||||||
private Long rechargeId;
|
private Long rechargeId;
|
||||||
|
|
||||||
|
|
|
@ -71,4 +71,5 @@ public class OnlinePaymentParam {
|
||||||
*/
|
*/
|
||||||
private Integer orderType;
|
private Integer orderType;
|
||||||
|
|
||||||
|
private Integer vertexId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,11 @@ public class OnlinePaymentVO {
|
||||||
*/
|
*/
|
||||||
@Excel(name = "会员姓名")
|
@Excel(name = "会员姓名")
|
||||||
private String memberName;
|
private String memberName;
|
||||||
|
/**
|
||||||
|
* 体系名称
|
||||||
|
*/
|
||||||
|
@Excel(name = "体系名称")
|
||||||
|
private String vertexName;
|
||||||
/**
|
/**
|
||||||
* 业务类型(1=直销订单,3=充值,4=抽奖)
|
* 业务类型(1=直销订单,3=充值,4=抽奖)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -31,14 +31,20 @@
|
||||||
<!-- 查询列表 -->
|
<!-- 查询列表 -->
|
||||||
<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,smr.Pk_id as rechargeId,
|
select top.*, cm.member_code, cm.member_name,smr.Pk_id as rechargeId,
|
||||||
so.order_type orderType
|
so.order_type orderType,
|
||||||
|
bv.VERTEX_NAME,
|
||||||
|
bv.pk_id VERTEX_id
|
||||||
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
|
left join cu_member_recharge smr on smr.RECHARGE_CODE = top.business_code
|
||||||
|
left join BD_VERTEX bv on bv.pk_id = cm.PK_VERTEX
|
||||||
where top.del_flag = 0
|
where top.del_flag = 0
|
||||||
and top.pk_country = #{pkCountry}
|
and top.pk_country = #{pkCountry}
|
||||||
|
<if test="param.vertexId != null">
|
||||||
|
and bv.pk_id = ${param.vertexId}
|
||||||
|
</if>
|
||||||
<if test="param.memberCode != null and param.memberCode != ''">
|
<if test="param.memberCode != null and param.memberCode != ''">
|
||||||
and cm.member_code like #{param.memberCode} || '%'
|
and cm.member_code like #{param.memberCode} || '%'
|
||||||
</if>
|
</if>
|
||||||
|
|
Loading…
Reference in New Issue