From f6b6423fbb6dcc3608ec6dd996a4891fba8576fb Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 15 Aug 2024 17:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=94=9F=E6=B4=BB=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BB=93=E8=B4=A6=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/shop/LocalStoreLogic.php   | 11 +++++------
 app/admin/view/shop/local_store/order.html |  8 ++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/admin/logic/shop/LocalStoreLogic.php b/app/admin/logic/shop/LocalStoreLogic.php
index 8a14ef24..1f5e5850 100755
--- a/app/admin/logic/shop/LocalStoreLogic.php
+++ b/app/admin/logic/shop/LocalStoreLogic.php
@@ -152,15 +152,14 @@ class LocalStoreLogic extends Logic
             foreach ($lists as &$v) {
                 $v['bank_card'] = $v['bank_card'] . ' ';
                 $v['large_number'] = $v['large_number'] . ' ';
-                if ($v['payment_type'] == 1) {
-                    $v['payment_type'] = self::$PAYMENT_TYPE[$v['payment_type']];
-                } else {
-                    // 对私银行账户
+                if ($v['payment_type'] == 2) {
                     $res = LocalStore::where('lstore_id', $v['lstore_id'])->field('bank_user_name')->find();
-                    $v['payment_type'] = $res['bank_user_name'];
+                    $v['account_name'] = $res['bank_user_name'];
                 }
-            }
+                $v['payment_type'] = self::$PAYMENT_TYPE[$v['payment_type']];
 
+            }
+   
             $excelFields = [
                 'payment_type' => '收款方类型',
                 'account_name' => '户名',
diff --git a/app/admin/view/shop/local_store/order.html b/app/admin/view/shop/local_store/order.html
index 9e129ae5..8a144ffd 100755
--- a/app/admin/view/shop/local_store/order.html
+++ b/app/admin/view/shop/local_store/order.html
@@ -25,6 +25,13 @@
             </div>
 
             <table id="like-table-lists" lay-filter="like-table-lists"></table>
+            <script type="text/html" id="is-checkout">
+                {{#  if(d.is_checkout == 1){ }}
+                    <span style="font-weight: bold;color: green;">已结账</span>
+                {{#  } else { }}
+                    未结账
+                {{#  } }}
+            </script>
         </div>
     </div>
 </div>
@@ -41,6 +48,7 @@
             , {field: "bank_card", width: 240, align: "center", title: "银行卡号"}
             , {field: "large_number", width: 300, align: "center", title: "大额行号"}
             , {field: "separate_account", width: 300, align: "center", title: "分账金额"}
+            , {field: "is_checkout", width: 300, align: "center", title: "是否结账", templet: '#is-checkout'}
             , {field: "tips", width: 300, align: "center", title: "交易附言"}
             , {field: "notes", width: 300, align: "center", title: "备注"}
             , {field: "create_time", width: 300, align: "center", title: "创建时间"}