Merge branch 'master' into dev

app-mall/controllers/OrderController.php

@@ -848,6 +848,10 @@ class OrderController extends BaseController
     {
         $id = Yii::$app->request->get('id', 0);
         $detail = OrderClass::getOrderById($id);
+        $userId = $this->userId;
+        if ($detail['userId'] != $userId) {
+            util::fail('不是你的单，不能查看');
+        }
 
         $shOrderMap = [];
         if ($detail['hasForward'] == 1) {

biz-hd/custom/classes/CustomClass.php

@@ -169,7 +169,7 @@ class CustomClass extends BaseClass
         if (empty($hd)) {
             util::fail('花店信息缺失，编号6331');
         }
-
+        $hdName = $hd->name ?? '';
         if ($custom->balance > 0) {
             if ($amount >= $custom->balance) {
                 $clearAmount = $custom->balance;
@@ -216,6 +216,8 @@ class CustomClass extends BaseClass
         $side = 0;
         $payWay = 0;
         $change = [
+            'hdId' => $hdId,
+            'hdName' => $hdName,
             'customId' => $customId,
             'customName' => $customName,
             'relateId' => $relateId,

biz-hd/order/classes/OrderClass.php

@@ -508,13 +508,13 @@ class OrderClass extends BaseClass
         ];
         ShopCapitalClass::addCapital($capital);
         //每天和每月收入增加
-        StatIncomeClass::updateOrInsert($main, $shop, $realPrice);
+        //StatIncomeClass::updateOrInsert($main, $shop, $realPrice);
         //今日订单+1
-        StatOrderClass::updateOrInsert($main, $shop);
+        //StatOrderClass::updateOrInsert($main, $shop);
         //销售收入增加
-        StatSaleClass::replace($main, $shop, $realPrice);
+        //StatSaleClass::replace($main, $shop, $realPrice);
         //各渠道收入金额统计
-        StatKdClass::replace($shop, $realPrice, $payWay);
+        //StatKdClass::replace($shop, $realPrice, $payWay);
 
         //当天同个人同地址的订单汇总
         $sameDate = date("Y_m_d");
@@ -550,7 +550,7 @@ class OrderClass extends BaseClass
             CustomClass::payToChangeBalance($order);
         }
 
-        //有尾款或全部欠款时
+        //有欠款时
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
             if (isset($order->remainDebtPrice) && $order->remainDebtPrice > 0) {
                 $newCustom = CustomClass::getLockById($customId);