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

src/main/resources/static/js/shopping/confirm.js

@@ -514,7 +514,7 @@ var shoppingConfirm = new Vue({
                             console.log('订单总额',total)
                             if(_self.balance.userMoney>=total){ // 全部抵扣
                                 _self.payInfo.orderShouldPayFee = 0;
-                                _self.balance.deductMoney = _self.totalPrice;  // 抵扣使用金额 = 订单总金额
+                                _self.balance.deductMoney = _self.totalPrice - _self.couponAmount;  // 抵扣使用金额 = 订单总金额
                                 _self.balance.surplusMoney = _self.repiceNumSub(_self.balance.userMoney,_self.balance.deductMoney);  // 抵扣后剩余余额 = 余额总额 - 抵扣使用金额
                                 console.log('有勾选余额抵扣全抵',_self.payInfo.orderShouldPayFee)
                             }else{ // 部分抵扣