网银支付调整

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

@@ -105,7 +105,7 @@ var payContainer = new Vue({
                     _self.obligation =  data.shopOrder.obligation;// 待付金额
                     _self.payableAmount =  data.shopOrder.realPay;
                     _self.receiptAmount =  data.shopOrder.receiptAmount;
-                    _self.balanceAmount =  ( _self.obligation - _self.receiptAmount).toFixed(2) - _self.payInfo.payAmount;
+                    _self.balanceAmount =  (_self.obligation*100 -  _self.payInfo.payAmount*100)/100;
                     _self.payAmount =  (_self.payableAmount - _self.receiptAmount).toFixed(2);
                     _self.paySuccessCounter = data.shopOrder.paySuccessCounter;
                     _self.onlinePay = data.onlinePay;
@@ -361,7 +361,7 @@ var payContainer = new Vue({
                         }
                     });
                 }else{
-                    PayApi.PayOrderPayWhetherSuccess({shopOrderId: _self.payInfo.shopOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
+                    PayApi.PayOrderPayWhetherSuccess({shopOrderId: _self.payInfo.shopOrderId, paySuccessCounter:_self.paySuccessCounter,shopOrderId:_self.payInfo.shopOrderId},function(response){
                         _self.isPayAlert = false;
                         if(response.code === 0){
                             _self.windowLocationHref('success');

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

@@ -149,7 +149,7 @@ var payContainer = new Vue({
                     _self.orderProductList = data.orderProductList;// 自订单商品信息
                     _self.obligation = data.shopOrder.obligation; // 待付金额
                     _self.eachDiscount = data.shopOrder.eachDiscount; //优惠金额
-                    _self.payableAmount = data.shopOrder.obligation - _self.payInfo.payUnpaidAmount; //剩余支付金额
+                    _self.payableAmount = (data.shopOrder.obligation*100 - _self.payInfo.payUnpaidAmount*100)/100; //剩余支付金额 = 子订单待付金额 - 本次支付金额
                     _self.userName =  data.userName;
                     _self.totalAmount =  data.shopOrder.totalAmount; // 子订单金额合计
                     _self.receiptAmount=  data.shopOrder.receiptAmount; // 已支付金额

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

@@ -209,7 +209,7 @@ var payContainer = new Vue({
                     }
                 });
             }else{
-                PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.shopOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
+                PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.shopOrderId, paySuccessCounter:_self.paySuccessCounter,shopOrderId:_self.payInfo.shopOrderId},function(response){
                     // console.log(response);
                     if(response.code === 0){
                         CAIMEI.dialog('支付成功');
@@ -229,7 +229,7 @@ var payContainer = new Vue({
         setTimerAliPay:function () {//定时任务查询支付宝支付结果
             var _self = this;
             var timer;
-            PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId,orderFlag:_self.orderFlag},function(response){
+            PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId,orderFlag:_self.orderFlag,shopOrderId:_self.payInfo.shopOrderId},function(response){
                 var data = response.data;
                 if(data.rt7_orderStatus === 'SUCCESS'){
                     CAIMEI.dialog('支付成功');