Jelajahi Sumber

订单生成方式调整

shish 5 tahun lalu
induk
melakukan
b8cffadae3

+ 5 - 0
app-ghs/controllers/OrderController.php

@@ -2,6 +2,7 @@
 
 namespace ghs\controllers;
 
+use biz\stat\classes\StatOrderCountClass;
 use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\classes\StockWastageOrderClass;
 use bizHd\purchase\classes\PurchaseClass;
@@ -149,6 +150,10 @@ class OrderController extends BaseController
             //判断花材有效性
             ProductClass::valid($productList, $this->shopId);
             $post['product'] = $productList;
+
+            //将花店每天的总订单数作为编号
+            $post['sendNum'] = StatOrderCountClass::addOrder($this->shop);
+
             $return = OrderService::createOrder($post, $custom);
             $transaction->commit();
             util::success($return);

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

@@ -7,6 +7,7 @@ use biz\shop\classes\ShopClass;
 use biz\shop\classes\ShopExtClass;
 use biz\shop\models\Shop;
 use biz\sj\classes\SjClass;
+use biz\stat\classes\StatOrderCountClass;
 use bizGhs\custom\models\Custom;
 use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\models\Order;
@@ -14,7 +15,6 @@ use bizGhs\order\traits\OrderTrait;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\admin\classes\AdminClass;
 use bizGhs\custom\classes\CustomClass;
-use bizGhs\stat\classes\StatOrderCountClass;
 use bizGhs\stat\classes\StatYjClass;
 use bizGhs\stock\classes\StockRecordClass;
 use bizGhs\stock\services\StockRecordService;
@@ -107,7 +107,6 @@ class OrderClass extends BaseClass
     public static function addOrder($data)
     {
         $sjId = $data['sjId'] ?? 0;
-        $month = date("Ym");
         $orderSn = orderSn::getGhsOrderSn();
         $data['orderSn'] = $orderSn;
         $data['payStatus'] = self::PAY_STATUS_UN_PAY;
@@ -147,8 +146,6 @@ class OrderClass extends BaseClass
             $data['realPrice'] = bcsub($currentPrice, $discountAmount, 2);
         }
 
-        //将花店每月的总   订单数作为编号
-        $data['sendNum'] = StatOrderCountClass::addOrder($month, $sjId);
         $data['sendTime'] = isset($data['sendTime']) && !empty($data['sendTime']) ? $data['sendTime'] : '0000-00-00 00:00:00';
         //订单有效期
         $validTime = dict::getDict('sale_purchase_order_valid');

+ 0 - 15
biz-ghs/stat/classes/StatOrderCountClass.php

@@ -8,19 +8,4 @@ use bizGhs\base\classes\BaseClass;
 class StatOrderCountClass extends BaseClass
 {
 
-    public static $baseFile = '\bizGhs\stat\models\StatOrderCount';
-
-    public static function addOrder($month, $sjId)
-    {
-        $count = self::getByCondition(['sjId' => $sjId, 'time' => $month], true);
-        if (empty($count)) {
-            $data = ['time' => $month, 'riseNum' => 0, 'totalNum' => 0, 'sjId' => $sjId];
-            $count = self::add($data, true);
-        }
-        $count->riseNum += 1;
-        $count->totalNum += 1;
-        $count->save();
-        return $count->riseNum;
-    }
-
 }

+ 2 - 2
biz/stat/classes/StatOrderCountClass.php

@@ -10,10 +10,10 @@ class StatOrderCountClass extends BaseClass
 
     public static $baseFile = '\biz\stat\models\StatOrderCount';
 
-    //月订单+1
+    //每天订单
     public static function addOrder($shop)
     {
-        $time = date('Ym');
+        $time = date('Ymd');
         $shopId = $shop->id;
         $sjId = $shop->sjId;
         $where = [