Merge branch 'develop'

master
james.zhao 6 years ago
commit 39874142d9

@ -82,6 +82,5 @@ public interface OrderMapper {
JSONObject findOrderById(@Param("order_id") String orderId); JSONObject findOrderById(@Param("order_id") String orderId);
@AutoSql(type = SqlType.SELECT)
List<JSONObject> listHalloweenActOrder(JSONObject param); List<JSONObject> listHalloweenActOrder(JSONObject param);
} }

@ -738,5 +738,24 @@
<if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if> <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
</where> </where>
</select> </select>
<select id="listHalloweenActOrder" resultType="com.alibaba.fastjson.JSONObject">
<![CDATA[
SELECT
o.order_id order_id,
o.currency,
o.channel,
o.customer_id
format(t.clearing_amount,2) clearing_amount
FROM pmt_orders o
LEFT JOIN pmt_transactions t
ON t.order_id = o.order_id
AND t.refund_id IS NULL
AND t.transaction_type = 'Credit'
AND t.channel != 'System'
and o.transaction_date = #{transaction_date}
and o.status = #{status}
and o.customer_id = #{customer_id}
and t.clearing_amount >= 1.99
]]>
</select>
</mapper> </mapper>
Loading…
Cancel
Save