From 3bc9fcf7aedaf4637652414a748ec70958d67bd9 Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Thu, 10 Oct 2024 19:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cashier/NewComponents/newHome.vue   | 64 ++++++++++++++++---
 1 file changed, 54 insertions(+), 10 deletions(-)

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 2a1da26ea..c0313d618 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -1109,8 +1109,25 @@ export default {
     },
     // 立即结算
     async settlement(){
-      this.payForm.oilOrder  =  this.oilGunClearing
+
+      // 油品单价
+      //  油号id
+      //  油枪id
+      //  油罐id
+      //  活动id
+      //  活动类型
+      this.payForm.oilOrder = {
+        oilsPrice: this.oilGunClearing.oilPrice,
+        oils: this.oilGunClearing.oilNameId,
+        oilGunNum: this.oilGunClearing.id,
+        tankId: this.oilGunClearing.tankId,
+        activeId: null,
+        activeType: null,
+      }
+      //商品 集合
       this.payForm.goodsOrder  =  this.goodsList
+      //支付方式
+      this.payForm.payType = this.payType
       //油品订单金额
       this.payForm.oilAmount  =  this.oilGunClearing.amount
       //商品订单金额
@@ -1119,17 +1136,44 @@ export default {
       this.payForm.oilActualPay  =  this.oilGunClearing.amount
       //商品实付金额
       this.payForm.goodsActualPay  =  this.getGoodsNum
-      //油枪Id
-      this.payForm.oilGunId
-      this.payForm.oilOrder  =  this.oilGunClearing
-      this.payForm.oilOrder  =  this.oilGunClearing
-      this.payForm.oilOrder  =  this.oilGunClearing
-      this.payForm.oilOrder  =  this.oilGunClearing
+      //找零金额
+
+      //油枪id
+      this.payForm.oilGunId = this.oilGunClearing.id
+      //活动营销优惠金额
+      this.payForm.activeAmount = null
+      //优惠卷类型
+      this.payForm.couponType = null
+      //付款用户
+      this.payForm.payUser = this.chooseVipUser
+      //油品优惠金额
+      this.payForm.oilDiscount  =  null;
+      //商品优惠金额
+      this.payForm.goodsDiscount  =  null;
+      //员工id
+      this.payForm.staffId = null;
+      //会员消费金额 (储值卡需要减少的金额)
+      this.payForm.consumeAmount = null;
+      //会员id
+      this.payForm.userId = this.chooseVipUser.id
+      //使用积分数量
+      this.payForm.usePoint = null;
+      //积分金额
+      this.payForm.pointAmount = null;
+      //终端  默认传PC
+      this.payForm.terminal = "PC"
+      //商品 ids
+      // 将集合内 所有id 拼接 , 隔开  this.goodsList
+      this.payForm.goodsIds = this.goodsList.map(item=>item.id).join(",")
+      //购买商品的总数量
+      this.payForm.goodsNum = this.getGoodsListNum()
+      //油品 + 商品 的实付总额
+      this.payForm.allAmount = null
+      //支付码  如果是现金 传现金 金额
+      this.authCode=null
+
 
       this.payForm.realyPayBills = this.realAmount
-      this.payForm.payType = this.payType
-      //找零金额
-      this.payForm.seekZero = this.seekZero;
       this.flag = 3
       this.openConfirm = true;
       this.isPay = true