From bb1e1382c76db2919db19b8eb7368d8b9af97054 Mon Sep 17 00:00:00 2001 From: Todking Date: Fri, 17 Sep 2021 19:25:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20aps=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partner/templates/partner_payment_info.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index 13627efc0..d9dbc9338 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -250,13 +250,13 @@ ng-change="toggleChannel('rpaypmt_dd')"> -
- -
- -
-
+ + + + + + +
@@ -556,7 +556,7 @@
-
From d8dfdac77d3421c065dff1b3b6e16f7cbb4bac92 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Sat, 18 Sep 2021 11:17:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?alipay=5Faps=20=E5=9B=BE=E6=A0=87=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/ChannelsAnalysisServiceImpl.java | 2 +- .../manage/mappers/payment/OrderMapper.xml | 6 ++++-- .../analysis/templates/trans_analysis.html | 2 +- src/main/ui/static/images/alipay_aps.jpg | Bin 0 -> 1125 bytes .../partner/templates/partner_pay_logs.html | 2 ++ .../tradelog/templates/balance_report.html | 2 ++ .../templates/incremental_trade_logs.html | 2 ++ .../partner_incremental_trade_logs.html | 2 ++ .../tradelog/templates/partner_trade_logs.html | 3 +++ .../payment/tradelog/templates/trade_logs.html | 3 +++ 10 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 src/main/ui/static/images/alipay_aps.jpg diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java index 830e1aa01..fc527e582 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java @@ -81,7 +81,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService { @Override public void exportData(JSONObject params, HttpServletResponse resp) { - params.put("channels", new String []{"Alipay", "AlipayOnline"}); + params.put("channels", new String []{"Alipay", "AlipayOnline","AlipayAps"}); String[] title = {"Channel", "Total Amount(AUD)", "Total orders", "Transaction Partners", "Enable Partners"}; JSONObject count = customerAndOrdersStatisticsMapper.countChannel(params); int enablePartners = customerAndOrdersStatisticsMapper.countEnableAlipay(params); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index e0f911fc8..46631b45b 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -18,6 +18,7 @@ o.client_order_id, o.gateway, o.channel, + o.pay_type, o.pre_authorization, p.client_moniker, p.short_name, @@ -48,6 +49,7 @@ o.confirm_time pay_time, o.pre_authorization, o.source, + o.pay_type, CASE o.status WHEN 0 THEN 'SUBMITTING' @@ -159,7 +161,7 @@ select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount, oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency, oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail, - oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source + oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type from pmt_orders oo @@ -301,7 +303,7 @@ select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount, oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency, oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail, - oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source + oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type from pmt_orders oo diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 91cc2190d..747ae56ea 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -293,7 +293,7 @@
-
Alipay+
+
Alipay+

diff --git a/src/main/ui/static/images/alipay_aps.jpg b/src/main/ui/static/images/alipay_aps.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e050cf9594eda7d50339c61960dad95b01c0e241 GIT binary patch literal 1125 zcmV-r1e*JaP)rB;*&bq;y0!m+jBIU|tWDP} z4Leeuku4QVI`uKw8&bM3RWvgTiNuIxbk?1@yu9bcYNU$S_eoE&efGWk?(W^Y*9JvV zz+=LbN5$3?egyD@U56*^Iy_<5;R(AAPuO*M!mh&;b{+R79P}XkpM13PC!QpZ#sIKO zw@PJsU&!$Kv=n4{5cHq}02cr-DhB2CgCghwl3Ads#Q>%zTb3f6#8CnOhXBx~u_=i# z=v7X7XzXA-Y&JaA?sbCuNgRbL%Z=V@XVLWbRk!=%=hf}Et50)$m$O4vG|T$3ZCwnB#zMF zJG!5dGk~7|;`cOpUwqFbJL0{2qavKd(GhuOL56QaxDL1^Zb-f(baI3)H93+^g+9(U zj{4<>(XEAyFcTZAET0Ku-cV{b#h%J?jM7*7u1$K7*h`h=INyoTxvR1~C5KCU4(YdY zMlgXen1GT)w=L*_(ngsvCc;Ylm0sQ$A{tT;JFcI^(cF@zOl+Ta1;j#S`B*wf6jmM} zvIh)uB;6_ri*!a@Byoi0{n+4)Z2%qco{Z~?OwtL1$N>2aii1+e$Y9F{0Qh6E5&5+^ z!s`efQnhRZ`i9pcrz$%(RarjNq5`xd+-UC(^?8efQtw+apcugCVgS#`ky6HE%G(kX zKGPZvCDNr)S|@QdB)$8>Xi4rgiKC8?w}os-4GrRkYRU>I(iN(;{H~O(I0^BD_CEIH zSd+{9rfGdlWESj5ik?ixDOKwdB8$c%BaDVyps(o_Z1ul~T1M>QnlUvkw8zeEk)vvU z$9gv1j)DnPWQqd_Oz-HO*498q8ap&w=O(~W9W~s0M^q54*f!y`u8(biDGhyz)dCAy zFe$&Y7Fhoeao16$v^=TUP9;=DcWa7Gtqx7T@($^*3LO= zaZ*DhQNi3I1BwRgSSb!DqbMh`!O<`mjN z+miTaXqK;Qb#eZbxER-PxwvWQMS_a}ui=@Y07>YF`9`4Z8j3!91vo#C8mG+2-YPhf za9s+PX~7O5LMEg%QA)+f)BwzCqF2f2B-N#7I?^>oOU}`khZf&>xDHR)b$G(A!xMHL rp0Mligk6Ux>^eMQ*Wn2}4FLEHqguKW^%eW400000NkvXXu0mjf#~Bcv literal 0 HcmV?d00001 diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html index ca7e331bb..595f5e863 100644 --- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html +++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html @@ -376,6 +376,8 @@ ng-if="trade.channel=='Alipay'" /> + + {{trade.order_id2}} diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html index cc5a23e51..447927324 100644 --- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html @@ -374,6 +374,8 @@ uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/> + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html index f191d3468..8973ecf50 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html @@ -349,6 +349,8 @@ + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index 7c3b74fc0..592c7b716 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -731,6 +731,9 @@ + {{trade.order_id}} +