Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/resources/static/js/pay/caimei-pay.js

@@ -186,7 +186,7 @@ var payContainer = new Vue({
                     if(data.order.status == '7'){
                         _self.payment = _self.toFixedFn(_self.payTotalFee - _self.payableAmount);
                     }else{
-                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.receiptAmount - _self.payableAmount);
+                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.receiptAmount - _self.payableAmount - _self.balancePayFee);
                     }
                     _self.paySuccessCounter = data.order.paySuccessCounter;
                     _self.isRequest = true;

src/main/resources/static/js/pay/caimei-weisapay.js

@@ -2,8 +2,9 @@
  *Created by ZHJY on 2020/7/14.
  */
 // var _WS_SERVICE = 'http://192.168.2.67:8010'; //维沙网银支付本地联调
-// var _WS_SERVICE = 'https://mall2b-b.caimei365.com';//维沙网银支付测试联调
-var _WS_SERVICE = 'https://mall2b.caimei365.com';//维沙网银支付正式联调
+// var _WS_SERVICE = 'http://192.168.2.68:8010'; //维沙网银支付本地联调
+var _WS_SERVICE = 'https://mall2b-b.caimei365.com';//维沙网银支付测试联调
+// var _WS_SERVICE = 'https://mall2b.caimei365.com';//维沙网银支付正式联调
 var payContainer = new Vue({
     el:"#payContainer",
     data: {
@@ -183,7 +184,7 @@ var payContainer = new Vue({
                     if(data.order.status === '7'){
                         _self.payment = _self.toFixedFn(_self.payTotalFee - _self.payableAmount);
                     }else{
-                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.receiptAmount - _self.payableAmount);
+                        _self.payment = _self.toFixedFn(_self.payTotalFee - _self.receiptAmount - _self.payableAmount - _self.balancePayFee);
                     }
                     _self.paySuccessCounter = data.order.paySuccessCounter;
                     _self.isRequest = true;