From 53d001a965363260868576e9b2bac8cc76a19ebd Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 10 Apr 2018 18:43:27 +0800 Subject: [PATCH] update --- src/document/cn/apis.js | 7 ++++++- .../payment/manage/mappers/payment/TransactionMapper.xml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index e22f950a1..75071a8f7 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -345,7 +345,12 @@ * @apiSuccess {String} create_time 订单创建时间（最新订单为准）（yyyy-MM-dd HH:mm:ss，GMT+10） * @apiSuccess {String} currency 币种，通常为AUD * @apiSuccess {String} channel 支付渠道 Alipay|支付宝、Wechat|微信、Bestpay|翼支付 - * @apiSuccess {Json} customer_info 仅支付宝返回该参数，其他渠道为空对象 + * @apiSuccess {Json} customer_info + * + * 仅支付宝返回该参数，其他渠道为空对象 * * @apiUse GlobalError * @apiError (ERROR_CODE) ORDER_NOT_EXIST 订单不存在 diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index a6a230c28..b672d6c17 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -498,7 +498,7 @@ FROM pmt_transactions t INNER JOIN pmt_orders o ON o.order_id = t.order_id INNER JOIN sys_clients c ON c.client_id = o.client_id AND c.org_id = 1 - WHERE year(o.create_time) = #{year} AND month(o.create_time) = #{month} AND + WHERE year(o.create_time) = #{year} AND month(o.create_time) = #{month} AND( t.transaction_type = 'Credit' OR t.refund_id IS NOT NULL