From 0ff53aa4a79f741e34a57f6eea076e5f19eee209 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 22 Jun 2024 13:37:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=BB=99=E5=95=86=E5=AE=B6=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 9d083d17d..76629fe17 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -399,12 +399,14 @@ class PayNotifyLogic extends BaseLogic
         if ($deposit > 0) {
             if ($deposit > $store_profit) {
                 if ($store_profit > 0) {
+                    SystemStore::where('id',$order['store_id'])->inc('paid_deposit',$store_profit)->update();
                     $financeLogic->out($transaction_id, $store_profit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
                     $financeLogic->in($transaction_id, 0, OrderEnum::MERCHANT_ORDER_OBTAINS, $order['store_id'], 0, 0, $order['pay_type']);  //平台手续费
                 }
             } else {
                 $money = bcsub($store_profit, $deposit, 2);
                 if ($deposit > 0) {
+                    SystemStore::where('id',$order['store_id'])->inc('paid_deposit',$deposit)->update();
                     $financeLogic->out($transaction_id, $deposit, OrderEnum::ORDER_MARGIN, $order['store_id'], $order['staff_id'], 0, $order['pay_type']);
                 }
                 if ($money) {

From ca6734a647e1b48effa69f33a80b2ebbe6951d0f Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Sat, 22 Jun 2024 13:39:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/store_product/StoreProductLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index df8425a58..1a0e41865 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -178,7 +178,7 @@ class StoreProductLogic extends BaseLogic
             //修改
             StoreBranchProduct::where('product_id', $params['id'])->update([
                 'price' => $params['price'], 'vip_price' => $params['vip_price'],
-                'cost' => $params['cost'],
+                'cost' => $params['cost'],'unit'=>$params['unit'],
                 'batch'=>$params['batch'],'store_name'=>$params['store_name'],
                 'manufacturer_information' => $params['manufacturer_information']??'',
             ]);