diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 47193b7b8..ea26f154e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -2091,6 +2091,7 @@ return stringDoubleMap; receiveParameterPos.setStoreId(oilOrderVo.getStoreId()); receiveParameterPos.setStoreId(oilOrderVo.getUserId()); receiveParameterPos.setGoodsMoney(oilOrderVo.getPayAmount()); + receiveParameterPos.setOilCardAmount(oilOrderVo.getOilCardAmount1()); Map mainScan = fyPayService.mainScan(receiveParameterPos); return row; } diff --git a/pos-uni/pagesHome/BusinessData/BusinessData.vue b/pos-uni/pagesHome/BusinessData/BusinessData.vue index 4d20705a6..6c87ec5da 100644 --- a/pos-uni/pagesHome/BusinessData/BusinessData.vue +++ b/pos-uni/pagesHome/BusinessData/BusinessData.vue @@ -14,6 +14,7 @@ + diff --git a/pos-uni/pagesHome/Collection/Collection.vue b/pos-uni/pagesHome/Collection/Collection.vue index 3190afaa4..9e97b6937 100644 --- a/pos-uni/pagesHome/Collection/Collection.vue +++ b/pos-uni/pagesHome/Collection/Collection.vue @@ -283,7 +283,6 @@ }, // 二维码 scanQrcode() { - console.log(this.oilOrder); if (!this.AmountCollected) { uni.showToast({ title: "请先输入收款金额", @@ -306,6 +305,13 @@ }, // 现金支付 cashPay() { + if (!this.AmountCollected) { + uni.showToast({ + title: "请先输入收款金额", + icon: "none" + }) + return; + } this.oilOrder.payType = "CASH" this.payMent() },