Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

# Conflicts:
#	pos-uni/pagesHome/BusinessData/BusinessData.vue

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;
     }

pos-uni/pagesHome/BusinessData/BusinessData.vue

@@ -14,6 +14,7 @@
 
 			<u-datetime-picker :show="showStartTime" v-model="startTimeValue" mode="datetime" @confirm="clickStart"
 				@close="showStartTime = false" @cancel="showStartTime = false"></u-datetime-picker>
+
 			<u-datetime-picker :show="showEndTime" v-model="endTimeValue" mode="datetime" @confirm="clickEnd"
 				@close="showEndTime = false" @cancel="showEndTime = false"></u-datetime-picker>
 

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()
 			},