切换门店

app-hd/controllers/OrderController.php

@@ -542,7 +542,7 @@ class OrderController extends BaseController
             $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
         $list = OrderService::getOrderList($where);
-        $list['asset'] = MerchantAssetService::getByMerchantId($this->sjId);
+        $list['shop'] = $this->shop;
         util::success($list);
     }
 

biz-hd/order/classes/OrderClass.php

@@ -197,7 +197,6 @@ class OrderClass extends BaseClass
 
         $shopId = $order->shopId;
         $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
-        $shop->finishOrder += 1;
         $shop->unSendOrder += 1;
         $shop->unPayOrder -= 1;
         $shop->save();

biz/shop/classes/ShopAdminClass.php

@@ -18,9 +18,9 @@ class ShopAdminClass extends BaseClass
     const GENERATE_ADMIN_DATA = 'generate_admin_data_';//创建管理员需要的数据
 
     //添加客户 ssh 2021.3.1
-    public static function addShopAdmin($data)
+    public static function addShopAdmin($data, $returnObj = false)
     {
-        return self::add($data);
+        return self::add($data, $returnObj);
     }
 
     //创建管理准备数据key ssh 2020.4.17
@@ -127,7 +127,8 @@ class ShopAdminClass extends BaseClass
             'merchantId' => $sjId,
             'super' => $super
         ];
-        return self::addShopAdmin($data);
+        $return = self::addShopAdmin($data, true);
+        return $return->attribute;
     }
 
     //员工收款通知 shish 2021.4.19