From 8bbf70a96cfa6e56f25363a3e75c823672df1404 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 24 Jan 2024 10:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Demo.php                  |  4 ----
 app/controller/api/store/order/StoreCart.php | 10 ++++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/controller/api/Demo.php b/app/controller/api/Demo.php
index f3517fe8..68b95bae 100644
--- a/app/controller/api/Demo.php
+++ b/app/controller/api/Demo.php
@@ -32,10 +32,6 @@ class Demo extends BaseController
 {
     public function index()
     {
-        $merchant = Db::name('merchant')->where('mer_id','>=',39)->where('long','<>','')->where('status',1)->select();
-        foreach($merchant as $k=>$v){
-            Db::name('store_spu')->where('mer_id',$v['mer_id'])->update(['long'=>$v['long'],'lat'=>$v['lat']]);
-        }
         return app('json')->success('修改成功');  
         //[31,32,118,39,167,236,237,238,239]
         // return app('json')->success('修改成功');>whereIn('mer_id',[110,116,149,227,226,35,117,148,156,104,137,151,136,183,140,229,79,133,235])->
diff --git a/app/controller/api/store/order/StoreCart.php b/app/controller/api/store/order/StoreCart.php
index f1122228..ad9775d9 100644
--- a/app/controller/api/store/order/StoreCart.php
+++ b/app/controller/api/store/order/StoreCart.php
@@ -123,11 +123,13 @@ class StoreCart extends BaseController
             //更新购物车
             $cart_id = $cart['cart_id'];
             $cart_num = ['cart_num' => ($cart['cart_num'] + $data['cart_num'])];
-            if ($entryMerId && $entryMerId != $result['product']['mer_id']) {
-                $cart_num['source_id'] = $entryMerId;
-                $cart_num['source'] = StoreCartDao::SOURCE_STORE_CLOUD;
+            if( $cart_num['source'] !=105){
+                if ($entryMerId && $entryMerId != $result['product']['mer_id']) {
+                    $cart_num['source_id'] = $entryMerId;
+                    $cart_num['source'] = StoreCartDao::SOURCE_STORE_CLOUD;
+                }
+                $storeCart = $this->repository->update($cart_id,$cart_num);
             }
-            $storeCart = $this->repository->update($cart_id,$cart_num);
         } else {
             //添加购物车
             $data['uid'] = $this->request->uid();