From 8b3bb6ecde3888a0871341ce7f442bd83312ed68 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 27 Jun 2025 10:55:11 +0800
Subject: [PATCH] vtest 1.1.71 & fixed md0612

---
 src/subpackage/common/pages/pay_type_select.vue    |  4 +-
 src/subpackage/order/js/api.js                     |  1 +
 .../pages/timekeeping/modules/order_list/site.vue  | 58 ++++++++++++++++++++--
 .../order/pages/timekeeping/order_detail/site.vue  |  4 ++
 .../order/pages/timekeeping/order_list.vue         |  7 ++-
 5 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue
index 60ea767..ec2f3b2 100644
--- a/src/subpackage/common/pages/pay_type_select.vue
+++ b/src/subpackage/common/pages/pay_type_select.vue
@@ -137,7 +137,9 @@ export default {
         const eventChannel = this.getOpenerEventChannel();
         //  md0612 支付订单需求
          eventChannel.on('emitFromSiteOrder', async data =>{
-            this.depositOrderInfo = data?.depositInfo ?? null;
+            let _dpInfo = data?.depositInfo || null;
+            this.depositOrderInfo = _dpInfo;
+            if(_dpInfo?.order_no)this.payMethodsID = 5;
         })
     },
     methods: {
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index aafc3db..cacf445 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -58,6 +58,7 @@ export const ORDER_API = {
 	// md 250612
     orderPayinfo: `${ORIGIN}/admin/assistant/billing/order/payinfo`,  // 【1001429】【收银系统】场时 - 支付信息
     orderPay: `${ORIGIN}/admin/assistant/billing/order/pay`,  // 【1001429】【收银系统】场时 - 支付
+    orderBfuend: `${ORIGIN}/admin/assistant/billing/order/bfuend`,  // 【1001984】【商家助手】- 场时 - 用前结算结束订单
 	
 }
 
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
index 03ebd2d..3adf366 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
@@ -28,6 +28,7 @@
             <view class="lc-btns">
                 <view class="lb-item" v-if="order.status_text === '待使用'" @click.stop="cancelBtn">取消预约</view>
                 <view class="lb-item" v-if="order.status_text === '计费中'" @click.stop="endBilling">结束计费</view>
+                <view class="lb-item" v-if="order.status_text === '使用中'&&order.settlement_type === 1" @click.stop="endEarly">提前结束订单</view>
             </view>
         </template>
     </list-item-temp>
@@ -36,7 +37,10 @@
 <script>
 import kvLine from "../../../../components/kv_line.vue";
 import listItemTemp from "./item_temp.vue";
-import { routeTo } from '@/utils/util';
+import { routeTo, showModal, showLoad, hideLoad } from '@/utils/util';
+
+import { ORDER_API } from '../../../../js/api';
+import server from '../../../../js/server';
 export default {
     props: {
         order: {
@@ -60,7 +64,55 @@ export default {
         cancelBtn(){
             let { order } = this;
             routeTo(`/subpackage/order/pages/timekeeping/order_detail/site?order_no=${order?.order_no || ''}&brand_id=${order?.brand_id || ''}&is_end=2`, 'nT');
-        }
+        },
+        endEarly(){
+            showModal({
+                title: '是否确认结束订单',
+                content: '结束订单操作不可逆，请谨慎操作！\n结束订单后，设备将关闭！\n如若有剩余可用时间将不会退款！',
+                showCancel: true,
+                confirmText: '确认',
+                cancelText: '取消',
+                success: async res => {
+                    if (res.confirm) {
+                        let { order } = this;
+                        let _obeRes = await this.orderBfuend({
+                            brand_id: order?.brand_id ?? '',
+                            order_no: order?.order_no ?? ''
+                        });
+                        if(_obeRes === 'success'){
+                            this.$emit('click:endearly', {
+                                ...order,
+                                status_text: '已完成',
+                            });
+                        }
+                        
+
+                    }
+                }
+            })
+        },
+        orderBfuend({ brand_id, order_no }){
+            showLoad();
+            return server.post({
+                url: ORDER_API.orderBfuend,
+                data: { brand_id, order_no },
+                isDefaultGet: false
+            })
+            .then(res =>{
+                hideLoad();
+                if(res.data.code == 0){
+                    console.log(res);
+                    return 'success'
+                }else{
+                    return Promise.reject(res);
+                }
+            })
+            .catch(err =>{
+                hideLoad();
+                showModal({ content: err?.data?.message ?? '操作失败！' });
+                console.warn('subpackage order timekeeping modules order list site err -->', err);
+            })
+        },
     }
 }
 </script>
@@ -80,7 +132,7 @@ export default {
         margin-top: 24upx;
         @include ctf(flex-end);
         .lb-item{
-            width: 192upx;
+            padding: 0 20upx;
             height: 80upx;
             text-align: center;
             border-radius: 10upx;
diff --git a/src/subpackage/order/pages/timekeeping/order_detail/site.vue b/src/subpackage/order/pages/timekeeping/order_detail/site.vue
index a8e34ab..74cba73 100644
--- a/src/subpackage/order/pages/timekeeping/order_detail/site.vue
+++ b/src/subpackage/order/pages/timekeeping/order_detail/site.vue
@@ -36,6 +36,10 @@
                     <kvs-line label="金额小计">¥{{ orderInfo.amount || '0' }}</kvs-line>
                     <kvs-line label="折扣金额">-¥{{ orderInfo.discount_amount || '0' }}</kvs-line>
                     <kvs-line label="积分抵扣">-¥{{ orderInfo.deduction_amount || '0' }}</kvs-line>
+                    <kvs-line v-if="orderInfo.deposit_deduction_amount" label="押金抵扣">-¥{{ orderInfo.deposit_deduction_amount || '0' }}</kvs-line>
+                    <kvs-line v-if="orderInfo.extension&&orderInfo.extension.meituan_args&&orderInfo.extension.meituan_args.meituan_coupon_deduction_amount" label="团购券抵扣">
+                        -¥{{ orderInfo.extension.meituan_args.meituan_coupon_deduction_amount || '0' }}
+                    </kvs-line>
                     <kvs-line label="优惠券优惠">-¥{{ orderInfo.coupons_amount || '0' }}</kvs-line>
                 </view>
                 <view class="od-total">
diff --git a/src/subpackage/order/pages/timekeeping/order_list.vue b/src/subpackage/order/pages/timekeeping/order_list.vue
index ce02e6d..1de2ebd 100644
--- a/src/subpackage/order/pages/timekeeping/order_list.vue
+++ b/src/subpackage/order/pages/timekeeping/order_list.vue
@@ -14,7 +14,7 @@
         <view class="tol-list">
             <block v-for="(e, i) in orderList" :key="i">
                 <view class="tl-item" v-if="e.order_type === 1">
-                    <site-list-item :order="e"></site-list-item>
+                    <site-list-item @click:endearly="siteOrderEndEarly($event, i)" :order="e"></site-list-item>
                 </view>
                 <view class="tl-item" v-if="e.order_type === 2">
                     <person-list-item :order="e"></person-list-item>
@@ -123,6 +123,11 @@ export default {
         })
     },
     methods: {
+        // 场地计时订单提前结束
+        siteOrderEndEarly(e, idx){
+            this.orderList[idx] = e;
+            this.$nextTick(this.$forceUpdate);
+        },
         // 搜索订单
         searchOrder(){
             let { brand_id, order_type } = this;