flowerbackend-v2.git

			@@ -216,6 +216,7 @@
			IFNULL(sum(order_markup_partner_amount),0) as order_markup_partner_amount,
			IFNULL(sum(order_price_discount_amount),0) as order_price_discount_amount,
			IFNULL(sum(order_coupon_amount_total),0) as order_coupon_amount_total,
			IFNULL(sum(order_check_fee)+sum(order_lack_fee_supplier)+sum(order_replace_fee),0) as order_check_total_fee,
			IFNULL(sum(order_check_fee),0) as order_check_fee,
			IFNULL(sum(order_lack_fee_supplier),0) as order_lack_fee_supplier,
			IFNULL(sum(order_replace_fee),0) as order_replace_fee,
			@@ -265,6 +266,7 @@

			<sql id="baseSql">
			select t2.*,
			IFNULL(t2.order_check_fee+t2.order_lack_fee_supplier+t2.order_replace_fee,0) as order_check_total_fee,
			IFNULL(t3.fee_supplier,0) as order_fee_supplier,
			IFNULL(t3.fee_partner,0) as order_fee_partner,
			IFNULL(t3.fee_platform,0) as order_fee_platform,
			@@ -277,8 +279,19 @@
			select
			t1.order_id, t1.total_amount ,sum(t1.num) as order_num ,
			( sum( t1.supplier_price_amount )+sum( t1.markup_one_amount )+sum( t1.markup_two_amount )+sum( t1.markup_partner_amount ) + t1.packing_fee + t1.transport_fee ) AS order_total,
			sum(t1.supplier_price_amount) as order_supplier_price_amount, sum(t1.markup_one_amount) as order_markup_one_amount,sum(t1.markup_two_amount) as order_markup_two_amount, sum(t1.markup_partner_amount) as order_markup_partner_amount,sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,sum(t1.price_discount_amount) as order_price_discount_amount,sum(t1.coupon_amount_total) as order_coupon_amount_total,sum(t1.check_fee) as order_check_fee,sum(t1.lack_fee_supplier) as order_lack_fee_supplier,sum(t1.replace_fee) as order_replace_fee,
			sum(replace_num) as order_replace_num,sum(reduce_num) as order_reduce_num,sum(lack_num) as order_lack_num
			sum(t1.supplier_price_amount) as order_supplier_price_amount,
			sum(t1.markup_one_amount) as order_markup_one_amount,
			sum(t1.markup_two_amount) as order_markup_two_amount,
			sum(t1.markup_partner_amount) as order_markup_partner_amount,
			sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,
			sum(t1.price_discount_amount) as order_price_discount_amount,
			sum(t1.coupon_amount_total) as order_coupon_amount_total,
			sum(t1.check_fee) as order_check_fee,
			sum(t1.lack_fee_supplier) as order_lack_fee_supplier,
			sum(t1.replace_fee) as order_replace_fee,
			sum(replace_num) as order_replace_num,
			sum(reduce_num) as order_reduce_num,
			sum(lack_num) as order_lack_num
			from (
			SELECT
			o.total_amount, o.flower_amount, o.packing_fee, o.transport_fee,