|
|
@@ -3,7 +3,7 @@
|
|
|
<mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMapper">
|
|
|
|
|
|
<select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
|
|
|
- select o.* ,
|
|
|
+ select o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,
|
|
|
null as customer_name,0 as customer_type,null as end_customer,null as use_type ,null as project_num ,
|
|
|
null as remark,null as agentName,null as agentId,
|
|
|
u.user_name,u.nick_name,
|
|
|
@@ -15,7 +15,9 @@
|
|
|
and o.rec_status = 'ABC'
|
|
|
</if>
|
|
|
union all
|
|
|
- SELECT o.*,u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
|
|
|
+ select o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,
|
|
|
+ o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.agent_name,o.agent_id
|
|
|
+ u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
|
|
|
left join t_user u on o.user_id = u.id
|
|
|
<include refid="commonWhere"></include>
|
|
|
<if test="param.customerType!=null">
|
lyhzzz