dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	pos-uni/pagesHome/BusinessData/BusinessData.vue
This commit is contained in:
DESKTOP-369JRHT\12997 2024-05-28 09:03:32 +08:00
commit ed1c6f998e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -2091,6 +2091,7 @@ return stringDoubleMap;
receiveParameterPos.setStoreId(oilOrderVo.getStoreId()); receiveParameterPos.setStoreId(oilOrderVo.getStoreId());
receiveParameterPos.setStoreId(oilOrderVo.getUserId()); receiveParameterPos.setStoreId(oilOrderVo.getUserId());
receiveParameterPos.setGoodsMoney(oilOrderVo.getPayAmount()); receiveParameterPos.setGoodsMoney(oilOrderVo.getPayAmount());
receiveParameterPos.setOilCardAmount(oilOrderVo.getOilCardAmount1());
Map<String, String> mainScan = fyPayService.mainScan(receiveParameterPos); Map<String, String> mainScan = fyPayService.mainScan(receiveParameterPos);
return row; return row;
} }

1
pos-uni/pagesHome/BusinessData/BusinessData.vue
View File

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

8
pos-uni/pagesHome/Collection/Collection.vue
View File

@ -283,7 +283,6 @@
}, },
// 二维码 // 二维码
scanQrcode() { scanQrcode() {
console.log(this.oilOrder);
if (!this.AmountCollected) { if (!this.AmountCollected) {
uni.showToast({ uni.showToast({
title: "请先输入收款金额", title: "请先输入收款金额",
@ -306,6 +305,13 @@
}, },
// 现金支付 // 现金支付
cashPay() { cashPay() {
if (!this.AmountCollected) {
uni.showToast({
title: "请先输入收款金额",
icon: "none"
})
return;
}
this.oilOrder.payType = "CASH" this.oilOrder.payType = "CASH"
this.payMent() this.payMent()
}, },