恢复订单下单

biz-ghs/order/classes/OrderClass.php

@@ -4,6 +4,7 @@ namespace bizGhs\order\classes;
 
 use biz\express\classes\ExpressClass;
 use biz\shop\classes\ShopClass;
+use biz\shop\models\Shop;
 use biz\shop\services\ShopService;
 use biz\sj\classes\MerchantClass;
 use bizGhs\express\services\DadaExpressServices;
@@ -94,8 +95,7 @@ class OrderClass extends BaseClass
         $data['actPrice'] = $respond['price'] ?? 0;
 
         //将花店每月的总订单数作为编号
-        $riseNum = StatOrderCountClass::addOrder($month, $sjId);
-        $data['sendNum'] = $riseNum;
+        $data['sendNum'] = StatOrderCountClass::addOrder($month, $sjId);
         $data['sendTime'] = isset($data['sendTime']) && !empty($data['sendTime']) ? $data['sendTime'] : '0000-00-00 00:00:00';
         //订单30分钟后过期
         $data['deadline'] = date("Y-m-d H:i:s", (time() + 1800));
@@ -109,17 +109,12 @@ class OrderClass extends BaseClass
             $weight = bcadd($w, $weight, 2);
         }
         $data['weight'] = $weight;
-        $return = self::add($data);
 
-        //当天收入，当月收入，总收入，总订单+1
-        StatIncomeClass::updateOrInsert($return['merchantId'], $return['shopId'], $return['actPrice']);
-        StatIncomeMonthClass::updateOrInsert($return['merchantId'], $return['shopId'], $return['actPrice']);
-        ShopService::updateTotalIncome($return['shopId'], $return['actPrice']);
-        ShopService::totalOrderPlus($return['shopId']);
-        //今日订单+1
-        StatOrderClass::updateOrInsert($return['merchantId'], $return['shopId']);
-        //本月订单+1
-        StatOrderMonthClass::updateOrInsert($return['merchantId'], $return['shopId']);
+        //门店总订单数+1
+//        $shopId = $shop['id'];
+//        $shop = Shop::find()->select('*')->where("id = {$shopId} for update")->one();
+
+        $return = self::add($data);
 
         if ($customOrder == false) {
             //0正常订单 1欠款
@@ -140,7 +135,6 @@ class OrderClass extends BaseClass
                 OrderClass::withoutSend($return);
             }
         }
-
         return $return;
     }
 
@@ -524,23 +518,34 @@ class OrderClass extends BaseClass
 
         $shop['unSendOrder']++;
         $shop['unPayOrder']--;
-        $shop['payOrder']++;
+        $shop['totalOrderNum']++;
         $shop['totalIncome'] = bcadd($shop['totalIncome'], $amount, 2);
         $shopId = $shop['id'];
-        ShopClass::updateById($shopId, ['unSendOrder' => $shop['unSendOrder'], 'unPayOrder' => $shop['unPayOrder'], 'totalIncome' => $shop['totalIncome'], 'payOrder' => $shop['payOrder']]);
+        ShopClass::updateById($shopId, ['unSendOrder' => $shop['unSendOrder'], 'unPayOrder' => $shop['unPayOrder'], 'totalIncome' => $shop['totalIncome'], 'totalOrderNum' => $shop['totalOrderNum']]);
+
         $sjId = $order['merchantId'];
         $sjAsset = MerchantAssetClass::getByMerchantId($sjId);
         $sjAsset['unSendOrder']++;
         $sjAsset['unPayOrder']--;
-        $sjAsset['payOrder']++;
         $sjAsset['totalIncome'] = bcadd($sjAsset['totalIncome'], $amount, 2);
         MerchantAssetClass::updateByCondition(['merchantId' => $sjId], [
             'unSendOrder' => $sjAsset['unSendOrder'],
             'unPayOrder' => $sjAsset['unPayOrder'],
             'totalIncome' => $sjAsset['totalIncome'],
-            'payOrder' => $sjAsset['payOrder'],
         ]);
 
+//        //每天收入和每月收入
+//        StatIncomeClass::updateOrInsert($return['merchantId'], $return['shopId'], $return['actPrice']);
+//        StatIncomeMonthClass::updateOrInsert($return['merchantId'], $return['shopId'], $return['actPrice']);
+//        //门店总收入和总订单
+//        ShopService::updateTotalIncome($return['shopId'], $return['actPrice']);
+//        ShopService::totalOrderPlus($return['shopId']);
+//        //今日订单+1
+//        StatOrderClass::updateOrInsert($return['merchantId'], $return['shopId']);
+//        //本月订单+1
+//        StatOrderMonthClass::updateOrInsert($return['merchantId'], $return['shopId']);
+
+
         //增加已下单流程
         $time = date("Y-m-d H:i:s");
         $placeData = ['payTime' => $time, 'orderSn' => $orderSn];

biz-hd/stat/classes/StatOrderClass.php

@@ -18,9 +18,7 @@ class StatOrderClass extends BaseClass
             $stat = self::add(['merchantId' => $merchantId, 'time' => $date], true);
         }
         $stat->riseNum += 1;
-        $stat->totalNum = $asset['payOrder'] + 1;
         $stat->save();
-        Yii::info('多次日志？？？？？');
         //月订单数增加
         StatOrderMonthClass::addOrder($merchantId, $asset);
     }

biz-hd/stat/classes/StatOrderMonthClass.php

@@ -19,7 +19,6 @@ class StatOrderMonthClass extends BaseClass
             $stat = self::add(['merchantId' => $merchantId, 'time' => $month], true);
         }
         $stat->riseNum += 1;
-        $stat->totalNum = $asset['payOrder'] + 1;
         $stat->save();
     }
 

biz-mall/stat/classes/StatOrderClass.php

@@ -18,9 +18,7 @@ class StatOrderClass extends BaseClass
             $stat = self::add(['merchantId' => $merchantId, 'time' => $date], true);
         }
         $stat->riseNum += 1;
-        $stat->totalNum = $asset['payOrder'] + 1;
         $stat->save();
-        Yii::info('多次日志？？？？？');
         //月订单数增加
         StatOrderMonthClass::addOrder($merchantId, $asset);
     }

biz-mall/stat/classes/StatOrderMonthClass.php

@@ -19,7 +19,6 @@ class StatOrderMonthClass extends BaseClass
             $stat = self::add(['merchantId' => $merchantId, 'time' => $month], true);
         }
         $stat->riseNum += 1;
-        $stat->totalNum = $asset['payOrder'] + 1;
         $stat->save();
     }
 

common/services/xhPayToolService.php

@@ -253,12 +253,10 @@ class xhPayToolService
             $mTotalDeal = $mAsset['totalDeal'] + 1;//付款成功成交量+1
             $mUnSendOrder = $mAsset['unSendOrder'] + 1;//待配送订单+1
             $mUnPayOrder = $mAsset['unPayOrder'] - 1;//待付款订单-1
-            $mPayOrder = $mAsset['payOrder'] + 1;//付款订单+1
             $mUpdateData = [
                 'totalIncome' => $mIncome,
                 'usedRecharge' => $mUseRecharge,
                 'totalDeal' => $mTotalDeal,
-                'payOrder' => $mPayOrder,
                 'unPayOrder' => $mUnPayOrder,
                 'unSendOrder' => $mUnSendOrder,
             ];

sql.sql

@@ -2126,4 +2126,6 @@ ALTER TABLE xhStatIncomeMonth DROP INDEX `income`;
 ALTER TABLE xhStatIncome DROP INDEX `income`;
 ALTER TABLE xhAdmin ADD apply TINYINT NOT NULL DEFAULT 1 COMMENT '是否已申请开店 1没有 2有' AFTER `super`;
 ALTER TABLE xhAdmin MODIFY `apply` TINYINT NOT NULL DEFAULT 1 COMMENT '申请开店 1没有 2有申请，待审核 3有申请，已审核通过';
-ALTER TABLE `xhAdmin` CHANGE `apply` `openShop` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '申请开店 1没有 2有申请，待审核 3有申请，已审核通过';
+ALTER TABLE `xhAdmin` CHANGE `apply` `openShop` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '申请开店 1没有 2有申请，待审核 3有申请，已审核通过';
+ALTER TABLE `xhShop` CHANGE `payOrder` `totalOrderNum` INT(11) NOT NULL DEFAULT '0' COMMENT '总订单，只包括已付款订单，暂不考虑退款订单';
+ALTER TABLE xhSjAsset CHANGE `payOrder` `totalOrderNum` INT(11) NOT NULL DEFAULT '0' COMMENT '付款的总订单数，不考虑退款';