|
|
@@ -634,16 +634,25 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="freightStatisticsList2" resultType="com.yami.shop.bean.vo.FreightStatisticsVo">
|
|
|
- SELECT @row_number := @row_number + 1 AS sort,a.pay_time,CONCAT(b.receiver,' ',b.mobile) receiver,a.dvy_flow_id delivery_no,b.address to_address,a.freight_amount money,a.order_number order_no
|
|
|
+ SELECT @row_number := @row_number + 1 AS sort,a.pay_time,CONCAT(b.receiver,' ',b.mobile) receiver,a.dvy_flow_id delivery_no,b.address to_address,a.freight_amount money,a.order_number order_no,
|
|
|
+ CASE WHEN a.dvy_type=1 THEN '邮政'
|
|
|
+ WHEN a.dvy_type=3 THEN '麦芽田-闪送'
|
|
|
+ ELSE
|
|
|
+ '其他'
|
|
|
+ END delivery
|
|
|
FROM (SELECT @row_number := 0) sort,
|
|
|
tz_order a
|
|
|
LEFT JOIN tz_user_addr_order b on a.addr_order_id =b.addr_order_id
|
|
|
- WHERE a.is_payed=1 and a.dvy_type=1 and a.hb_order_status not in(0,60)
|
|
|
+ WHERE a.is_payed=1 and a.hb_order_status not in(0,60)
|
|
|
and a.channel_id in
|
|
|
<foreach collection="po.channelIds" item="id" open="(" separator="," close=")">
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
|
|
|
+ <if test="po.delivery != null">
|
|
|
+ and a.dvy_type=#{po.delivery}
|
|
|
+ </if>
|
|
|
+
|
|
|
<if test="po.receiver != null and po.receiver != ''">
|
|
|
AND b.receiver like concat('%',#{po.receiver} ,'%')
|
|
|
</if>
|
wangming