From 02aa52cd3f6696dbb6890ea85022b8488f25a31c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 22 Jul 2024 17:03:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0'receipts'=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php  | 1 +
 app/api/lists/product/ProductLists.php                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php b/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php
index 38d5fb657..a8a1b4c24 100644
--- a/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php
+++ b/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php
@@ -55,6 +55,7 @@ class StoreCashFinanceFlowLogic extends BaseLogic
         try {
             StoreCashFinanceFlow::where('id', $params['id'])->update([
                 'file' => $params['file'],
+                'receipts' => $params['receipts']??0,
                 'status'=>1,
                 'admin_id'=>$params['admin_id'],
             ]);
diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index d0b0a86c3..d15d822f2 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -92,6 +92,7 @@ class ProductLists extends BaseApiDataLists implements ListsSearchInterface, Lis
         } elseif ($this->userId > 0) {
             $uid = $this->userId;
         }
+        $user_ship=-1;
         if ($uid > 0) {
             $user_ship = User::where('id', $uid)->value('user_ship');
             if (in_array($user_ship, [4, 6, 7])) {