From 5549f1d0c7e74f136a074e15c1df5a754ff6202a Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 28 May 2024 09:01:56 +0800
Subject: [PATCH] bug

---
 .../business/order/service/impl/OilOrderServiceImpl.java  | 1 +
 pos-uni/pagesHome/BusinessData/BusinessData.vue           | 2 +-
 pos-uni/pagesHome/Collection/Collection.vue               | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

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<String, String> mainScan = fyPayService.mainScan(receiveParameterPos);
         return row;
     }
diff --git a/pos-uni/pagesHome/BusinessData/BusinessData.vue b/pos-uni/pagesHome/BusinessData/BusinessData.vue
index c3da585e3..364fdda43 100644
--- a/pos-uni/pagesHome/BusinessData/BusinessData.vue
+++ b/pos-uni/pagesHome/BusinessData/BusinessData.vue
@@ -13,7 +13,7 @@
 			</view>
 
 			<u-datetime-picker :show="showStartTime" v-model="startTimeValue" mode="datetime" @confirm="clickStart"
-				@close="showStartTime = false" @close="showStartTime = false"></u-datetime-picker>
+				@close="showStartTime = false"></u-datetime-picker>
 			<u-datetime-picker :show="showEndTime" v-model="endTimeValue" mode="datetime" @confirm="clickEnd"
 				@close="showEndTime = false"></u-datetime-picker>
 
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()
 			},