Browse Source

花材统计

shish 4 years ago
parent
commit
a7d08cff9a

+ 1 - 1
biz-ghs/order/classes/OrderClass.php

@@ -1038,7 +1038,7 @@ class OrderClass extends BaseClass
                 }
                 $list = OrderClass::getAllByCondition(['id' => ['in', $ids]], null, '*', null, true);
                 if (empty($list)) {
-                    return false;
+                    continue;
                 }
                 foreach ($list as $key => $order) {
                     $orderSn = $order->orderSn ?? '';

+ 2 - 3
biz/stat/classes/StatItemClass.php

@@ -15,7 +15,7 @@ class StatItemClass extends BaseClass
     public static function replace($item, $date = null)
     {
         $sjId = $item->sjId ?? 0;
-        $shopId = $item->id ?? 0;
+        $shopId = $item->shopId ?? 0;
         $productId = $item->productId ?? 0;
         $time = $date == null ? date('Ymd') : $date;
         $stat = self::getByCondition(['sjId' => $sjId, 'shopId' => $shopId, 'itemId' => $productId, 'time' => $time], true);
@@ -25,7 +25,6 @@ class StatItemClass extends BaseClass
         $id = $stat->id;
         $unique = self::getLockById($id);
 
-
         $amount = $item->price ?? 0;
         $num = $item->num ?? 0;
 
@@ -36,7 +35,7 @@ class StatItemClass extends BaseClass
         $unique->amount = $currentAmount;
 
         $unique->save();
-        StatItemMonthClass::replace($amount, $time);
+        StatItemMonthClass::replace($item, $time);
     }
 
 }

+ 1 - 1
biz/stat/classes/StatItemMonthClass.php

@@ -25,7 +25,7 @@ class StatItemMonthClass extends BaseClass
             $month = date('m', $timestamp);
         }
         $sjId = $item->sjId ?? 0;
-        $shopId = $item->id ?? 0;
+        $shopId = $item->shopId ?? 0;
         $productId = $item->productId ?? 0;
         $stat = self::getByCondition(['sjId' => $sjId, 'shopId' => $shopId, 'itemId' => $productId, 'time' => $time], true);
         if (empty($stat)) {

+ 3 - 2
console/controllers/GlobalController.php

@@ -23,10 +23,11 @@ class GlobalController extends Controller
             ProductClass::allShopStockWarningFromQueue();
         }
 
-        //每三分钟进行一次完成订单的花材统计
+        //每三分钟进行一次完成订单的流程处理,现在有:花材统计
         if ((int)date('i') % 3 == 0) {
-            OrderClass::newOrderFromQueueDone();
+
         }
+        OrderClass::newOrderFromQueueDone();
 
     }