فهرست منبع

确认订单修改bug

zhengjinyi 3 سال پیش
والد
کامیت
cfce09985b
1فایلهای تغییر یافته به همراه12 افزوده شده و 13 حذف شده
  1. 12 13
      src/main/resources/static/js/shopping/confirm.js

+ 12 - 13
src/main/resources/static/js/shopping/confirm.js

@@ -397,23 +397,22 @@ var shoppingConfirm = new Vue({
             var _self = this;
             if(this.balance.userMoney>0){
                 this.$nextTick(function() {
-                    var total = _self.totalPrice + _self.payInfo.freight;
+                    var total = _self.totalPrice + _self.payInfo.freight; // 订单总金额 + 邮费金额
                     if(_self.balance.flag){
                         _self.payInfo.balancePayFlag = 1;
                         if(_self.balance.userMoney>=total){ // 全部抵扣
                             _self.payInfo.orderShouldPayFee = 0;
-                            if(_self.balance.isFreight){
-                                _self.balance.deductMoney = _self.totalPrice;
-                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - total*10)/10;
+                            if(_self.balance.isFreight){// 勾选了采美豆丢运费
+                                _self.balance.deductMoney = _self.totalPrice; // 抵扣使用金额 = 订单总金额
+                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.totalPrice*10)/10; // 抵扣后剩余余额 = 余额总额 - (订单总金额+邮费金额)
                             }else{
-                                _self.balance.deductMoney = total;
-                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10;
-                                console.log('剩余余额',_self.balance.surplusMoney);
+                                _self.balance.deductMoney = total; // 抵扣使用金额 = 订单总金额 + 邮费金额
+                                _self.balance.surplusMoney = (_self.balance.userMoney*10 - _self.balance.deductMoney*10)/10; // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
                             }
                         }else{ // 部分抵扣
-                            _self.payInfo.orderShouldPayFee = total - _self.balance.userMoney;
-                            _self.balance.deductMoney = _self.balance.userMoney;
-                            _self.balance.surplusMoney = 0;
+                            _self.payInfo.orderShouldPayFee = total - _self.balance.userMoney; // 最终订单总价 = 订单总金额 - 余额总额
+                            _self.balance.deductMoney = _self.balance.userMoney; // 抵扣使用金额 = 余额总额
+                            _self.balance.surplusMoney = 0; // 抵扣后剩余余额 = 0
                         }
                     }else{// 取消抵扣
                         _self.payInfo.balancePayFlag = 0;
@@ -421,9 +420,9 @@ var shoppingConfirm = new Vue({
                         _self.balance.deductMoney = 0;
                         _self.balance.surplusMoney = _self.balance.originUserMoney;
                         if(_self.balance.isFreight){//判断是否有采美豆抵扣运费
-                            _self.payInfo.orderShouldPayFee = _self.totalPrice;
+                            _self.payInfo.orderShouldPayFee = _self.totalPrice; // 最终订单总价 = 订单总金额
                         }else{
-                            _self.payInfo.orderShouldPayFee = total;
+                            _self.payInfo.orderShouldPayFee = total; // 最终订单总价 = 订单总金额 + 邮费金额
                         }
                     }
                 });
@@ -436,7 +435,7 @@ var shoppingConfirm = new Vue({
                 _self.hanldUserBeans = _self.freightBeansMoney*100;
                 if(_self.payInfo.freePostFlag == 1){
                     if( _self.userBeans >= _self.payInfo.freight*100 ){
-                        if(_self.balance.flag) {
+                        if(_self.balance.flag) {// 勾选了余额抵扣
                             if(_self.balance.userMoney>=total){ // 全部抵扣
                                 _self.payInfo.orderShouldPayFee = 0;
                                 _self.balance.deductMoney = _self.totalPrice;