java/mx_charging_pile.git

			@@ -44,6 +44,7 @@
			id, code, app_user_id, order_type, goods_id, coupon_id, purchase_quantity, app_user_address_id, order_amount, app_coupon_id, coupon_discount_amount, vip_discount, vip_discount_amount, payment_amount, payment_status, payment_type, serial_number, remark, status, express_company, express_number, consigner_id, consigner_time, receiving_time, cancellation_time, cancellation_id, refund_code, refund_amount, refund_status, refund_serial_number, refund_time, create_time, del_flag
			</sql>
			<select id="activityStatistics" resultType="com.ruoyi.order.api.vo.TActivityStatisticslVO">
			select * from (
			select t9.code ,t9.order_amount as orderAmount,
			t9.coupon_discount_amount as couponDiscountAmount,
			t9.vip_discount_amount as vipDiscountAmount,
			@@ -52,30 +53,29 @@
			t9.app_user_id as appUserId,
			1 as orderType
			from t_charging_order t9
			where t9.id = 0 limit 1
			where t9.id = 0
			<if test="req.orderType == null or req.orderType == 1">
			<if test="req.type == null or req.type == 1 or req.type == 2">
			union all
			select t1.code ,t1.order_amount as orderAmount,
			t1.coupon_discount_amount as couponDiscountAmount,
			t1.vip_discount_amount as vipDiscountAmount,
			t1.payment_amount as paymentAmount,
			t1.create_time as createTime,
			select
			t1.code ,
			t1.order_amount as orderAmount,
			t1.coupon_discount_amount as couponDiscountAmount,
			t1.vip_discount_amount as vipDiscountAmount,
			t1.payment_amount as paymentAmount,
			t1.create_time as createTime,
			t1.app_user_id as appUserId,
			1 as orderType
			1 as orderType
			from t_charging_order t1
			where 1 = 1
			<if test="null != req.code and req.code!=''">
			and t1.code LIKE CONCAT('%',#{req.code},'%')
			</if>
			<if test="req.type != null and req.type != '' and req.type == 1">
			<if test="req.type != null and req.type == 1">
			and t1.coupon_discount_amount > 0
			</if>
			<if test="req.type != null and req.type != '' and req.type == 2">
			<if test="req.type != null and req.type == 2">
			and t1.vip_discount_amount > 0
			</if>
			<if test="req.type == null ">
			and (t1.vip_discount_amount > 0 or t1.coupon_discount_amount > 0)
			</if>
			<if test="null != req.userIds and req.userIds.size()>0" >
			and t1.app_user_id in
			@@ -92,8 +92,9 @@
			<if test="req.endTime != null and req.endTime != '' and req.startTime != null and req.startTime != ''">
			AND (t1.create_time between CONCAT(#{req.startTime},':00') and CONCAT(#{req.endTime},':59'))
			</if>
			and t1.recharge_payment_status =2
			and t1.refund_status !=2
			and (t1.vip_discount_amount > 0 or t1.coupon_discount_amount > 0)
			and t1.recharge_payment_status =2
			and t1.refund_status !=2
			AND t1.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
			</if>
			</if>
			@@ -192,10 +193,11 @@
			AND (t5.create_time between CONCAT(#{req.startTime},':00') and CONCAT(#{req.endTime},':59'))
			</if>
			AND t5.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}

			</if>
			</if>
			</if>
			)
			order by createTime DESC
			</select>