shish il y a 4 ans
Parent
commit
4884624428

+ 1 - 1
app-ghs/controllers/AdminController.php

@@ -65,7 +65,7 @@ class AdminController extends BaseController
         $this->admin->clientId = $id;
         $this->admin->save();
         noticeUtil::push("保存客户端ID:" . $id, '15280215347');
-        util::complete(); 
+        util::complete();
     }
 
     //修改密码 ssh 20220106

+ 3 - 3
biz/stat/classes/StatStockOutClass.php

@@ -21,11 +21,11 @@ class StatStockOutClass extends BaseClass
     public static function replace($main, $shop, $amount)
     {
         $sjId = $shop->sjId;
-        $shopId = $shop->id;
+        $mainId = $main->id ?? 0;
         $time = date('Ymd');
-        $stat = self::getByCondition(['sjId' => $sjId, 'shopId' => $shopId, 'time' => $time], true);
+        $stat = self::getByCondition(['sjId' => $sjId, 'mainId' => $mainId, 'time' => $time], true);
         if (empty($stat)) {
-            $stat = self::add(['shopId' => $shopId, 'sjId' => $sjId, 'time' => $time], true);
+            $stat = self::add(['sjId' => $sjId, 'time' => $time, 'mainId' => $mainId], true);
         }
         $id = $stat->id;
         $unique = self::getLockById($id);