Merge remote-tracking branch 'origin/alipayplus_aps' into alipayplus_aps

master
yixian 3 years ago
commit bd0b6f9755

@ -81,7 +81,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
@Override @Override
public void exportData(JSONObject params, HttpServletResponse resp) { public void exportData(JSONObject params, HttpServletResponse resp) {
params.put("channels", new String []{"Alipay", "AlipayOnline"}); params.put("channels", new String []{"Alipay", "AlipayOnline","AlipayAps"});
String[] title = {"Channel", "Total Amount(AUD)", "Total orders", "Transaction Partners", "Enable Partners"}; String[] title = {"Channel", "Total Amount(AUD)", "Total orders", "Transaction Partners", "Enable Partners"};
JSONObject count = customerAndOrdersStatisticsMapper.countChannel(params); JSONObject count = customerAndOrdersStatisticsMapper.countChannel(params);
int enablePartners = customerAndOrdersStatisticsMapper.countEnableAlipay(params); int enablePartners = customerAndOrdersStatisticsMapper.countEnableAlipay(params);

@ -18,6 +18,7 @@
o.client_order_id, o.client_order_id,
o.gateway, o.gateway,
o.channel, o.channel,
o.pay_type,
o.pre_authorization, o.pre_authorization,
p.client_moniker, p.client_moniker,
p.short_name, p.short_name,
@ -48,6 +49,7 @@
o.confirm_time pay_time, o.confirm_time pay_time,
o.pre_authorization, o.pre_authorization,
o.source, o.source,
o.pay_type,
CASE o.status CASE o.status
WHEN 0 WHEN 0
THEN 'SUBMITTING' THEN 'SUBMITTING'
@ -159,7 +161,7 @@
select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount, select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency, oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail, oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail,
oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type
from pmt_orders oo from pmt_orders oo
<where> <where>
<if test="search_text != null"> <if test="search_text != null">
@ -301,7 +303,7 @@
select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount, select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount,
oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency, oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency,
oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail, oo.create_time,oo.confirm_time,oo.status,oo.order_description,oo.order_detail,
oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source oo.client_order_id,oo.gateway,oo.channel,oo.pre_authorization,oo.refund_amount,oo.customer_id,oo.source,oo.pay_type
from pmt_orders oo from pmt_orders oo
<where> <where>
<if test="search_text != null"> <if test="search_text != null">

@ -293,7 +293,7 @@
</div> </div>
<div class="col-sm-2 col-xs-6"> <div class="col-sm-2 col-xs-6">
<div class="description-block"> <div class="description-block">
<div class="description-header text-bold"><small><img src="/static/images/alipay_sign.png"/>Alipay+</small></div> <div class="description-header text-bold"><small><img src="/static/images/alipay_aps.jpg" style="height: 30px"/>Alipay+</small></div>
<div class="description-text"> <div class="description-text">
<label class="description-text text-red" <label class="description-text text-red"
ng-bind="totalChannelAmount.alipayapsamount|currency: ' $ '"></label></br> ng-bind="totalChannelAmount.alipayapsamount|currency: ' $ '"></label></br>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -376,6 +376,8 @@
ng-if="trade.channel=='Alipay'" /> ng-if="trade.channel=='Alipay'" />
<img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline"
ng-if="trade.channel=='AlipayOnline'" /> ng-if="trade.channel=='AlipayOnline'" />
<img src="/static/images/alipay_aps.jpg" style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
ng-if="trade.channel=='AlipayAps'" />
<img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'" /> <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'" />
<img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'" /> <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'" />
<img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+"

@ -250,13 +250,13 @@
ng-change="toggleChannel('rpaypmt_dd')"> ng-change="toggleChannel('rpaypmt_dd')">
</div> </div>
</div> </div>
<div class="form-group col-sm-4"> <!-- <div class="form-group col-sm-4">-->
<label class="col-xs-6 control-label">Alipay+|支付宝</label> <!-- <label class="col-xs-6 control-label">Alipay+|支付宝</label>-->
<div class="col-xs-6"> <!-- <div class="col-xs-6">-->
<input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch <!-- <input type="checkbox" ng-model="paymentInfo.enable_alipayplus" bs-switch-->
ng-change="toggleChannel('alipayplus')"> <!-- ng-change="toggleChannel('alipayplus')">-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">Alipay+(APS)</label> <label class="col-xs-6 control-label">Alipay+(APS)</label>
<div class="col-xs-6"> <div class="col-xs-6">
@ -556,7 +556,7 @@
<div class="form-group col-sm-4"> <div class="form-group col-sm-4">
<label class="col-xs-6 control-label">AlipayCN channel</label> <label class="col-xs-6 control-label">AlipayCN channel</label>
<div class="col-xs-6"> <div class="col-xs-6">
<input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="APS" <input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="Alipay+(APS)"
switch-off-text="Alipay" switch-off-text="Alipay"
ng-change="switchAlipayCn(paymentInfo.client_id,paymentInfo.aps_config_id,paymentInfo.alipay_cn_switch)"> ng-change="switchAlipayCn(paymentInfo.client_id,paymentInfo.aps_config_id,paymentInfo.alipay_cn_switch)">
</div> </div>

@ -540,6 +540,8 @@
uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/> uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
<img src="/static/images/direct_debit_sign.png" <img src="/static/images/direct_debit_sign.png"
uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/> uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
<img src="/static/images/alipay_aps.jpg" style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
ng-if="trade.channel=='AlipayAps'" />
{{trade.order_id2}}<span {{trade.order_id2}}<span
ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i
class="fa fa-question-circle-o" uib-tooltip-html="trade.htmlTooltip"></i></span> class="fa fa-question-circle-o" uib-tooltip-html="trade.htmlTooltip"></i></span>

@ -374,6 +374,8 @@
uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/> uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
<img src="/static/images/direct_debit_sign.png" <img src="/static/images/direct_debit_sign.png"
uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/> uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
<img src="/static/images/alipay_aps.jpg" style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
ng-if="trade.channel=='AlipayAps'" />
{{trade.order_id}} {{trade.order_id}}
</td> </td>
<td> <td>

@ -349,6 +349,8 @@
<img src="/static/images/lakalapay_sign.png" uib-tooltip="LakalaPay" ng-if="trade.channel=='LakalaPay'"/> <img src="/static/images/lakalapay_sign.png" uib-tooltip="LakalaPay" ng-if="trade.channel=='LakalaPay'"/>
<img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/> <img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
<img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/> <img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
<img src="/static/images/alipay_aps.jpg" style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
ng-if="trade.channel=='AlipayAps'" />
{{trade.order_id}} {{trade.order_id}}
</td> </td>
<td> <td>

@ -731,6 +731,9 @@
<img src="/static/images/lazada-logo.png" style="height: 20px" <img src="/static/images/lazada-logo.png" style="height: 20px"
uib-tooltip="Lazada Wallet" uib-tooltip="Lazada Wallet"
ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='lazada_wallet_my'" /> ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='lazada_wallet_my'" />
<img src="/static/images/alipay_aps.jpg" style="height: 25px"
uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
ng-if="trade.channel=='AlipayAps'" />
{{trade.order_id}}<span {{trade.order_id}}<span
ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i
class="fa fa-question-circle-o" class="fa fa-question-circle-o"

@ -502,6 +502,9 @@
ng-if="trade.channel=='rpaypmt_card'" /> ng-if="trade.channel=='rpaypmt_card'" />
<img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit" <img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit"
ng-if="trade.channel=='rpaypmt_dd'" /> ng-if="trade.channel=='rpaypmt_dd'" />
<img src="/static/images/alipay_aps.jpg" style="height: 25px"
uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
ng-if="trade.channel=='AlipayAps'" />
<img src="/static/images/alipay_sign.png" style="height: 20px" <img src="/static/images/alipay_sign.png" style="height: 20px"
uib-tooltip="Alipay CN" uib-tooltip="Alipay CN"
ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='alipay_cn'" /> ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='alipay_cn'" />

Loading…
Cancel
Save