diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index d9119b28d..f867a2bab 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -15,10 +15,14 @@ + + + - `id`,`order_number`,`tenant_id`,`c_user_id`,`product_id`,`type`,`payment_type`,`payment`,`payment_time`,`order_status`,`create_date`,`update_date`,`detail` + `id`,`order_number`,`tenant_id`,`c_user_id`,`product_id`,`type`,`payment_type`,`payment`,`payment_time`,`order_status`,`create_date`,`update_date`,`detail`, + `press_end_date`,`press_current_num`,`press_current_value` @@ -75,6 +79,19 @@ and `detail` like concat('%', #{detail},'%') + + + and `press_end_date` = #{pressEndDate} + + + + and `press_current_num` = #{pressCurrentNum} + + + + and `press_current_value` = #{pressCurrentValue} + + and id in @@ -123,10 +140,10 @@ AND type = #{type,jdbcType=TINYINT} - AND create_date > #{startDate,jdbcType=TIMESTAMP} + AND `create_date` > #{startDate,jdbcType=TIMESTAMP} - AND create_date < #{endDate,jdbcType=TIMESTAMP} + AND `create_date` < #{endDate,jdbcType=TIMESTAMP} @@ -139,10 +156,10 @@ AND type = #{type,jdbcType=TINYINT} - AND create_date > #{startDate,jdbcType=TIMESTAMP} + AND `create_date` > #{startDate,jdbcType=TIMESTAMP} - AND press_end_date < #{endDate,jdbcType=TIMESTAMP} + AND `press_end_date` < #{endDate,jdbcType=TIMESTAMP} @@ -202,7 +219,7 @@ from wx_coupon c,wx_order o left join wx_coupon_order co on co.order_id = o.id left join wx_coupon_action_log cal on cal.coupon_order_id = co.id - where o.product_id = c.id + where o.product_id = c.id and c.type != 7 and c.type != 8 and o.c_user_id = #{cUserId}