From 27343d11b511ef47e073e126c24f6640364ab43f Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 14:38:05 +0800 Subject: [PATCH 01/76] fix rpay+ icon --- src/main/ui/static/analysis/clearing-log.js | 2 +- .../templates/manage_customers_orders.html | 2 +- .../analysis/templates/trans_analysis.html | 2 +- .../templates/trans_analysis_monthly.html | 2 +- .../transaction_amount_Analysis.html | 2 +- .../commons/services/clearingDetailService.js | 2 +- src/main/ui/static/config/bdprize/bdprize.js | 2 +- .../bdprize/templates/bd_prize_detail.html | 2 +- .../templates/bd_prize_month_report.html | 2 +- src/main/ui/static/images/rpayplus.png | Bin 1629 -> 2790 bytes .../partner/templates/partner_pay_logs.html | 2 +- .../tradelog/templates/balance_report.html | 2 +- .../templates/partner_trade_logs.html | 2 +- .../tradelog/templates/trade_logs.html | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index d77ea8380..5683116bd 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/rpayplus.png'; + return '/static/images/royalpay_sign.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html index 735431137..531eadff2 100644 --- a/src/main/ui/static/analysis/templates/manage_customers_orders.html +++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html @@ -92,7 +92,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';doAnalysis(1)">RPay +

diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 67db5f858..14d91b836 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -99,7 +99,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';doAnalysis(1)">RPay +

diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index 0cae44777..7c393b9d2 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -69,7 +69,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';doAnalysis(1)">RPay +

diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index f5fd6e838..6267766b8 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -33,7 +33,7 @@ HF Pay RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index 73de796be..c77d3fe80 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) { case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/rpayplus.png'; + return '/static/images/royalpay_sign.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index d79cf24c4..3c418044d 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/rpayplus.png'; + return '/static/images/royalpay_sign.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html index 1e418ed94..a97dd0384 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html @@ -135,7 +135,7 @@
- +
Transaction: ${{detail.RpayDetail.total_amount}}
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html index 377e1386d..213408c10 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html @@ -110,7 +110,7 @@
- +
BD Total Commission: ${{report.RpayReport.total_prize}}
diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png index 1350a89e2fe67c97088e46834a6a079290e67561..9b05b9b41440e9fce5252b6d740011e102333334 100644 GIT binary patch literal 2790 zcmaJ@c|4SB8y;lePBX?*I=#jknZ*z@5wjrGhzTR93|>f>)m7H0Kp+rx zx2vjaiEjY$s$sUST#ntKrn32x&H6 za0s4CcKMP^8aW`s1Og5og^G%bLPlYcY+fh|gTvuaXe*SJm8BG6$&Y3U=t4^t-|(vf z8RQ4?7#snE%>q^w>4EG>fdfKX=|5Lsa=yv3_+Q#2Z5T>O=b$i1^vadK0x6XL4`njH zq4@$T_;0=cQ<(1+%>hwVkk5|f1xW`NVz`ougD3Gox`55|VzUo??V?8*TfpXru{i*V z1ej6iK@8SPyx}u}LczPS_yRgB2y`PmAfysV1|t}cb+IL&aaaP;nn=Q6obBwaY|wTj z7c$yr6NZE(6TWiE?4U>{$P#?z2LHz+qP{tw19q1sQ@?X@Zh@j#9QG zkf)U7L?$?`^7105auipMnbZ8tx(*Q=u|?By!yCb81+Q3*WiO0TwT(+5l7gF22b{Un zo}3cb^gB>Z1j|+bsN#0{HrI4pSi<&v_+*w+sS`~6d)sr5*bdi4<+uKU3!fZyK@ExF zmVNhALNgGBQ^K=HPRqunN5M=>BvhLCP^XPk(#N)&BcsK-V#oXm2l-}`Dp>ZN?QW~L z8^oSF`2p!6?kP$o5yxXc#D^4>Ia(MW%h{0tjrwgOeVgiJ!pu?ojtSd!3GIZozTRp# z$f^BGzMIHY*{trw2QKsd-3zC*mG=s0H>*hyU6Q1J>auAgm$##;ZX``6+QwBG)ex2V zb`YW)7elOL%Nw=z=;3L;tD@gP$C?dmmho!QGuNOlbvt@}G{oyp#jR_9e!OK-*bu|6 z9$FRgbj@L(hxdLg=u|l?vb0w|mILkB^_M|IWFjt9B{Q?cDR60|LGnf;^GDe^7G`of zs`X>I=w>%DvH>XF1r{}yWie>F0($sj9N-6(hdb&l!l!MXOHe7VZo z&>`y!ZCb=aJJsj)IzKd7z}nBM(MIKZsx>k(uMQ7gg1)?H3!wJNS7q0DdJe$!{kZQF z72aJmt9{ojh5}o%?R<(X)yvxR<+O?qt3REUziLoh)#7g__wuy2h0dhJxoBhPPJz5{hhD{OMp`DovtW zn0B76-D(^1>*eN=F?QdzMZ!JPR^0Dx$$!BIYYATC^<63UJZSrb9{OD7aozK4Uo8d1 zTd(W0ehp>4Y#nOaX>cN}A0oc=27lp?V8W+ZpVTb-7?rS-T3xCyaH$XExVk2D-fFJX zdo&+cto=JAblj+a;dpq*4S`|pQs;RS_0F8lo9_RHm6c%mNb`$77QkA zswIws?#RjdJ;3pTzW(77c%~=mac>W-XMd6d&zyYXVAj=X$c3ZZZZa2!3U^K?HrvgGtZb^1V5N`b|q{(YsAVcf0lDOLo_DiZl2(&>@voS=nMpnQxX0r z7vaC`H#H^-CY2&usoOe^yvg3?oSo;D-0f}6JnIW@1a66bgQ(sryXm|uYGQgoHF`FG zOOQMPlqiVg-*1z=Ecz2Zf=)l)6X^t}koWJ1$lcL92DQn}h@dw=c|HBGuqqK2S zix%X^3@*oqKd-UX&2}w8%hzCS%_okyGtH4{HVS80w@~{Phxg2R=Ty|YU0XO4F7mW( z;HoyypJ?%^wTwKa{Ql6qho*Z{w{xCpC#-E?cq*kS+;HqIHYQ|bK{q+VN9Mw_fMiOn zDjoO7#qQm*UHKIu150;+Wn8(*X8G&y1K(v5oZTN@f6RO0uXG7s;9bgoEh@VkwmFuX z)?d2$V{HQ_{1NE>qw4b)*)>m=m4;KIfE<{dNu^?uT<3`juE)@mq>se@X9zKYmU8`tigMRK2`Rt zRI&T>eAAR|hlApvv0kpm-~&yX47hYrg|ug&ff}>>DL)XK7jVNT3LgCKho-do<*m>) zdqd^p%Q+^JEwC7ETec?^roPVQE1>)mA824wAuQ= zWD)#LsJWjAEy=wcKCd^4I{;J}HfIfF7`8bqsc__SkBW{6o4D${%?zme zbdz|rYx#u7=~u?$URItE#psCRS literal 1629 zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX

aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs) z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg( z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@ z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<# zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq zU_3vJh>Q^mVik5E+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm zTOY=rxPh1y zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy| 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 dd8618334..0939919a9 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 @@ -87,7 +87,7 @@ HFpay | RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 2ab2afc98..7d5d17fe9 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -97,7 +97,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

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 b63e52165..efb867200 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 @@ -97,7 +97,7 @@ HF Pay RPay+ + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+

diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 4a1d0ab54..13496d1a2 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -135,7 +135,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

From f6ebe3f6ad7d07c5354eb56ee6b83bce9b6b3bbc Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 14:49:37 +0800 Subject: [PATCH 02/76] fix rpay+ icon --- src/main/ui/static/analysis/clearing-log.js | 2 +- .../analysis/templates/customer_analysis.html | 2 +- .../templates/settlement_transactions.html | 2 +- .../commons/services/clearingDetailService.js | 2 +- .../static/commons/templates/order_detail.html | 2 +- src/main/ui/static/config/bdprize/bdprize.js | 2 +- .../bdprize/templates/bd_prize_detail.html | 4 ++-- .../bdprize/templates/bd_prize_month_report.html | 2 +- src/main/ui/static/images/rpayplus_sign.png | Bin 0 -> 1629 bytes .../{rpayplus.png => rpayplus_sign_lg.png} | Bin .../invoice/templates/invoice_assistant.html | 2 +- .../static/payment/custom/templates/custom.html | 2 +- .../payment/invoice/templates/invoice.html | 2 +- .../partner/templates/partner_pay_logs.html | 2 +- .../tradelog/templates/balance_report.html | 2 +- .../templates/partner_settlement_dialog.html | 4 ++-- .../tradelog/templates/partner_trade_logs.html | 2 +- .../payment/tradelog/templates/trade_logs.html | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/main/ui/static/images/rpayplus_sign.png rename src/main/ui/static/images/{rpayplus.png => rpayplus_sign_lg.png} (100%) diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 5683116bd..e610c6ee9 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html index d28281419..db731d054 100644 --- a/src/main/ui/static/analysis/templates/customer_analysis.html +++ b/src/main/ui/static/analysis/templates/customer_analysis.html @@ -179,7 +179,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> - {{order.order_id}} diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html index 247848535..7f19fc00e 100644 --- a/src/main/ui/static/analysis/templates/settlement_transactions.html +++ b/src/main/ui/static/analysis/templates/settlement_transactions.html @@ -50,7 +50,7 @@
  • - +
    • diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index c77d3fe80..fc23d7390 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) { case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 3184f16b2..3c63f639c 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -45,7 +45,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> - {{order.order_id}} diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index 3c418044d..6b5fa2f4c 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html index a97dd0384..5c49583b6 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html @@ -135,7 +135,7 @@
    - +
    Transaction: ${{detail.RpayDetail.total_amount}}
    @@ -187,7 +187,7 @@ - + diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html index 213408c10..4d314367a 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html @@ -110,7 +110,7 @@
    - +
    BD Total Commission: ${{report.RpayReport.total_prize}}
    diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png new file mode 100644 index 0000000000000000000000000000000000000000..1350a89e2fe67c97088e46834a6a079290e67561 GIT binary patch literal 1629 zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX

    aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs) z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg( z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@ z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<# zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq zU_3vJh>Q^mVik5E+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm zTOY=rxPh1y zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy| literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus_sign_lg.png similarity index 100% rename from src/main/ui/static/images/rpayplus.png rename to src/main/ui/static/images/rpayplus_sign_lg.png diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index a477b413a..d00a3a693 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -206,7 +206,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id2}} diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html index c4b3299e2..c3e911d21 100644 --- a/src/main/ui/static/payment/custom/templates/custom.html +++ b/src/main/ui/static/payment/custom/templates/custom.html @@ -101,7 +101,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> - {{order.order_id}} diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 6a49339c8..a26005322 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -200,7 +200,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id2}} 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 0939919a9..fc92231f4 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 @@ -187,7 +187,7 @@ - + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 7d5d17fe9..412309d68 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -296,7 +296,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id2}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index 1d1f07f0e..527e66e50 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -7,7 +7,7 @@

    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 efb867200..4d1b06b1a 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 @@ -324,7 +324,7 @@ AlipayOnline - + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 13496d1a2..38cc5ba87 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -353,7 +353,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id}} From ffa22ee1928683db53de7cf8d6fc91fbaa9f9387 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 14:52:57 +0800 Subject: [PATCH 03/76] fix rpay+ icon --- src/main/ui/static/images/rpayplus_sign.png | Bin 1629 -> 1566 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png index 1350a89e2fe67c97088e46834a6a079290e67561..4c53e791cabe78375d5c7ea86cf24082ca632a77 100644 GIT binary patch literal 1566 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#md;t+|j_&*vQGm$=T4*)xyHa)WE{o&Begf z%+T4`#Sy00B|o_|H#M&WrZ)wl*BGZ>P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>UbP z7@Hcp8UoF8!tNG`-V`iuf$9bM1G`>*pkwqwF^d$_Fd<;_0Wsm}7RZ68{M0;PaxVg= z>nmB2!VC;d6FprVLn?0N1jl-a1d9B7cW0(-*;)H*|F>*#Fce}oJvgCm!FCU2C80N- zRXmsEx|BMW$Z<6vnODWJ_{GBZe+%U&u2^#D)xqgZyu7B@L(8MX%gf5s^3vaJdmJVA zqs{pFyy|m1pIf(|HQU;_q`hFygmxc6rUah#Q;GU*iR{iR zPak4C{i$)fSmR2qHy846cwfwk3#)0{W4V|s%;V!S{n?N07lutce0!Jtt7k>WB|jca zl*qR`#c-=n>c!cw9pCsH!l$S@F!D6bxLX?GGu5Ok;WlUDIkuzwh4x+0US@8}U96_? zfBLVy?wM|Ebcv@E>l@<6Si9suM`!nb4$$}*}8M{{f z_IQ4znuXop*n9w_^_D@sl&_*H&>0DKGAb z+36_~b~!~g$l2{Tqgr?PoY);+r!tpiZfN2bn5gmKV#+a-rAFD8SQdZ(>}2n9>8+#u y@7?FFbGo0jJRSS+jA>a;_S@4f>@Ab)StJ-vbxX7v@mW3umDrxHelF{r5}E)lY+L{U literal 1629 zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX

    aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs) z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg( z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@ z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<# zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq zU_3vJh>Q^mVik5E+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm zTOY=rxPh1y zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy| From 661df49a2c451601b8f03596828cada1ed15ed88 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 15:08:38 +0800 Subject: [PATCH 04/76] fix rpay+ icon --- .../ui/static/analysis/templates/manage_customers_orders.html | 2 +- src/main/ui/static/analysis/templates/trans_analysis.html | 2 +- .../ui/static/analysis/templates/trans_analysis_monthly.html | 2 +- .../static/analysis/templates/transaction_amount_Analysis.html | 2 +- .../ui/static/payment/partner/templates/partner_pay_logs.html | 2 +- .../ui/static/payment/tradelog/templates/balance_report.html | 2 +- .../static/payment/tradelog/templates/partner_trade_logs.html | 2 +- src/main/ui/static/payment/tradelog/templates/trade_logs.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html index 531eadff2..bb65421f4 100644 --- a/src/main/ui/static/analysis/templates/manage_customers_orders.html +++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html @@ -91,7 +91,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay | HF Pay | - RPay +

    diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 14d91b836..4918d98d9 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -98,7 +98,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay | HF Pay | - RPay +

    diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index 7c393b9d2..7896d249a 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -68,7 +68,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay | HF Pay | - RPay +

    diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index 6267766b8..5f4be2c4e 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -32,7 +32,7 @@ ng-click="params.channel='jd';loadTradeLogs()">JD Pay | HF Pay - RPay +

    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 fc92231f4..ea3913570 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 @@ -86,7 +86,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JDpay | HFpay | - RPay +

    diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 412309d68..915719219 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -96,7 +96,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay | - RPay +

    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 4d1b06b1a..41ea8d8a6 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 @@ -96,7 +96,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay - RPay+

    diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 38cc5ba87..e17a89559 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -134,7 +134,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay | - RPay +

    From 43729baff0e231fb1da6b7b3c2f7f34384182273 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 21 Sep 2018 13:39:57 +0800 Subject: [PATCH 05/76] fix rpay+ payment.css --- src/main/ui/static/templates/payment/v1/payment.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/templates/payment/v1/payment.css b/src/main/ui/static/templates/payment/v1/payment.css index 5c535ec04..73c482eed 100644 --- a/src/main/ui/static/templates/payment/v1/payment.css +++ b/src/main/ui/static/templates/payment/v1/payment.css @@ -366,7 +366,7 @@ input.value:focus { background-color: #108ee9; } -.button_sp_area.alipay .paynow { +.button_sp_area.rpay .paynow { background-color: #FF2D55; } From db7f25ec816cf215f9f35d8014ff51a14e1d8465 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Sun, 23 Sep 2018 22:46:10 +0800 Subject: [PATCH 06/76] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/CustomerPointsServiceImp.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java index 3cd2e8dad..750b48835 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java @@ -23,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; @@ -284,7 +286,18 @@ public class CustomerPointsServiceImp implements CustomerPointsService { public BigDecimal checkLotteryAfterPay(String order_id) { JSONObject order = transactionAnalysisMapper.getOrderClearAmount(order_id); if (order.getIntValue("client_id") != 9) { - return BigDecimal.valueOf(0); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + Date newDay = new Date(); + try { + if (newDay.compareTo(sdf.parse("2018-09-24 00:00:00")) < 0) { + return BigDecimal.valueOf(0); + } + if (newDay.compareTo(sdf.parse("2018-10-15 00:00:00")) > 0) { + return BigDecimal.valueOf(0); + } + } catch (ParseException e) { + + } } return order.getBigDecimal("clearing_amount"); } From f19f84f735023f4e855f05322fe790867cef48c4 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 11:08:11 +0800 Subject: [PATCH 07/76] fix wx_settlements orderby desc --- .../ui/static/config/devtools/templates/wx_settlements.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html index 368c87bf2..dacfa0a9b 100644 --- a/src/main/ui/static/config/devtools/templates/wx_settlements.html +++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html @@ -53,7 +53,7 @@ - + From 188a5adf16e850cb04d71667bd3969ebc0d25c7b Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 11:26:46 +0800 Subject: [PATCH 08/76] add client_partner_detail googleMap --- src/main/ui/static/payment/partner/partner.js | 7 +++++++ .../partner/templates/client_partner_detail.html | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index 275b1190e..e4cdb0451 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -70,6 +70,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct $scope.partner = partner.data; $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo'; + $scope.getMerchantLocation = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { + $scope.merchant_location = resp.data; + }); + }; + $scope.getMerchantLocation(); + $scope.uploadLogo = function (file) { if (file != null) { if (file.size > 1 * 1024 * 1024) { diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 9c8ebcfa4..44ee74b66 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -303,6 +303,19 @@ + +
    +
    Location + + +
    +
    +
    + +
    +
    +
    From 1685078ae6cfa1ac78a4b26c9adba31954ed0ff5 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 12:23:16 +0800 Subject: [PATCH 09/76] fix trade.order_detail||trade.remark --- src/main/ui/static/invoice/templates/invoice_assistant.html | 2 +- src/main/ui/static/payment/invoice/templates/invoice.html | 2 +- .../ui/static/payment/tradelog/templates/balance_report.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index d00a3a693..40315fcc0 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -239,7 +239,7 @@ -

    - + diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 90816babf..c045936f1 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -233,7 +233,7 @@ -

    - + diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 915719219..c6acfce95 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -345,7 +345,7 @@ -

    - + From 6810f1d53af504ba86026437dda3d018ecf2735b Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 14:02:42 +0800 Subject: [PATCH 10/76] fix rpay - remark_alter --- src/main/ui/static/templates/rpay/v1/payment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js index 7cbd9ff0a..2162eae11 100644 --- a/src/main/ui/static/templates/rpay/v1/payment.js +++ b/src/main/ui/static/templates/rpay/v1/payment.js @@ -215,7 +215,7 @@ $(function () { showWeuiDialog(config); }); - $('#key_P').click(function () { +/* $('#key_P').click(function () { if (window.requireRemark) { if (!dataCache.remark) { var config = { @@ -226,7 +226,7 @@ $(function () { } } - }); + });*/ $('#key_P').bind('touchstart', function () { if (window.requireRemark) { From 80049f966e927f0d241563cdb04b8e48dc6a9666 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 14:11:30 +0800 Subject: [PATCH 11/76] fix rpay - remark_alter --- src/main/ui/static/templates/rpay/v1/payment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js index 2162eae11..a63f252b7 100644 --- a/src/main/ui/static/templates/rpay/v1/payment.js +++ b/src/main/ui/static/templates/rpay/v1/payment.js @@ -215,18 +215,18 @@ $(function () { showWeuiDialog(config); }); -/* $('#key_P').click(function () { + $('#key_P').click(function () { if (window.requireRemark) { if (!dataCache.remark) { var config = { - title: '请先输入备注', + title: 'Please enter the remarks first', template: '' }; showWeuiDialog(config); } } - });*/ + }); $('#key_P').bind('touchstart', function () { if (window.requireRemark) { From 93719ed3196d8cd1c84d8f7bf99ce3030dc1642c Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 14:12:48 +0800 Subject: [PATCH 12/76] add select_nap --- .../impls/CustomersAnalysisServiceImp.java | 1 + .../analysis/mappers/OrderAnalysisMapper.xml | 14 ++++++++++- .../ui/static/analysis/customer_analysis.js | 1 + .../analysis/templates/customer_analysis.html | 22 ++++++++++++++++++ src/main/ui/static/images/nap.png | Bin 0 -> 1203 bytes .../ui/static/images/royalpay_sign_ln.png | Bin 0 -> 1504 bytes 6 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/main/ui/static/images/nap.png create mode 100644 src/main/ui/static/images/royalpay_sign_ln.png diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java index 62d967da8..88e26c0d1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java @@ -78,6 +78,7 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService { PageList logs = orderAnalysisMapper.listCustomersData(params, new PageBounds(page, limit, Order.formString("amount.desc"))); JSONObject result = PageListUtils.buildPageListResult(logs); result.put("analysis", orderAnalysisMapper.listCustomersDataAnalysis(params)); + result.put("openid_type", params.getIntValue("openid_type")); return result; } diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml index d8c12acdc..81cee3fb0 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml @@ -197,10 +197,16 @@
    @@ -99,6 +100,7 @@ + @@ -110,6 +112,26 @@ + + + + diff --git a/src/main/ui/static/images/nap.png b/src/main/ui/static/images/nap.png new file mode 100644 index 0000000000000000000000000000000000000000..613b393fa21a6c7df6e338b0de8999da031822b1 GIT binary patch literal 1203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Be*m%*4>p)xy!#+1$d!$=T7_ z#n8yq$pxm@B|o_|H#M&WrZ)wl*A=H;P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w>aT6 z52`l>w_BWX>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0nT)Zrjfq_xY)5S5Q z;#Shb=pXmH8XFVU1Wp@IV3T7iv{Js%Anwp+!Cd)3Rd|9xvVwd^BhL?~M#lIV5*n-r z41Ro(=eTD7_;TI(Pxl+93E~a24l+y;vS<8zoIB{tLv@u82O3YbeNgw{Il{iu zQH;Ime1g6LX9KU}vc#O6M;jcTEL4#E*uYca+Q_)xA&z5_iZwHf1cPjHdv)7Kb4O4y N;_2$=vd$@?2>=tDlC}T< literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/royalpay_sign_ln.png b/src/main/ui/static/images/royalpay_sign_ln.png new file mode 100644 index 0000000000000000000000000000000000000000..72178aee3c77710dc4c5818afa021185dbbeaeeb GIT binary patch literal 1504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Cp)xy!#+1$d!$=T7_ z#n8yq$pxm@B|o_|H#M&WrZ)wl*Ab^)P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;x0vHJ z52`l>w_7Z5>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4D~s|F8v^ru;@JFZtFF2;5+aXRA9RXx+%VyWptO7-_kRcTH91?PJ6#U#6O4_Vcw<6I zBd?g4opR>oNtrHEhNo6&N?tX*t;tmuv4*)Tn-(Pg=Gt)V{mN_U%XJ%XXI0d*YacxM`O>o3NgsKZ z+FyE6`|@b8=DB+56)xHfRW$_et+V_+dkWuokGS&Z(WM8{PbSyTyb`seNwDeq!h($|waPp8 z8nXV5*xV9%bpE9p!3E10p6yebDRi>W(8=J+`KY@`*jSgH+<4n2xVoT}rJ_A6k;EHO{8YVNX2EtgXIei%>`jd*v}}iHkb}`L>1G_X{2Q z^VQ^;RJirMBimM-EB27xr=5F4v)A^>mdrcf50;(r-_>!(`k7OB!jWBRTp7zM@7qL| z7f1byPq?bBb91X+(2NJWAI;J(Is4?+%?szIwK#>We!nm3y5xK3gXYoMS9}7k|BEIt Yr2aef|A=YAKTw(L>FVdQ&MBb@0JpV7ivR!s literal 0 HcmV?d00001 From 4f4306ba33d5a72f595170e6362192ad8c037552 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 14:31:48 +0800 Subject: [PATCH 13/76] fix select_nap --- .../payment/manage/analysis/mappers/OrderAnalysisMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml index 81cee3fb0..6c3265277 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml @@ -204,7 +204,7 @@ LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id - + LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id From 815603d853f375a1c0409913719ccedce8412429 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Wed, 26 Sep 2018 17:37:27 +0800 Subject: [PATCH 14/76] pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cfb6e206d..adaacec07 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0-dev + 0.2.0 4.0.0 From 9fe7652c2593f21694378b0014548d911923dd21 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 28 Sep 2018 10:42:56 +0800 Subject: [PATCH 15/76] fix Rpay-merchant --- .../merchants/core/impls/ClientManagerImpl.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 244c5f03d..0bf26977a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -792,18 +792,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid logger.error("记录log_client_sub_merchant_id失败", e); } clientMapper.update(update); - List children = clientMapper.listChildClients(clientId); - for (JSONObject child : children) { - if (Objects.equals(child.getString("rpay_enterprise_id"), originSubMerchantId)) { - update.put("client_id", child.getIntValue("client_id")); - try { - recordSubMerchantLog(child, rpaySubMerchantInfo, manager); - } catch (Exception e) { - logger.error("记录log_client_sub_merchant_id失败", e); - } - clientMapper.update(update); - } - } clientInfoCacheSupport.clearClientCache(clientId); } From dda02d8e317daa758e7d8d794b1a405855ef1845 Mon Sep 17 00:00:00 2001 From: luoyang Date: Sat, 29 Sep 2018 16:52:01 +0800 Subject: [PATCH 16/76] fix rate_warning --- .../manage/management/clearing/core/impl/CleanServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index c99cf7636..5c3cbaea3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -618,7 +618,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider Date expiryTime = client.getDate("expiry_time"); client.put("generatable", expiryTime != null); if (expiryTime != null) { - client.put("expiry_time", expiryTime.getTime()); + client.put("expiry_time", DateFormatUtils.format(client.getDate("expiry_time"), "dd/MM/yyyy")); } } warnings.put("no_rate", rateInDanger); From d6fd5b06003b3706d7f6f3b3ef472b41def9919a Mon Sep 17 00:00:00 2001 From: luoyang Date: Sun, 30 Sep 2018 11:30:57 +0800 Subject: [PATCH 17/76] fix rpay+ merchant --- .../manage/mappers/system/SysRpayMerchantApplyMapper.java | 2 +- .../manage/merchants/core/impls/ClientManagerImpl.java | 7 +++++-- .../payment/partner/templates/sub_merchant_id_apply.html | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java index 898ac3661..23620f712 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java @@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper { void insertRpayMerchantApply(JSONObject params); @AutoSql(type = SqlType.SELECT) - List listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName); + List listByShortName(@Param("merchant_shortname") String shortName); } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 0bf26977a..e18ded9b0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3605,10 +3605,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } checkOrgPermission(manager, client); - List listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname")); + List listByshortName = sysRpayMerchantApplyMapper.listByShortName(merchantInfo.getString("company_shortname")); if (listByshortName.size()>0) { - throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）"); + throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（Short Name 已被使用）"); + } + if (client.getString("rpay_enterprise_id") != null) { + throw new BadRequestException("您已申请成功子商务号，请勿重复申请"); } SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class); diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html index 66ebd8403..8deec83d1 100644 --- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html +++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html @@ -99,7 +99,7 @@ Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}} - -
    +
    -
    +
    diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html index 4ddeb6c0c..99637583e 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_functions.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_functions.html @@ -12,7 +12,7 @@
    -
    +
    Functions With No Modules
    diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 6309be78b..f5688bc29 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -76,7 +76,7 @@
    - 商户统计(原统计) + 商户统计
    @@ -86,7 +86,7 @@
    - 商户活跃度(原统计) + 商户活跃度
    @@ -96,7 +96,7 @@
    - 商户交易额(原统计) + 商户交易额
    @@ -123,15 +123,55 @@
    - +
    - 原统计 + 交易数据
    +
    + +
    + +
    + Gateway统计 +
    +
    +     +
    +
    + +
    + +
    + 退款统计 +
    +
    +     +
    +
    + +
    + +
    + 支付通道 +
    +
    +     +
    +
    + +
    + +
    + 交易金额分析 +
    +
    +     +
    From 992b9cec0938c87d6bcf848471a645ac1e030143 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 30 Oct 2018 11:44:02 +0800 Subject: [PATCH 29/76] add clearManager --- .../payment/manage/signin/core/SignInAccountService.java | 2 ++ .../manage/signin/core/impls/ManagerAccountServiceImpl.java | 4 ++++ .../manage/signin/core/impls/SignInAccountServiceImpl.java | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java index 0cdaa4683..e9b82b21e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/SignInAccountService.java @@ -11,6 +11,8 @@ public interface SignInAccountService { JSONObject getManager(String accountId); + void clearManager(String accountId); + JSONObject getClient(String accountId); void clearAccountCache(String accountId); diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java index d99faacd6..078087413 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/ManagerAccountServiceImpl.java @@ -6,6 +6,7 @@ import au.com.royalpay.payment.manage.mappers.system.OrgMapper; import au.com.royalpay.payment.manage.organizations.core.OrgManager; import au.com.royalpay.payment.manage.signin.beans.ManagerInfo; import au.com.royalpay.payment.manage.signin.core.ManagerAccountsService; +import au.com.royalpay.payment.manage.signin.core.SignInAccountService; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; @@ -37,6 +38,8 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService { @Resource private OrgManager orgManager; + @Resource + private SignInAccountService signInAccountService; @Override public PageList listManagers(JSONObject loginManager,JSONObject params) { @@ -105,6 +108,7 @@ public class ManagerAccountServiceImpl implements ManagerAccountsService { } obj.put("manager_id", userId); managerMapper.update(obj); + signInAccountService.clearManager(userId); } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java index fd785877d..5b790db1c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java @@ -129,6 +129,12 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati return manager; } + @Override + @CacheEvict(value = ":login:managers:", key = "''+#accountId") + public void clearManager(String accountId) { + + } + @Override @Cacheable(value = ":login:clients:", key = "''+#accountId") public JSONObject getClient(String accountId) { From 355ad56d02f8d5a22ec7d9a709b741e6e9869c20 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 10:59:16 +0800 Subject: [PATCH 30/76] add bd_leader <- clearing modules --- src/main/ui/manage.html | 2 +- src/main/ui/static/menu/templates/main_menu.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index a9fa07fc1..ff8f7b9d8 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -465,7 +465,7 @@ margin-bottom: 10%;"/> -
  • +

  • 清算管理|Settlement diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index f5688bc29..02b597acb 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -741,7 +741,7 @@

    • -
    +
    From 630844a3c16d8f0ae44dbd9119a47e56b4cf7dbc Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 11:18:05 +0800 Subject: [PATCH 31/76] add bd_leader <- clearing modules --- src/main/ui/manage.html | 2 +- src/main/ui/static/menu/templates/main_menu.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index ff8f7b9d8..58b2a0e7b 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -489,7 +489,7 @@ margin-bottom: 10%;"/> -
  • +
  • 清算预估|Estimate diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 02b597acb..01360cbd5 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -786,7 +786,7 @@
    • -
    +
    From ffc9349ddfc16b0735fd5fb855c2d9b0b2849ccd Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 12:59:33 +0800 Subject: [PATCH 32/76] =?UTF-8?q?close=20bd=5Fleader=20<-=20=E6=B8=85?= =?UTF-8?q?=E7=AE=97=E6=97=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/manage.html | 2 +- src/main/ui/static/menu/templates/main_menu.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 58b2a0e7b..95aa4e3a0 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -478,7 +478,7 @@ margin-bottom: 10%;"/> 交易对账|Order Validation -
  • +
  • 清算日管理 diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 01360cbd5..99d4d7336 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -759,7 +759,7 @@
    • -
    +
    From 665a3f6f1a1942dc2fd415543492a35a40403b55 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 14:08:57 +0800 Subject: [PATCH 33/76] fix lastMonth --- src/main/ui/static/dashboard/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js index e67fa4e6b..add62a4e6 100644 --- a/src/main/ui/static/dashboard/dashboard.js +++ b/src/main/ui/static/dashboard/dashboard.js @@ -78,8 +78,8 @@ define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], functio var end = $filter('date')(date-oneDay, 'yyyyMMdd'); var date2 = new Date(); + date2.setDate(1); date2.setMonth(date2.getMonth() - 1); - date2 = date2.setDate(1); var begin = $filter('date')(date2, 'yyyyMMdd'); return { begin: begin, From fca560e90af7532917569b576e2c135832179bf8 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 15:44:22 +0800 Subject: [PATCH 34/76] add guest login --- src/main/ui/managev2.html | 30 +++++++++++++++++++ .../analysis/templates/settle_report.html | 2 +- src/main/ui/static/boot/managerMainApp.js | 3 ++ src/main/ui/static/boot/managerMainAppv2.js | 5 +++- .../templates/permission_config.html | 4 +++ src/main/ui/static/menu/managerMenu.js | 3 ++ .../ui/static/menu/templates/main_menu.html | 4 +-- 7 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html index e1f30a4f5..fae660339 100644 --- a/src/main/ui/managev2.html +++ b/src/main/ui/managev2.html @@ -200,6 +200,36 @@ margin-bottom: 10%;"/> +
  • + + + {{notifyCounts}} + + +
    • + +
  • diff --git a/src/main/ui/static/analysis/templates/settle_report.html b/src/main/ui/static/analysis/templates/settle_report.html index e6bbf9732..b335ae010 100644 --- a/src/main/ui/static/analysis/templates/settle_report.html +++ b/src/main/ui/static/analysis/templates/settle_report.html @@ -50,7 +50,7 @@
    • - + diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index 067b1b66e..f8dfbf4f4 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -229,6 +229,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case "compliance": rolenum = 2; break; + case "guest": + rolenum = 2048; + break; case "riskmanager": rolenum = 1024; break; diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js index 8260078ee..26f205b3f 100644 --- a/src/main/ui/static/boot/managerMainAppv2.js +++ b/src/main/ui/static/boot/managerMainAppv2.js @@ -34,7 +34,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo roleMenu.push({'value':'riskmanager','module':"风控中心"}); } if ((role & 2048) >0){ - roleMenu.push({'value':'guest','module':"guest"}); + roleMenu.push({'value':'guest','module':"访客中心"}); } if ((role & 8192) >0){ roleMenu.push({'value':'salesmanager','module':"销管中心"}); @@ -130,6 +130,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case "riskmanager": roleNow = "风控中心"; break; + case "guest": + roleNow = "访客中心"; + break; default: break; } diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html index b1a48b69f..45bd1090c 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html @@ -67,6 +67,10 @@ Developer + + + BD Leader + Risk Manager diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js index 2088b8b93..9cf84e966 100644 --- a/src/main/ui/static/menu/managerMenu.js +++ b/src/main/ui/static/menu/managerMenu.js @@ -41,6 +41,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { case "compliance": rolenum = 2; break; + case "guest": + rolenum = 2048; + break; case "riskmanager": rolenum = 1024; break; diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 99d4d7336..b9d32b25c 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -32,7 +32,7 @@ --> 返回 -
    +
    @@ -103,7 +103,7 @@
    -
    +
    From 303eccdff9271bb0a8b73ca806f526f9e910fbaf Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 31 Oct 2018 17:31:12 +0800 Subject: [PATCH 35/76] fix --- src/main/ui/manage.html | 4 +++- src/main/ui/managev2.html | 4 ++-- src/main/ui/static/boot/managerMainApp.js | 2 +- src/main/ui/static/boot/managerMainAppv2.js | 5 +++++ src/main/ui/static/menu/templates/main_menu.html | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 95aa4e3a0..a405f226e 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -324,7 +324,9 @@ margin-bottom: 10%;"/> -
  • +

  • 交易管理|Transaction diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html index fae660339..441cb87e8 100644 --- a/src/main/ui/managev2.html +++ b/src/main/ui/managev2.html @@ -140,7 +140,7 @@ margin-bottom: 10%;"/>

    • +
    +
    +
    diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index 32ac4246e..cf87f3394 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -43,6 +43,14 @@
    +
    + +
    +

    +
    +
    +
    @@ -53,10 +61,10 @@
    - -
    -

    + +

    +

    + {{riskEvent.order_ids}}

    @@ -227,8 +235,8 @@
    - + @@ -247,8 +255,8 @@ - + @@ -267,6 +275,7 @@
    Nick Name Customer openId Amount(AUD)
    + + + {{customer.nickname}} + + + + {{customer.nickname}} + + + + {{customer.nickname}} + + + + {{customer.nickname}} +
    清算日期 净交易额(扣除退款)腾讯清算总额清算总额 清算给商户总额 RoyalPay手续费
    PartnerOrder ID Platform Transaction IDOrder ID Order Description Customer ID IP
    {{trade.client.short_name}}({{trade.client.client_moniker}}){{trade.order_id}} {{trade.system_transaction_id}}{{trade.order_id}} {{trade.order_description}} {{trade.customer_id}} {{trade.customer_ip}}
    + @@ -275,24 +284,31 @@ + + +
    Platform Transaction ID Order ID Amount Input AmountStatus Create Time GatewayOperation
    {{trade.system_transaction_id}} {{trade.order_id}} {{trade.currency}} {{trade.total_amount}} {{trade.currency}} {{trade.display_amount}} AUD {{trade.clearing_amount}} - - + + - + + + +
    @@ -389,7 +405,7 @@ ng-if="riskEventEdit.order_type != 4" ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
    - +
    - {{riskEvent.result_type | resultType:resultSearchTypes}} + - + {{riskEvent.result_type | resultType:resultSearchTypes}} - + + {{riskEvent.email_status | emailStatus}} + - + From 0fe72800bd41981431eb7d589ffe207c2c131c5c Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Fri, 16 Nov 2018 17:56:58 +0800 Subject: [PATCH 45/76] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/RiskBusinessController.java | 25 +++++++++++++------ .../manage/mappers/payment/OrderMapper.xml | 2 +- .../templates/mail/risk_upload_mail.html | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java index b92252ec5..511c0220d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java @@ -9,18 +9,11 @@ import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; -import com.sun.org.apache.xerces.internal.impl.dv.xs.BooleanDV; -import com.sun.org.apache.xpath.internal.operations.Bool; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; /** @@ -56,6 +49,8 @@ public class RiskBusinessController { @PostMapping(value = "events") public void RegisterRiskEvent(@RequestBody JSONObject params, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + params.put("fillin_id", manager.getString("manager_id")); + params.put("fillin_person", manager.getString("display_name")); riskBusinessService.addRiskEvent(params, manager); } @@ -128,5 +123,21 @@ public class RiskBusinessController { JSONObject param = partnerQuery.toJsonParam(); return clientManager.getClientBySimpleQuery(param); } + + // 更新库中的orderIds + @GetMapping(value = "/complete/real_order_id") + public void completeEventRealOrderIds() { + riskBusinessService.completeEventRealOrderIds(); + } + + @GetMapping(value = "/delete/event") + public void deleteRiskEvent(@RequestParam("risk_id") String riskId) { + riskBusinessService.deleteRiskEvent(riskId); + } + + @GetMapping(value = "/update/event/is_send_client") + public JSONObject updateRiskEventIsSendClient(@RequestParam("risk_id") String riskId) { + return riskBusinessService.updateIsSendClient(riskId); + } } 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 5afcb370e..4c51f4555 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 @@ -813,7 +813,7 @@ AND t.refund_id IS NULL AND t.transaction_type = 'Credit' AND t.channel != 'System' - WHERE t.system_transaction_id = #{order_id} AND p.client_id = #{client_id} + WHERE t.order_id = #{order_id} AND p.client_id = #{client_id} +
    +
    +
    diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index cf87f3394..a95d9b951 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -142,6 +142,16 @@ +
    + +
    + +
    +
    +
    @@ -408,12 +418,13 @@ for="order-ids-input">Platform Transaction IDs
    - +

    +
    + +
    + +
    +
    +
    diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html index be1d2ad01..b678c4570 100644 --- a/src/main/ui/static/analysis/templates/new_riskEvent.html +++ b/src/main/ui/static/analysis/templates/new_riskEvent.html @@ -210,9 +210,8 @@
    -
    +
    @@ -249,11 +246,17 @@
    -
    +
    + cancel +
    diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index a95d9b951..08917465a 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -1,4 +1,15 @@
    +
    +
    + +
    + + +
    + +     +
    +
    diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html b/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html index 78aa1bf82..eebc8afcf 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html @@ -57,200 +57,63 @@
    -
    -
    -

    - 1、物流公司发货单据照片 - 要求：每笔交易对应的物流单必须提供，且单据必须清晰可见
    - Photos of logistics companies’ goods-delivery documents - Requirement: The logistics order record corresponding to each transaction must be provided, - and details of records should be clearly visible. -

    -

    - 1.请解释相应的消费场景/业务模式，例如网站商城，扫码支付， 消费者到店支付等；
    - Please explain the relative payment scenario/business activities, - for example, online store, QR code payment, payment at the store, etc; -

    -
    -
    -
    - -
    -   
    -
    - {{file1Progress.value}}% - -
    -
    -
    -
    -
    -

    - 2、用户购买虚拟物品需要提供聊天记录、订单信息、发货凭证截图、 - 虚拟物品最终消费场景（例如何种游戏、软件）、提供消费场景网址/下载链接 - 要求：每笔交易对应的截图必须清晰可见
    - Users need to provide chat records, order information, screenshots of delivery documents, - final consumption scenarios of virtual goods (such as games, software); - provide consumer scene URL / download link. - Requirement: The screenshot corresponding to each transaction must be clearly visible. -

    -

    - 2.提供相应购物清单，订单小票（请提供与被查交易订单号相匹配的交易时间及金额的发票）；
    - Provide related shopping lists, invoices. - (Please provide the invoices, amount of which matches that of the abnormal transaction); -

    -
    -
    -
    - -
    -   
    -
    - {{file2Progress.value}}% - -
    -
    - -
    -
    -
    -

    - 3、购物小票/发票存根照片 - 照片应清晰，必须显示商户名称、商户地址、购物时间、物品名称 - 购物金额等
    - Photos of shopping receipts/ invoice stubs - Requirement: The photos should be clear and must show Merchant name, - Business address, Transaction time, Product information, Quantity purchased, etc. -

    -

    - 3.提供相应的发货证明，报关单（若有消费者在国内购买，请提供物流单据或报关单）；
    - Relative proof of delivery, customs declaration - (If the consumer purchased from China, please provide shipping receipt or customs declaration); -

    -
    -
    -
    - -
    -   
    -
    - {{file3Progress.value}}% - +
    + +
    +
    +

    -
    +
    -

    - 4、显示商户门牌号码和店头名称的照片 - 要求：清晰可见，至少一张
    - Photos of Merchant Street number & Merchant name - Requirement: At least one visible photo -

    -

    - 4.提供您的门店照片（门店照及店铺内的照片各一张, 一张可以看到商户名的门头照，一张可以看到相关商品或服务的店内照片）；
    - Photos of the store ( one of each front-store and in-store); -

    +

    {{item.question}}

      
    - {{file4Progress.value}}% - -
    -
    + {{item.fileProgressValue}}% -
    -
    -
    -

    - 5、显示商户营业场景所场内部情况（如店内商品陈列、收银台等）的照片 - 要求：照片清晰，且能清楚显示商户实际售卖物品或服务，至少三张
    - Photos of internal environment of merchant business - (such as in-store merchandise display, checkout counter, etc.) - Requirements: The photos (at least three) - showing merchant activities including actual selling-goods or services obviously -

    -

    - 5.其他可以还原交易背景的资料，如和消费者的聊天记录等，来佐证被查单号交易的真实性;
    - Other materials that can verify the payment scenario, for example, - chatting history, to prove the truth of the transactions; -

    -
    -
    -
    - -
    -   
    -
    - {{file5Progress.value}}% - + +
    -
    -
    -
    -

    6、其他图片
    - Other pictures -

    -
    -
    -
    - -
    -   
    -
    - {{file6Progress.value}}% - -
    -
    -
    -
    - Submit
    diff --git a/src/main/ui/static/analysis/templates/risk_business.html b/src/main/ui/static/analysis/templates/risk_business.html index 6648f3db0..8c06c882d 100644 --- a/src/main/ui/static/analysis/templates/risk_business.html +++ b/src/main/ui/static/analysis/templates/risk_business.html @@ -108,39 +108,75 @@
    -
    + + +
    +
    +

    RiskEvent Analysis

    +
    + +
    +
    +

    行业占比

    +
    +
    +
    +

    金额分布

    +
    +
    +
    +
    + +
    From 3acb0175464297dfb97fb2e0d40fdbe37754f496 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 30 Nov 2018 16:24:10 +0800 Subject: [PATCH 59/76] add docs/wechat sdk doc --- src/document/cn/apis.js | 7 +++++-- src/document/en/apis.js | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index c01faa190..4d530daae 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -763,8 +763,11 @@ * 强烈建议获得支付结果后再调用RoyalPay订单查询API确认完成支付后再进行后续流程，避免因超时自动撤单导致资金损失
    *
    * 关于客户端和支付宝整合的更多信息: 支付宝SDK文档
    - * SDK for Android
    - * SDK for iOS + * 关于客户端和微信整合的更多信息: 微信SDK文档
    + * Alipay SDK for Android
    + * Alipay SDK for iOS
    + * Wechat SDK for Android
    + * Wechat SDK for iOS * * @apiVersion 1.0.0 * @apiGroup SDKPayment diff --git a/src/document/en/apis.js b/src/document/en/apis.js index b70133991..f29081340 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -778,8 +778,13 @@ * It is strongly advised to request RoyalPay order query Api to confirm that the order has been paid in order to cancelling order by system at the same time.
    *
    * More information for integration with Alipay: Alipay SDK Document
    - * SDK for Android
    - * SDK for iOS + * More information for integration with Wehcat: Wechat SDK Document
    + + * Alipay SDK for Android
    + * Alipay SDK for iOS
    + * Wechat SDK for Android
    + * Wechat SDK for iOS + * * @apiVersion 1.0.0 * @apiGroup SDKPayment * @apiHeader Accept application/json From 56a9d2ff61740f1ea7fb6e8640ac26b1a533d1ea Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 3 Dec 2018 09:26:39 +0800 Subject: [PATCH 60/76] fix yeepay client_rate --- .../ui/static/payment/partner/templates/partner_new_rate.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html index 189a97ab1..f9400f322 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html @@ -166,12 +166,12 @@
    + min="0.6" max="5.0" step="0.1" id="yeepay_rate_value_input" required>
    %
    - No more than 2.2% + No more than 5.0%
    No less than 0.6% From 3c0c2aa9448cbd56b3c9224ed1ce9b2eda34ec02 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 5 Dec 2018 15:26:43 +0800 Subject: [PATCH 61/76] add --- src/main/ui/static/payment/partner/partner-manage.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 4e675f3bc..68442d713 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1911,9 +1911,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.init.skip_clearing = true; return; } - $http.put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', {skip_clearing: skipClearing}).then(function (resp) { - $scope.getBankAccount(); - }); + commonDialog.confirm({ + title: 'Warning', + content: 'This operation will switch skip clearing status. Are you sure?' + }).then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/skip_clearing', {skip_clearing: skipClearing}).then(function (resp) { + $scope.getBankAccount(); + }); + }) }; $scope.taxInSurcharge = function (taxInSurcharge) { if (!$scope.init.tax_in_surcharge) { From 1dbd7dca0cfa27f8732aa70b218f545513644c35 Mon Sep 17 00:00:00 2001 From: lujian Date: Fri, 7 Dec 2018 17:46:27 +0800 Subject: [PATCH 62/76] =?UTF-8?q?[fix]=E9=A3=8E=E6=8E=A7=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impl/RiskBusinessServiceImpl.java | 13 ++- .../core/impl/RiskUploadServiceIpml.java | 3 + src/main/ui/static/analysis/risk_business.js | 63 ++++++++++++++- .../analysis/templates/audit_material.html | 79 +++++++++++++------ .../templates/riskEvent_detail_bd.html | 4 +- .../analysis/templates/risk_business.html | 3 + .../analysis/templates/risk_business_bd.html | 4 +- 7 files changed, 135 insertions(+), 34 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java index 8d04c9cd9..22f4494ac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java @@ -494,8 +494,13 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo @Override public void sendRefuseEmail(String riskId, String refuseDescription) throws IOException { JSONObject event = getRiskEventDetail(riskId); - if (RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType().intValue() == event.getIntValue("result_type")) { + int resultType = event.getIntValue("result_type"); + if (RiskResultTypeEnum.MATERIAL_NOT_PASS.getResultType().intValue() == resultType) { throw new BadRequestException("Refused Already!"); + } else if (RiskResultTypeEnum.MATERIAL_AUDIT_PASS.getResultType().intValue() == resultType) { + throw new BadRequestException("Passed Already!"); + } else if (RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType().intValue() != resultType){ + throw new BadRequestException(); } riskMaterialService.updateRiskMaterial(riskId, refuseDescription); Context ctx = getMailContext(event); @@ -975,8 +980,14 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo return result; } + @Transactional @Override public JSONObject riskEventMaterialPass(JSONObject params, JSONObject manager) { + Integer resultType = params.getInteger("result_type"); + if (!resultType.equals(RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType())) { + throw new BadRequestException("Can't Pass"); + } + params.put("result_type", RiskResultTypeEnum.MATERIAL_AUDIT_PASS.getResultType()); riskEventMapper.update(params); riskProcessLogService.addRiskProcessLog(params.getString("risk_id"), manager.getString("manager_id"), diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java index e53ecf4d0..ca22c42af 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java @@ -41,6 +41,7 @@ public class RiskUploadServiceIpml implements RiskUploadService { private StringRedisTemplate stringRedisTemplate; private final String UPLOAD_MAIL_PREFIX = "UPLOAD_MAIL"; + @Transactional @Override public void submitMaterial(JSONObject material) { String riskId = material.getString("risk_id"); @@ -55,6 +56,8 @@ public class RiskUploadServiceIpml implements RiskUploadService { for(int i=1;i<=10;i++){ if(material.containsKey("file"+i+"_url")){ List urls = (List)material.get("file"+i+"_url"); + if (urls == null || urls.isEmpty()) + continue; for(String url:urls){ JSONObject file = new JSONObject(); file.put("file_url",url); diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index bfeeba04d..29aa25c7c 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -144,7 +144,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], industries.push(industry.label); }); industries.push('未知行业'); - console.log(industries); + // console.log(industries); // 加载风险注册事件 $scope.loadRiskEvents = function (page) { var params = angular.copy($scope.params); @@ -509,8 +509,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], } ]); - app.controller('auditMaterialCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', '$sce', 'commonDialog', - function ($scope, $state, $http, $uibModal, $filter, $sce, commonDialog) { + app.controller('auditMaterialCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', '$sce', 'commonDialog', 'Upload', + function ($scope, $state, $http, $uibModal, $filter, $sce, commonDialog, Upload) { // 一键下载功能 $scope.downloadAsZip = function () { @@ -543,6 +543,61 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], }; $scope.loadRiskMaterial(); + $scope.uploadShowFlag = ($scope.riskEvent.result_type == 1 || $scope.riskEvent.result_type == 4) ? true : false; + + // 材料上传 + $scope.uploadFile = function(files, index) { + if (files && files.length) { + var urls = new Array(); + var value = 0; + $scope.riskMaterial.material[index].fileProgressValue = 0; + for (var i = 0; i < files.length; i++) { + var file = files[i]; + Upload.upload({ + url: '/attachment/riskFiles', + data: {file: file} + }).then(function (resp) { + urls.push(resp.data.url); + }, function (resp) { + delete $scope.riskMaterial.material[index].fileProgressValue; + alert('Upload Failed'); + }, function (evt) { + value += parseInt(100 * evt.loaded / evt.total ); + $scope.riskMaterial.material[index].fileProgressValue = value/(files.length*2); + }) + } + $scope.riskMaterial.material[index].file = urls; + } + }; + + $scope.submit = function (form) { + var index = $scope.riskEvent.submit_url.lastIndexOf('='); + if (index < 0) + index = $scope.riskEvent.submit_url.lastIndexOf('/'); + var codeKey = $scope.riskEvent.submit_url.substring(index + 1); + $scope.material.update_time=$filter('date')(new Date(), 'yyyy-MM-dd HH:mm:ss'); + $scope.material.risk_id = $scope.riskEvent.risk_id; + for (var i = 0; i < $scope.riskMaterial.material.length; i++) { + var key = 'file' + (i + 1) + "_url"; + $scope.material[key] = $scope.riskMaterial.material[i].file; + } + $scope.material.description = $scope.riskMaterial.description; + $http.post('/risk/upload/' + codeKey, $scope.material).then(function (resp) { + commonDialog.alert({ + title: 'Success', + content: 'Submit successfully', + type: 'success' + }); + $state.go('analysis_monitoring.risk_business'); + }, function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error' + }); + }); + }; + // 材料审核 $scope.auditMaterial = function(auditType) { @@ -553,7 +608,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], title: 'Warning', contentHtml: $sce.trustAsHtml(warningMessageHTML) }).then(function () { - $scope.riskEvent.result_type = auditType; + // $scope.riskEvent.result_type = auditType; $http.put(url, $scope.riskEvent).then(function (resp) { commonDialog.alert({title: 'Success', content: "材料已通过！"}); $state.go('^', {}, {reload: true}); diff --git a/src/main/ui/static/analysis/templates/audit_material.html b/src/main/ui/static/analysis/templates/audit_material.html index 5f76d3952..4ce1dab56 100644 --- a/src/main/ui/static/analysis/templates/audit_material.html +++ b/src/main/ui/static/analysis/templates/audit_material.html @@ -24,45 +24,74 @@
    -
    -
    - -
    -
    -

    +
    +
    +
    + +
    +
    +

    +
    -
    -
    - -
    -
    -

    +
    + +
    +

    {{item.question}}

    -
    -
    +
    +
    + +
    +   
    +
    + {{item.fileProgressValue}}% -
    -
    -

    + +
    +
    -
    -   
    -
    - - - + +
    + +
    +
    -
    -
    +
    +
    返回 + +
    diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html b/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html index eebc8afcf..875f12c63 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html @@ -113,8 +113,8 @@
    - Submit +
    diff --git a/src/main/ui/static/analysis/templates/risk_business.html b/src/main/ui/static/analysis/templates/risk_business.html index 8c06c882d..d5e6826cf 100644 --- a/src/main/ui/static/analysis/templates/risk_business.html +++ b/src/main/ui/static/analysis/templates/risk_business.html @@ -27,6 +27,7 @@
    @@ -41,6 +42,7 @@ class="form-control" id="sub-merchant-id-search" placeholder="子商户号" + ng-enter="loadRiskEvents(1)" ng-model="params.subMerchantId">
    @@ -72,6 +74,7 @@ type="text" name="order_ids" placeholder="多个订单请用逗号分隔" + ng-enter="loadRiskEvents(1)" id="order-ids-input">
    diff --git a/src/main/ui/static/analysis/templates/risk_business_bd.html b/src/main/ui/static/analysis/templates/risk_business_bd.html index 994ccd548..46b940f68 100644 --- a/src/main/ui/static/analysis/templates/risk_business_bd.html +++ b/src/main/ui/static/analysis/templates/risk_business_bd.html @@ -126,7 +126,7 @@ Result Type Sub Merchant ID Description - Channel Result + Risk Manager Create Time Operation @@ -145,7 +145,7 @@ - + From 0a7979ae9662d6f5fc9cf7d3a1594b363264fffc Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 10 Dec 2018 14:42:37 +0800 Subject: [PATCH 63/76] =?UTF-8?q?Revert=20"=E9=87=8D=E6=9E=84royalpay?= =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BA=E6=8F=90=E6=88=90"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2ef721ea082d7c6918496fc2412fa6ae789c08d9. --- .../core/CityPartnerPrizeService.java | 2 + .../impls/CityPartnerPrizeServiceImpl.java | 422 +----------------- .../web/CityPartnerPrizeController.java | 12 - .../FinancialAgentCommissionMapper.java | 1 - .../FinancialPartnerCommissionMapper.java | 8 - .../mappers/payment/TransactionMapper.java | 3 - .../FinancialAgentCommissionMapper.xml | 6 - .../FinancialPartnerCommissionMapper.xml | 12 - .../mappers/payment/TransactionMapper.xml | 29 -- src/main/ui/manage.html | 10 - .../config/orgcommission/orgcommission.js | 4 - .../templates/org_commission_info.html | 33 -- .../templates/org_commission_month.html | 47 +- .../ui/static/menu/templates/main_menu.html | 19 - .../CityPartnerPrizeServiceImplTest.java | 1 + 15 files changed, 16 insertions(+), 593 deletions(-) delete mode 100644 src/main/ui/static/config/orgcommission/templates/org_commission_info.html diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java index b52486f5c..aae861815 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/CityPartnerPrizeService.java @@ -29,6 +29,8 @@ public interface CityPartnerPrizeService { List getReferrerPrizeInfoList(String monthStr); + void generateAgent(String month,int orgId); + List listAgentAvailableMonths(String year); JSONObject getAgentPrizeInfo(String monthStr); diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java index aeaf8fb2c..8a8190ba2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java @@ -1,41 +1,5 @@ package au.com.royalpay.payment.manage.citypartner.core.impls; -import java.io.IOException; -import java.io.OutputStream; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; -import javax.swing.plaf.basic.BasicScrollPaneUI; - -import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper; -import au.com.royalpay.payment.tools.CommonConsts; -import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.alibaba.fastjson.JSONObject; - import au.com.royalpay.payment.manage.citypartner.beans.AgentCommissionAnalysis; import au.com.royalpay.payment.manage.citypartner.beans.CityPartnerCommissionAnalysis; import au.com.royalpay.payment.manage.citypartner.beans.ReferrerCommissionAnalysis; @@ -105,9 +69,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { private FinancialSeniorPartnerCommissionMapper financialSeniorPartnerCommissionMapper; @Resource private FinancialSeniorPartnerCommissionDetailMapper financialSeniorPartnerCommissionDetailMapper; - @Resource - private MerchantInfoProvider merchantInfoProvider; - @Override public List listAvailableMonths(String year) { @@ -153,10 +114,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { for (JSONObject prize : partnerPrizes) { plusKey(sum, prize, "gross_amount"); plusKey(sum, prize, "total_charge"); - //暂只处理合伙人提成总额 - if (prize.get("parent_org_id") == null) { - prize.put("org_charge", prize.getBigDecimal("org_charge").add(prize.getBigDecimal("share_charge"))); - } plusKey(sum, prize, "royalpay_charge"); plusKey(sum, prize, "org_charge"); prize.put("monthstr", monthStr); @@ -274,7 +231,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { sumResult.put("net_charge", netCharge); sumResult.put("client_moniker", clientMoniker); sumResult.put("channel_detail", entry.getValue()); - sumResult.put("type",type); + sumResult.put("type", type); partnerClientInfos.add(sumResult); } result.put("partner_client_infos", partnerClientInfos); @@ -298,9 +255,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { return result; } - + @Override @Transactional - public void generateold(String monthStr) { + public void generate(String monthStr) { Date mon = checkMonth(monthStr); Calendar monthCal = Calendar.getInstance(); monthCal.setTime(mon); @@ -311,7 +268,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { BigDecimal alipayChargeRate = new BigDecimal("0.6"); BigDecimal wechatChargeRate = new BigDecimal("0.6"); BigDecimal jdChargeRate = new BigDecimal("0.9"); - BigDecimal alipayonlineChargeRate = new BigDecimal("0.6"); + BigDecimal alipayonlineChargeRate = new BigDecimal("2.0"); if (sysConfig.getBigDecimal("Alipay_charge_rate") != null) { alipayChargeRate = sysConfig.getBigDecimal("Alipay_charge_rate"); } @@ -372,7 +329,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { } Runnable task = () -> { orgIds.forEach((p) -> { - generateAgentold(monthStr, p); + generateAgent(monthStr, p); }); generateReferrer(monthStr); generateSenior(monthStr); @@ -380,285 +337,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { new Thread(task).start(); } - @Override - @Transactional - public void generate(String monthStr) { - Date mon = checkMonth(monthStr); - Calendar monthCal = Calendar.getInstance(); - monthCal.setTime(mon); - int year = monthCal.get(Calendar.YEAR); - int month = monthCal.get(Calendar.MONTH) + 1; - - financialPartnerCommissionDetailMapper.clearData(year, month, 1); - financialPartnerCommissionMapper.clearData(year, month, 1); - - JSONObject sysConfig = sysConfigManager.getSysConfig(); - BigDecimal alipayChargeRate = new BigDecimal("0.6"); - BigDecimal wechatChargeRate = new BigDecimal("0.6"); - BigDecimal jdChargeRate = new BigDecimal("0.9"); - BigDecimal alipayonlineChargeRate = new BigDecimal("0.6"); - if (sysConfig.getBigDecimal("Alipay_charge_rate") != null) { - alipayChargeRate = sysConfig.getBigDecimal("Alipay_charge_rate"); - } - if (sysConfig.getBigDecimal("Wechat_charge_rate") != null) { - wechatChargeRate = sysConfig.getBigDecimal("Wechat_charge_rate"); - } - if (sysConfig.getBigDecimal("jd_charge_rate") != null) { - jdChargeRate = sysConfig.getBigDecimal("jd_charge_rate"); - } - if (sysConfig.getBigDecimal("alipayonline_charge_rate") != null) { - alipayonlineChargeRate = sysConfig.getBigDecimal("alipayonline_charge_rate"); - } - JSONObject channelCharge = new JSONObject(); - channelCharge.put("alipayChargeRate", alipayChargeRate); - channelCharge.put("wechatChargeRate", wechatChargeRate); - channelCharge.put("jdChargeRate", jdChargeRate); - channelCharge.put("alipayonlineChargeRate", alipayonlineChargeRate); - - List transactionDetail = transactionMapper.listTransactionForCityPartnerCommissionByDate(year, month); - Map> groupByOrgMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("org_id"))); - for (Map.Entry> oneOrg : groupByOrgMap.entrySet()) { - - int orgId = oneOrg.getKey(); - JSONObject org = orgMapper.findOne(orgId); - if (org == null) { - // shall never happen - throw new ServerErrorException("Organization Id not exists:" + orgId); - } - if (org.getInteger("commission_type")!=1) { - generateold(monthStr); - return; - } - - - List items = oneOrg.getValue(); - Map> groupByChannelMap = items.stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); - List channelAmount = orgChannelAmount(org,groupByChannelMap, channelCharge); - for (JSONObject channel : channelAmount) { - channel.put("share_charge", 0); - channel.put("month", month); - channel.put("year", year); - channel.put("org_id", orgId); - - financialPartnerCommissionMapper.save(channel); - } - } - Map> groupByClientMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("client_id"))); - for (Map.Entry> oneClient : groupByClientMap.entrySet()) { - - JSONObject org = orgMapper.findOne(oneClient.getValue().get(0).getInteger("org_id")); - Map> groupByChannel = oneClient.getValue().stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); - - List clientChannelAmount = clientChannelAmount(oneClient.getKey(),org, groupByChannel, channelCharge,year,month,1); - for (JSONObject channel : clientChannelAmount) { - financialPartnerCommissionDetailMapper.save(channel); - } - - } - - Runnable task = () -> { - generateAgent(monthStr, channelCharge); - generateReferrer(monthStr); - generateSenior(monthStr); - }; - new Thread(task).start(); - - - } - - public List orgChannelAmount(JSONObject orgInfo,Map> channelMap,JSONObject channelCharge) { - List amountByChannel = new ArrayList<>(); - - for (Map.Entry> oneChannel : channelMap.entrySet()) { - BigDecimal total = BigDecimal.ZERO; - BigDecimal total_surage = BigDecimal.ZERO; - BigDecimal net_surage = BigDecimal.ZERO; - BigDecimal royalpay_surage = BigDecimal.ZERO; - JSONObject json = new JSONObject(); - String channel = oneChannel.getKey(); - if (orgInfo.get(channel.toLowerCase() + "_rate_value")==null) { - throw new ServerErrorException(orgInfo.get("org_id") + "组织未设置"+ channel + "渠道成本手续费"); - } - - for (JSONObject params : oneChannel.getValue()) { - //增加货币判断 - int i = currencyScale(params.getString("clearing_currency")); - - total = total.add(params.getBigDecimal("clearing_amount")); - total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP); - royalpay_surage = royalpay_surage.add(params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP)); - // net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge)); - net_surage = net_surage.add(params.getBigDecimal("channel_surcharge")); - } - BigDecimal org_charge = total_surage.subtract(royalpay_surage); - json.put("channel",channel); - json.put("gross_amount",total); - json.put("total_charge",total_surage); - json.put("net_charge",net_surage); - json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); - json.put("royalpay_charge", royalpay_surage); - json.put("org_charge", org_charge); - json.put("commission_type", "1"); - json.put("create_time", new Date()); - amountByChannel.add(json); - } - - return amountByChannel; - } - - public List parentOrgChannelAmount(JSONObject orgInfo,JSONObject parentOrgInfo,Map> channelMap,JSONObject channelCharge) { - List amountByChannel = new ArrayList<>(); - - for (Map.Entry> oneChannel : channelMap.entrySet()) { - BigDecimal total = BigDecimal.ZERO; - BigDecimal total_surage = BigDecimal.ZERO; - BigDecimal net_surage = BigDecimal.ZERO; - BigDecimal royalpay_surage = BigDecimal.ZERO; - BigDecimal share_surage = BigDecimal.ZERO; - JSONObject json = new JSONObject(); - String channel = oneChannel.getKey(); - - for (JSONObject params : oneChannel.getValue()) { - //增加货币判断 - int i = currencyScale(params.getString("clearing_currency")); - BigDecimal parent_surage = params.getBigDecimal("clearing_amount").multiply(parentOrgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP); - BigDecimal roy_surage = (params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP)); - total = total.add(params.getBigDecimal("clearing_amount")); - total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP); - royalpay_surage = royalpay_surage.add(roy_surage); - //net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge)); - net_surage = net_surage.add(params.getBigDecimal("channel_surcharge")); - share_surage = share_surage.add(roy_surage.subtract(parent_surage)).setScale(i,RoundingMode.HALF_UP); - - } - BigDecimal org_charge = total_surage.subtract(royalpay_surage); - json.put("channel",channel); - json.put("gross_amount",total); - json.put("total_charge",total_surage); - json.put("net_charge",net_surage); - json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); - json.put("partner_charge", royalpay_surage); - json.put("share_charge", share_surage); - json.put("org_charge", org_charge); - json.put("commission_type", "1"); - json.put("create_time", new Date()); - amountByChannel.add(json); - } - - return amountByChannel; - } - - //type 1:一级代理 2:二级代理 - public List clientChannelAmount(int clientId,JSONObject orgInfo,Map> channelMap,JSONObject channelCharge,int year,int month,int type) { - List amountByChannel = new ArrayList<>(); - - for (Map.Entry> oneChannel : channelMap.entrySet()) { - JSONObject rate = merchantInfoProvider.clientCurrentRate(clientId, oneChannel.getValue().get(0).getDate("transaction_time"),oneChannel.getKey()); - String recordId = ""; - if (type == 1) { - recordId = financialPartnerCommissionMapper.getRecordId(orgInfo.getInteger("org_id"), year, month, oneChannel.getKey()); - } - if (type == 2) { - recordId = financialAgentCommissionMapper.getRecordId(orgInfo.getInteger("org_id"), year, month, oneChannel.getKey()); - } - BigDecimal total = BigDecimal.ZERO; - BigDecimal total_surage = BigDecimal.ZERO; - BigDecimal net_surage = BigDecimal.ZERO; - BigDecimal royalpay_surage = BigDecimal.ZERO; - Date datefrom = new Date(); - Date dateto = new Date(); - JSONObject json = new JSONObject(); - String channel = oneChannel.getKey(); - - for (JSONObject params : oneChannel.getValue()) { - //增加货币判断 - int i = currencyScale(params.getString("clearing_currency")); - if (total.compareTo(BigDecimal.ZERO)==0 ) { - datefrom = params.getDate("transaction_time"); - dateto = params.getDate("transaction_time"); - }else { - if (params.getDate("transaction_time").before(datefrom)) { - datefrom = params.getDate("transaction_time"); - } - if (params.getDate("transaction_time").after(dateto)) { - dateto = params.getDate("transaction_time"); - } - } - - total = total.add(params.getBigDecimal("clearing_amount")); - total_surage = total_surage.add(params.getBigDecimal("total_surcharge")).setScale(i, RoundingMode.HALF_UP); - royalpay_surage = royalpay_surage.add(params.getBigDecimal("clearing_amount").multiply(orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP)); - //net_surage = net_surage.add(getThirdPartyCharge(params.getString("channel"), params.getBigDecimal("clearing_amount"), channelCharge)); - net_surage = net_surage.add(params.getBigDecimal("channel_surcharge")); - } - BigDecimal org_charge = total_surage.subtract(royalpay_surage); - if(channel.toLowerCase().equals("alipay_direct")){ - channel = channel.replace("_", ""); - } - json.put("channel",channel); - - json.put("record_id",recordId); - json.put("client_id",clientId); - json.put("client_rate",rate.getBigDecimal("rate_value").setScale(2,RoundingMode.DOWN)); - json.put("gross_amount",total); - json.put("total_charge",total_surage); - json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value")); - json.put("royalpay_charge", royalpay_surage); - if (type == 1) { - json.put("net_charge",net_surage); - } - if (type == 2) { - json.put("org_net_charge",net_surage); - } - json.put("org_charge", org_charge); - json.put("commission_type", "1"); - json.put("create_time", new Date()); - json.put("date_from", DateFormatUtils.format(datefrom,"yyyy-MM-dd")); - json.put("date_to", DateFormatUtils.format(dateto,"yyyy-MM-dd")); - json.put("year", year); - json.put("month", month); - amountByChannel.add(json); - } - - return amountByChannel; - } - - private int currencyScale(String currency) { - int i = 0; - switch (currency) { - case "JPY": - i = 0; - break; - default: - i = 2; - break; - } - return i; - } - - private BigDecimal getThirdPartyCharge(String channel, BigDecimal total,JSONObject chargeRate) { - BigDecimal thirdPartyPaymentCharge = BigDecimal.ZERO; - switch (channel) { - case "Alipay": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("alipayChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - case "Wechat": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("wechatChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - case "jd": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("jdChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - case "AlipayOnline": - thirdPartyPaymentCharge = total.multiply(chargeRate.getBigDecimal("alipayonlineChargeRate").divide(CommonConsts.HUNDRED, 4, BigDecimal.ROUND_DOWN)).setScale(2,RoundingMode.HALF_UP); - break; - default: - break; - } - return thirdPartyPaymentCharge; - } - - - @Override @Transactional public void generateReferrer(String monthStr) { @@ -693,8 +371,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { } } + @Override @Transactional - public void generateAgentold(String monthStr, int orgId) { + public void generateAgent(String monthStr, int orgId) { JSONObject org = orgMapper.findOne(orgId); if (org == null) { // shall never happen @@ -746,93 +425,6 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService { financialAgentCommissionDetailMapper.save(detail); } } - } - - @Transactional - public void generateAgent(String monthStr,JSONObject channelCharge) { - - Date mon = checkMonth(monthStr); - Calendar monthCal = Calendar.getInstance(); - monthCal.setTime(mon); - int year = monthCal.get(Calendar.YEAR); - int month = monthCal.get(Calendar.MONTH) + 1; - - financialAgentCommissionMapper.clearData(year, month); - financialAgentCommissionDetailMapper.clearData(year, month); - List transactionDetail = transactionMapper.listTransactionForCityPartnerAgentCommissionByDate(year, month); - Map> groupByOrgMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("org_id"))); - for (Map.Entry> oneOrg : groupByOrgMap.entrySet()) { - - int orgId = oneOrg.getKey(); - JSONObject org = orgMapper.findOne(orgId); - if (org == null) { - // shall never happen - throw new ServerErrorException("Organization Id not exists:" + orgId); - } - JSONObject parentOrg = orgMapper.findOne(org.getInteger("parent_org_id")); - if (parentOrg == null) { - // shall never happen - throw new ServerErrorException("Parent Organization Id not exists:" + orgId); - } - if (org.getInteger("commission_type")!=1) { - generateold(monthStr); - return; - } - List items = oneOrg.getValue(); - Map> groupByChannelMap = items.stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); - List channelAmount = parentOrgChannelAmount(org,parentOrg,groupByChannelMap, channelCharge); - for (JSONObject channel : channelAmount) { - if (channel.getBigDecimal("share_charge").compareTo(BigDecimal.ZERO) != 0) { - JSONObject parentCommission = financialPartnerCommissionMapper.findByChanel(year, month, parentOrg.getInteger("org_id"), channel.getString("channel")); - if (parentCommission == null) { - JSONObject temp = new JSONObject(); - temp.put("org_id", parentOrg.getInteger("org_id")); - temp.put("year", year); - temp.put("month", month); - temp.put("create_time", new Date()); - temp.put("org_rate", 0); - temp.put("gross_amount", 0); - temp.put("total_charge", 0); - temp.put("royalpay_charge", 0); - temp.put("org_charge", 0); - temp.put("share_charge", 0); - temp.put("channel", channel.getString("channel")); - temp.put("net_charge", 0); - temp.put("commission_type", 1); - temp.put("settle_surcharge", 0); - financialPartnerCommissionMapper.save(temp); - parentCommission = temp; - } - parentCommission.put("share_charge", parentCommission.getBigDecimal("share_charge").add(channel.getBigDecimal("share_charge"))); - financialPartnerCommissionMapper.update(parentCommission); - JSONObject mineCommission = financialPartnerCommissionMapper.findByChanel(year, month, orgId, channel.getString("channel")); - mineCommission.put("share_charge", mineCommission.getBigDecimal("share_charge").subtract(channel.getBigDecimal("share_charge"))); - financialPartnerCommissionMapper.update(mineCommission); - } - channel.put("month", month); - channel.put("year", year); - channel.put("org_id", orgId); - //撤销agent表 -// financialAgentCommissionMapper.save(channel); - } - } - //撤销agent表 -// Map> groupByClientMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("client_id"))); -// for (Map.Entry> oneClient : groupByClientMap.entrySet()) { -// -// JSONObject org = orgMapper.findOne(oneClient.getValue().get(0).getInteger("org_id")); -// Map> groupByChannel = oneClient.getValue().stream().collect(Collectors.groupingBy(e -> e.getString("channel"))); -// -// List clientChannelAmount = clientChannelAmount(oneClient.getKey(),org, groupByChannel, channelCharge,year,month,2); -// for (JSONObject channel : clientChannelAmount) { -// financialAgentCommissionDetailMapper.save(channel); -// } -// -// } - - - - } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java index c8c877767..c77a6bb4e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java +++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java @@ -69,7 +69,6 @@ public class CityPartnerPrizeController { BigDecimal royalpayCharge = BigDecimal.ZERO; BigDecimal orgCharge = BigDecimal.ZERO; BigDecimal netCharge = BigDecimal.ZERO; - BigDecimal shareCharge = BigDecimal.ZERO; String cityPartnerName = ""; int org_id = 0; int type = 1; @@ -77,7 +76,6 @@ public class CityPartnerPrizeController { grossAmount = grossAmount.add(jsonObject.getBigDecimal("gross_amount")); totalCharge = totalCharge.add(jsonObject.getBigDecimal("total_charge")); royalpayCharge = royalpayCharge.add(jsonObject.getBigDecimal("royalpay_charge")); - shareCharge = shareCharge.add(jsonObject.getBigDecimal("share_charge")); orgCharge = orgCharge.add(jsonObject.getBigDecimal("org_charge")); if (jsonObject.getBigDecimal("net_charge") != null) { netCharge = netCharge.add(jsonObject.getBigDecimal("net_charge")); @@ -86,14 +84,10 @@ public class CityPartnerPrizeController { cityPartnerName = jsonObject.getString("name"); type = jsonObject.getIntValue("commission_type"); } - if (entry.getValue().get(0).get("parent_org_id") != null) { - sumResult.put("org_type", "agent"); - } sumResult.put("gross_amount", grossAmount); sumResult.put("total_charge", totalCharge); sumResult.put("royalpay_charge", royalpayCharge); sumResult.put("org_charge", orgCharge); - sumResult.put("share_charge", shareCharge); sumResult.put("org_name", cityPartnerName); sumResult.put("org_id", org_id); sumResult.put("net_charge", netCharge); @@ -101,13 +95,7 @@ public class CityPartnerPrizeController { sumResult.put("channel_detail", entry.getValue()); resultTotalCharge = resultTotalCharge.add(totalCharge); resultRoyalpayCharge = resultRoyalpayCharge.add(royalpayCharge); - if ("agent".equals(sumResult.getString("org_type"))) { - resultRoyalpayCharge = resultRoyalpayCharge.add(shareCharge); - } resultOrgCharge = resultOrgCharge.add(orgCharge); - if (!"agent".equals(sumResult.getString("org_type"))) { - resultOrgCharge = resultOrgCharge.add(shareCharge); - } resultNetCharge = resultNetCharge.add(netCharge); partnerInfos.add(sumResult); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java index 96e129bd7..c0b847a56 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java @@ -27,6 +27,5 @@ public interface FinancialAgentCommissionMapper { List list(@Param("year") int year, @Param("month") int month); - String getRecordId(@Param("org_id") int orgId, @Param("year") int year, @Param("month") int month, @Param("channel") String channel); } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java index 6c1a0b34c..aefc9e477 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java @@ -19,9 +19,6 @@ public interface FinancialPartnerCommissionMapper { @AutoSql(type = SqlType.INSERT) void save(JSONObject commissionAnalysis); - @AutoSql(type = SqlType.UPDATE) - void update(JSONObject commission); - List listAvailableMonths(@Param("year") int year); List listWithOrgInfo(@Param("year") int year, @Param("month") int month); @@ -35,9 +32,4 @@ public interface FinancialPartnerCommissionMapper { List analysisSenior(@Param("year") int year, @Param("month")int month,@Param("orgIds") List orgIds); JSONObject analysisSeniorForGenerate(@Param("year") int year, @Param("month")int month,@Param("orgIds") List orgIds); - - String getRecordId(@Param("org_id") int orgId, @Param("year") int year, @Param("month") int month, @Param("channel") String channel); - - JSONObject findByChanel(@Param("year") int year, @Param("month") int month, @Param("org_id") int orgId,@Param("channel") String channel); - } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index f8579d039..9a47c34f4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -104,9 +104,6 @@ public interface TransactionMapper { BigDecimal TotalAmountForBDLeaderPrize(@Param("year") int year, @Param("month") int month, @Param("bd_group") String bd_group); BigDecimal TotalAmountForSydneyGMPrize(@Param("year") int year, @Param("month") int month); - List listTransactionForCityPartnerCommissionByDate(@Param("year") int year, @Param("month") int month); - - List listTransactionForCityPartnerAgentCommissionByDate(@Param("year") int year, @Param("month") int month); List listTransactionsForCityPartnerCommission(@Param("year") int year, @Param("month") int month); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml index 09ea9f0f7..0a2b3df45 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.xml @@ -23,10 +23,4 @@ INNER JOIN sys_org o ON o.org_id = c.org_id and o.parent_org_id is null WHERE c.year = #{year} AND c.month = #{month} - \ No newline at end of file diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml index 13e41f29e..84a5af0c4 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.xml @@ -58,18 +58,6 @@ ) - - \ No newline at end of file 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 906de6d47..9db314ed4 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 @@ -662,36 +662,7 @@ select sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion, ]]> - -