Merge branch 'master' into zhongqi-optimize

app-ghs/controllers/TestController.php

@@ -814,10 +814,10 @@ class TestController extends BaseController
 
     public function actionClearQuery()
     {
-        $shopId = 10649;
+        $shopId = 31805;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
-            util::stop('没有找到门店20');
+            util::stop('没有找到门店信息呢');
         }
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
@@ -830,7 +830,7 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CL29336665';
+        $orderSn = 'CL29366459';
         $queryParams = [
             'orderSn' => $orderSn,
             //'tradeNo' => '66222923861204',

biz-ghs/order/classes/OrderClass.php

@@ -3157,6 +3157,7 @@ XL;
                 }
             }
         }
+        //noticeUtil::push("orderIds = {$sameTimeIdsStr}, sameTimeIdsStr: {$sameTimeIdsStr}");
     }
 
 }

biz-ghs/order/services/OrderService.php

@@ -266,8 +266,19 @@ class OrderService extends BaseService
             $purchaseData['modifyPrice'] = $data['modifyPrice'];
         }
         $purchase = PurchaseClass::addPurchase($purchaseData, $ghs);
-        $purchaseId = $purchase->id ?? 0;
 
+        //开历史订单
+        $historyDate = $data['historyDate'] ?? '';
+        if (!empty($historyDate)) {
+            $currentPayTime = $historyDate . ' 12:00:00';
+            $returnOrder->payTime = $currentPayTime;
+
+            $purchase->payTime = $currentPayTime;
+            $purchase->save();
+            CustomDebtChangeClass::updateByCondition(['capitalType' => 10, 'relateId' => $returnOrder->id], ['payTime' => $currentPayTime]);
+        }
+
+        $purchaseId = $purchase->id ?? 0;
         $returnOrder->purchaseId = $purchaseId;
         $returnOrder->save();
 
@@ -298,18 +309,13 @@ class OrderService extends BaseService
             self::payAfter($returnOrder, $payWay);
 
             //开历史订单
-            $historyDate = $data['historyDate'] ?? '';
             if (!empty($historyDate)) {
-                $currentPayTime = $historyDate . ' 12:00:00';
-                $purchase->payTime = $currentPayTime;
-                $purchase->save();
-                $returnOrder->payTime = $currentPayTime;
-                $returnOrder->save();
+                //$returnOrder->payTime = $currentPayTime;
+                //$returnOrder->save();
                 //有修改账单日期需要更新到欠款变动明细，财务好对账，多个地方要同步修改，关键词 to_change_custom_debt_pay_time
-                CustomDebtChangeClass::updateByCondition(['capitalType' => 10, 'relateId' => $returnOrder->id], ['payTime' => $currentPayTime]);
 
                 //找到当前订单客户的账单日期为 $date 的所有订单，然后更新同天内的所有订单的 sameTimeIds（加此次要改变的订单的订单号$id），有多处调用，关键词 update_same_ids
-                OrderClass::updateSameTimeIds($returnOrder, $historyDate);
+                //OrderClass::updateSameTimeIds($returnOrder, $historyDate);
             }
 
             //不是预订单，并且供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、海翔，则订单直接完成掉。是预订单，则确认发货时直接完成掉。有多个地方要修改，请搜索关键词zjFinish
@@ -865,7 +871,9 @@ class OrderService extends BaseService
             $order->debtPrice = $order->orderPrice ?? 0;
         }
         $order->payStatus = 1;
-        $order->payTime = date("Y-m-d H:i:s");
+        if (!isset($order->payTime) || $order->payTime == '0000-00-00 00:00:00') {
+            $order->payTime = date("Y-m-d H:i:s");
+        }
         $order->save();
 
         //新订单进入队列，用于花材的销量统计
@@ -902,8 +910,7 @@ class OrderService extends BaseService
         StatKhCgClass::replace($order, $amount);
 
         //当天同个人同地址的订单汇总
-        OrderClass::updateSameTimeIds($order, date("Y-m-d"));
-
+        OrderClass::updateSameTimeIds($order, substr($order->payTime, 0, 10));
     }
 
     //发起退款