|
@@ -44,7 +44,9 @@
|
|
|
<select id="selectOrder" resultType="com.sqx.modules.order.entity.TbOrder">
|
|
<select id="selectOrder" resultType="com.sqx.modules.order.entity.TbOrder">
|
|
|
select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
|
|
select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
|
|
|
shopPhone,
|
|
shopPhone,
|
|
|
- ti.rider_user_id as riderUserId, tcu.money as couponMoney,
|
|
|
|
|
|
|
+ ti.rider_user_id as riderUserId,
|
|
|
|
|
+ ti.indent_state,
|
|
|
|
|
+ tcu.money as couponMoney,
|
|
|
pd.trade_no as transactionId
|
|
pd.trade_no as transactionId
|
|
|
from tb_order tor
|
|
from tb_order tor
|
|
|
left join tb_user tu on tor.user_id = tu.user_id
|
|
left join tb_user tu on tor.user_id = tu.user_id
|
|
@@ -89,8 +91,11 @@
|
|
|
<select id="selectAllOrderAdmin" resultType="com.sqx.modules.order.entity.TbOrder">
|
|
<select id="selectAllOrderAdmin" resultType="com.sqx.modules.order.entity.TbOrder">
|
|
|
select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
|
|
select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
|
|
|
shopPhone,
|
|
shopPhone,
|
|
|
- tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,ti.receiving_time,
|
|
|
|
|
- ti.rider_user_id as riderUserId, tcu.money as couponMoney,
|
|
|
|
|
|
|
+ tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
|
|
|
|
|
+ ti.receiving_time,
|
|
|
|
|
+ ti.indent_state,
|
|
|
|
|
+ ti.rider_user_id as riderUserId,
|
|
|
|
|
+ tcu.money as couponMoney,
|
|
|
apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,
|
|
apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,
|
|
|
(select station_name from rider_station where id = tiu.rider_station_id ) as stationName,
|
|
(select station_name from rider_station where id = tiu.rider_station_id ) as stationName,
|
|
|
(select st.shop_type_name from shop_type st where st.id =gs.shop_type_id ) as shopTypeName,
|
|
(select st.shop_type_name from shop_type st where st.id =gs.shop_type_id ) as shopTypeName,
|