|
|
@@ -425,6 +425,24 @@
|
|
|
<if test="merchSn != null and merchSn.trim() != ''">
|
|
|
AND o.merch_sn = #{merchSn}
|
|
|
</if>
|
|
|
+ <if test="goodsSn != null and goodsSn.trim() != ''">
|
|
|
+ AND gs.goods_sn = #{goodsSn}
|
|
|
+ </if>
|
|
|
+ <if test="sku != null and sku.trim() != ''">
|
|
|
+ AND gs.sku = #{sku}
|
|
|
+ </if>
|
|
|
+ <if test="prodBarcode != null and prodBarcode.trim() != ''">
|
|
|
+ AND gs.prod_barcode = #{prodBarcode}
|
|
|
+ </if>
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ > ]]> #{startTime}
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ < ]]> #{endTime}
|
|
|
+ </if>
|
|
|
+ <if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
|
|
|
+ AND s.third_party_merch_code = #{thirdPartyMerchCode}
|
|
|
+ </if>
|
|
|
<if test="orderSn != null and orderSn.trim() != ''">
|
|
|
AND o.order_sn LIKE concat('%',#{orderSn},'%')
|
|
|
</if>
|
|
|
@@ -465,12 +483,11 @@
|
|
|
<select id="queryOffilineOrderTotal" resultType="int">
|
|
|
select count(DISTINCT o.id) FROM
|
|
|
mall_order o
|
|
|
- LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
|
|
|
+
|
|
|
LEFT JOIN mall_order_goods g ON o.id = g.order_id
|
|
|
- left join mall_store s on o.store_id = s.id
|
|
|
- LEFT JOIN mall_goods gs ON g.goods_id = gs.id
|
|
|
- left join mall_sale_record record on record.order_sn = o.order_sn
|
|
|
+ LEFT JOIN mall_sale_record record ON record.order_sn = o.order_sn
|
|
|
LEFT JOIN sys_user u ON record.saller_id = u.user_id
|
|
|
+ LEFT JOIN mall_pick_up_code c ON o.order_sn = c.order_sn
|
|
|
WHERE 1=1
|
|
|
<if test="storeId != null and storeId != ''">
|
|
|
AND o.store_id = #{storeId}
|
|
|
@@ -487,6 +504,12 @@
|
|
|
<if test="prodBarcode != null and prodBarcode.trim() != ''">
|
|
|
AND gs.prod_barcode = #{prodBarcode}
|
|
|
</if>
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ > ]]> #{startTime}
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ < ]]> #{endTime}
|
|
|
+ </if>
|
|
|
<if test="thirdPartyMerchCode != null and thirdPartyMerchCode.trim() != ''">
|
|
|
AND s.third_party_merch_code = #{thirdPartyMerchCode}
|
|
|
</if>
|
|
|
@@ -1632,9 +1655,9 @@
|
|
|
s.id AS storeId,
|
|
|
o.merch_sn AS merchSn,
|
|
|
m.merch_name AS merchName,
|
|
|
- count( 0 ) AS guestNumber,
|
|
|
- sum( o.order_price ) AS totalSales,
|
|
|
- sum( o.actual_price ) AS actualSales,
|
|
|
+ count( distinct o.order_sn ) AS guestNumber,
|
|
|
+ sum( og.actual_payment_amount/ (1+og.goods_rate) ) + sum(og.discounted_price)AS totalSales,
|
|
|
+ sum( og.actual_payment_amount/ (1+og.goods_rate) ) + sum(og.discounted_price) AS actualSales,
|
|
|
s.store_name AS storeName,
|
|
|
max( o.add_time ) AS lastSalesTime ,
|
|
|
sum( g.cost_price) AS totalCost
|
|
|
@@ -1648,6 +1671,7 @@
|
|
|
LEFT JOIN mall_category c ON sr.category_id = c.id
|
|
|
WHERE
|
|
|
1 = 1
|
|
|
+ and (o.order_status = '300' or o.order_status = '201')
|
|
|
<if test="storeId != null and storeId.trim() != ''">
|
|
|
and o.store_id=#{storeId}
|
|
|
</if>
|
|
|
@@ -1745,19 +1769,32 @@
|
|
|
</select>
|
|
|
<select id="queryExportOffilineOrderList" resultType="com.kmall.admin.entity.OrderEntity">
|
|
|
SELECT distinct
|
|
|
- o.*,
|
|
|
+ o.id,
|
|
|
+ o.order_sn,
|
|
|
+ u.username as userName,
|
|
|
+
|
|
|
+ o.pay_name,
|
|
|
+ o.mobile,
|
|
|
+ o.is_onffline_order,
|
|
|
+ o.order_biz_type,
|
|
|
+ o.order_status,
|
|
|
+ o.pay_status,
|
|
|
+ o.coupon_name,
|
|
|
+ o.coupon_price,
|
|
|
+ g.actual_payment_amount as actualPrice,
|
|
|
+ o.order_price,
|
|
|
+ o.pay_time,
|
|
|
+ o.pay_flag,
|
|
|
u.username AS userName,
|
|
|
- p.is_payment_send,
|
|
|
- p.is_ele_order_send,
|
|
|
- p.is_customs_send,
|
|
|
+ g.discounted_price as couponPrice ,
|
|
|
s.store_name storeName,
|
|
|
g.sku,
|
|
|
g.goods_name as goodsName,
|
|
|
- gs.retail_price,
|
|
|
+ g.retail_price,
|
|
|
g.number
|
|
|
FROM
|
|
|
mall_order o
|
|
|
- LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
|
|
|
+
|
|
|
LEFT JOIN mall_order_goods g ON o.id = g.order_id
|
|
|
left join mall_store s on o.store_id = s.id
|
|
|
LEFT JOIN mall_goods gs ON g.goods_id = gs.id
|
|
|
@@ -1773,19 +1810,38 @@
|
|
|
<if test="isOnfiilineOrder != null">
|
|
|
AND o.is_onffline_order = #{isOnfiilineOrder}
|
|
|
</if>
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ > ]]> #{startTime}
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ < ]]> #{endTime}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<select id="queryMasterExportOffilineOrderList" resultType="com.kmall.admin.entity.OrderEntity">
|
|
|
SELECT distinct
|
|
|
- o.*,
|
|
|
+ o.id,
|
|
|
+ o.order_sn,
|
|
|
+ u.username as userName,
|
|
|
+
|
|
|
+ o.pay_name,
|
|
|
+ o.mobile,
|
|
|
+ o.is_onffline_order,
|
|
|
+ o.order_biz_type,
|
|
|
+ o.order_status,
|
|
|
+ o.pay_status,
|
|
|
+ o.coupon_name,
|
|
|
+ o.coupon_price,
|
|
|
+ o.actual_price,
|
|
|
+ o.order_price,
|
|
|
+ o.pay_time,
|
|
|
+ o.pay_flag,
|
|
|
u.username AS userName,
|
|
|
- p.is_payment_send,
|
|
|
- p.is_ele_order_send,
|
|
|
- p.is_customs_send,
|
|
|
+
|
|
|
s.store_name storeName
|
|
|
FROM
|
|
|
mall_order o
|
|
|
|
|
|
- LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
|
|
|
+
|
|
|
LEFT JOIN mall_order_goods g ON o.id = g.order_id
|
|
|
left join mall_store s on o.store_id = s.id
|
|
|
LEFT JOIN mall_goods gs ON g.goods_id = gs.id
|
|
|
@@ -1834,6 +1890,12 @@
|
|
|
<if test="ids != null and ids.trim() != ''">
|
|
|
AND o.id in (${ids})
|
|
|
</if>
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ > ]]> #{startTime}
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND o.add_time <![CDATA[ < ]]> #{endTime}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
<select id="queryMasterExportList" resultType="com.kmall.admin.entity.OrderEntity">
|
|
|
SELECT DISTINCT
|
