diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index cf0083191..e41434d61 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -666,6 +666,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl i order.setBalanceAmount(Double.valueOf(balanceAmount)); order.setOilCardAmount(Double.valueOf(oilCardAmount)); order.setActiveAmount(activeAmount); - order.setBalanceGiftAmount( this.countCardBalance(Double.valueOf(balanceAmount), userId, storeId, orderNo)); + order.setBalanceGiftAmount( this.countCardBalance(Double.valueOf(amount), userId, storeId, orderNo)); order.setStoreId(storeId); order.setUserId(userId); order.setStaffId(staffId); diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index 701ee2f0a..144c0e95b 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -1185,9 +1185,13 @@ export default { 'car_card_value': '车队卡', }; let payTypeText = payTypeMap[this.payType] || '小程序码'; - + let mm=[] + mm.push({ + orderNo:this.orderNo, + payUser:this.chooseVipUser.mobile + }) let f = { - oilOrder: oilOrderR, + oilOrder: mm, goodsOrder: goodsOrderR, payType: payTypeText, unitName: "", // 挂账单位