|
|
@@ -50,7 +50,7 @@ |
|
|
FROM |
|
|
FROM |
|
|
pay_order_v2 |
|
|
pay_order_v2 |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
where order_master_v2.order_type != '3' |
|
|
|
|
|
|
|
|
where order_master_v2.order_type != '3' and pay_order_v2.pay_type not in ('29','30') |
|
|
<if test=" orgId != null"> |
|
|
<if test=" orgId != null"> |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
</if> |
|
|
</if> |
|
|
@@ -63,6 +63,12 @@ |
|
|
<if test=" createEnd != null"> |
|
|
<if test=" createEnd != null"> |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test=" null != payTypeList "> |
|
|
|
|
|
and pay_order_v2.pay_type in |
|
|
|
|
|
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")"> |
|
|
|
|
|
#{payTypeItem} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) |
|
|
AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) |
|
|
GROUP BY |
|
|
GROUP BY |
|
|
pay_type |
|
|
pay_type |
|
|
@@ -75,7 +81,7 @@ |
|
|
FROM |
|
|
FROM |
|
|
pay_refund_order_v2 AS pay_order_v2 |
|
|
pay_refund_order_v2 AS pay_order_v2 |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
where order_master_v2.order_type != '3' |
|
|
|
|
|
|
|
|
where order_master_v2.order_type != '3' and pay_order_v2.pay_type not in ('29','30') |
|
|
<if test=" orgId != null"> |
|
|
<if test=" orgId != null"> |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
</if> |
|
|
</if> |
|
|
@@ -88,10 +94,23 @@ |
|
|
<if test=" createEnd != null"> |
|
|
<if test=" createEnd != null"> |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test=" null != payTypeList "> |
|
|
|
|
|
and pay_order_v2.pay_type in |
|
|
|
|
|
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")"> |
|
|
|
|
|
#{payTypeItem} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
AND refund_status = 2 |
|
|
AND refund_status = 2 |
|
|
GROUP BY |
|
|
GROUP BY |
|
|
pay_type |
|
|
pay_type |
|
|
) AS refund ON pay_type_dict_v2.pay_type = refund.payType |
|
|
) AS refund ON pay_type_dict_v2.pay_type = refund.payType |
|
|
|
|
|
where pay_type_dict_v2.pay_type not in ('29','30') |
|
|
|
|
|
<if test=" null != payTypeList "> |
|
|
|
|
|
and pay_type_dict_v2.pay_type in |
|
|
|
|
|
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")"> |
|
|
|
|
|
#{payTypeItem} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
<select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map"> |
|
|
<select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map"> |
|
|
@@ -118,7 +137,7 @@ SELECT |
|
|
FROM |
|
|
FROM |
|
|
pay_order_v2 |
|
|
pay_order_v2 |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
where order_master_v2.order_type != '3' |
|
|
|
|
|
|
|
|
where order_master_v2.order_type != '3' and pay_order_v2.pay_type not in ('29','30') |
|
|
<if test=" orgId != null"> |
|
|
<if test=" orgId != null"> |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
</if> |
|
|
</if> |
|
|
@@ -131,6 +150,12 @@ SELECT |
|
|
<if test=" createEnd != null"> |
|
|
<if test=" createEnd != null"> |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test=" null != payTypeList "> |
|
|
|
|
|
and pay_order_v2.pay_type in |
|
|
|
|
|
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")"> |
|
|
|
|
|
#{payTypeItem} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) |
|
|
AND ( pay_order_v2.pay_status = 2 OR pay_order_v2.pay_status = 5 OR pay_order_v2.pay_status = 4 ) |
|
|
GROUP BY |
|
|
GROUP BY |
|
|
pay_type |
|
|
pay_type |
|
|
@@ -143,7 +168,7 @@ SELECT |
|
|
FROM |
|
|
FROM |
|
|
pay_refund_order_v2 AS pay_order_v2 |
|
|
pay_refund_order_v2 AS pay_order_v2 |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
LEFT JOIN order_master_v2 ON pay_order_v2.m_order_number = order_master_v2.order_number |
|
|
where order_master_v2.order_type != '3' |
|
|
|
|
|
|
|
|
where order_master_v2.order_type != '3' and pay_order_v2.pay_type not in ('29','30') |
|
|
<if test=" orgId != null"> |
|
|
<if test=" orgId != null"> |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
and order_master_v2.org_id = #{orgId} |
|
|
</if> |
|
|
</if> |
|
|
@@ -156,10 +181,23 @@ SELECT |
|
|
<if test=" createEnd != null"> |
|
|
<if test=" createEnd != null"> |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
and pay_order_v2.created_at <= #{createEnd} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test=" null != payTypeList "> |
|
|
|
|
|
and pay_order_v2.pay_type in |
|
|
|
|
|
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")"> |
|
|
|
|
|
#{payTypeItem} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
AND refund_status = 2 |
|
|
AND refund_status = 2 |
|
|
GROUP BY |
|
|
GROUP BY |
|
|
pay_type |
|
|
pay_type |
|
|
) AS refund ON pay_type_dict_v2.pay_type = refund.payType |
|
|
) AS refund ON pay_type_dict_v2.pay_type = refund.payType |
|
|
|
|
|
where pay_type_dict_v2.pay_type not in ('29','30') |
|
|
|
|
|
<if test=" null != payTypeList "> |
|
|
|
|
|
and pay_type_dict_v2.pay_type in |
|
|
|
|
|
<foreach collection="payTypeList" index="index" item="payTypeItem" open="(" separator="," close=")"> |
|
|
|
|
|
#{payTypeItem} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
) as _temp |
|
|
) as _temp |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
@@ -175,24 +213,32 @@ SELECT |
|
|
select pay_type,name from `trade_pay_type_dict` |
|
|
select pay_type,name from `trade_pay_type_dict` |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
<select id="queryOrderList" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map"> |
|
|
|
|
|
SELECT order_number as orderNumber, serial_no as serialNo, order_amount as orderAmount,real_pay_amount as realPayAmount, |
|
|
|
|
|
discount_amount as discountAmount, pay_type as payType,paid_time as paidTime,order_status as orderStatus |
|
|
|
|
|
from order_master_v2 |
|
|
|
|
|
where order_status = 4 and order_type != '3' |
|
|
|
|
|
|
|
|
<select id="queryOrderListByConditions" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map"> |
|
|
|
|
|
SELECT o.paid_time AS paidTime,o.order_number AS orderNumber,o.serial_no AS serialNo, |
|
|
|
|
|
o.order_amount/100 AS orderAmount, |
|
|
|
|
|
sum( IF ( p.pay_type = 29, pay_amount, 0 ) )/100 AS discountAmount, |
|
|
|
|
|
o.real_pay_amount / 100 AS realPayAmount, |
|
|
|
|
|
o.order_status AS orderStatus, |
|
|
|
|
|
p.pay_type as payType |
|
|
|
|
|
FROM |
|
|
|
|
|
order_master_v2 AS o |
|
|
|
|
|
LEFT JOIN pay_order_v2 AS p ON o.order_number = p.m_order_number |
|
|
|
|
|
where 1=1 |
|
|
<if test=" orgId != null"> |
|
|
<if test=" orgId != null"> |
|
|
and org_id = #{orgId} |
|
|
|
|
|
|
|
|
and o.org_id = #{orgId} |
|
|
</if> |
|
|
</if> |
|
|
<if test=" shopId != null"> |
|
|
<if test=" shopId != null"> |
|
|
and shop_id = #{shopId} |
|
|
|
|
|
|
|
|
and o.shop_id = #{shopId} |
|
|
</if> |
|
|
</if> |
|
|
<if test=" createBegin != null"> |
|
|
<if test=" createBegin != null"> |
|
|
and created_at >= #{createBegin} |
|
|
|
|
|
|
|
|
and o.created_at >= #{createBegin} |
|
|
</if> |
|
|
</if> |
|
|
<if test=" createEnd != null"> |
|
|
<if test=" createEnd != null"> |
|
|
and created_at <= #{createEnd} |
|
|
|
|
|
|
|
|
and o.created_at <= #{createEnd} |
|
|
</if> |
|
|
</if> |
|
|
ORDER BY created_at desc |
|
|
|
|
|
|
|
|
GROUP BY |
|
|
|
|
|
o.order_number |
|
|
|
|
|
ORDER BY o.created_at desc |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
</mapper> |
|
|
</mapper> |