Merge branch 'zhongqi-optimize' of git.huaml.com:zhh/huahuibao into zhongqi-optimize

app-ghs/controllers/TestController.php

@@ -481,7 +481,8 @@ class TestController extends BaseController
             //['name' => '三明易批花', 'merchantNo' => '82239505992001X', 'wx' => [868630425, 868628086], 'zfb' => '2088380594855142'],
             //['name' => '厦门都市鲜花批发', 'merchantNo' => '8223930599200HZ', 'wx' => [854245016, 854244735], 'zfb' => '2088280333454097'],
             //['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
-            ['name' => '昆明花满仓', 'merchantNo' => '82273105992011D', 'wx' => [886442011, 886441824], 'zfb' => '2088480829650284'],
+            //['name' => '昆明花满仓', 'merchantNo' => '82273105992011D', 'wx' => [886442011, 886441824], 'zfb' => '2088480829650284'],
+            ['name' => '梅州紫荆鲜花批发', 'merchantNo' => '82259605992002Q', 'wx' => [888071609, 888012368], 'zfb' => '2088580120134569'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],
             //['name' => '东莞惠雅鲜花（南城店）', 'merchantNo' => '8226020599200JK', 'wx' => [802315656, 802315755], 'zfb' => '2088870583889365'],
             //['name' => '沈阳市云花鲜花批发-专业化扫码', 'merchantNo' => '8222210599200BT', 'wx' => [796180053], 'zfb' => '2088770820458908'],

app-mall/controllers/AuthController.php

@@ -154,6 +154,11 @@ class AuthController extends PublicController
         $cacheKey = 'MALL_MINI_SESSION_KEY_' . $miniOpenId;
         Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
         $userId = $user['id'] ?? 0;
+
+        if ($userId == 2) {
+            //$userId = 106904;
+        }
+
         $token = !empty($userId) ? jwt::getNewToken($userId) : '';
         util::success([
             'token' => $token,

biz-ghs/order/classes/OrderClass.php

@@ -93,7 +93,6 @@ class OrderClass extends BaseClass
     const SEND_STATUS_COMPLETED = 2; //已送达
     const SEND_STATUS_CANCEL = 3; //取消
 
-
     //订单总流程数
     const TOTAL_FLOW = 3;
 
@@ -3135,19 +3134,27 @@ XL;
         // 排序并去重
         sort($ids);
         $ids = array_unique($ids);
+        
+        // 限制最多 90 单，避免 someTimeIds 过长（兼容原先业务逻辑限制）
+        if (count($ids) > 90) {
+            $ids = array_slice($ids, 0, 90);
+        }
+        
         $sameTimeIdsStr = implode(',', $ids);
         // 更新所有相关订单
-        if (!empty($ids)) {
+        if (!empty($ids) && in_array($id, $ids)) {
             self::updateByIds($ids, ['sameTimeIds' => $sameTimeIdsStr]);
         }
 
         //从原先同天内的订单中删除此次要改变的订单的订单号$id
-        $oldSameTimeIdsArr = explode(',', $oldSameTimeIds);
-        if (in_array($id, $oldSameTimeIdsArr)) {
-            $oldSameTimeIdsArr = array_diff($oldSameTimeIdsArr, [$id]);
-            $oldSameTimeIdsStr = implode(',', $oldSameTimeIdsArr);
-            if (!empty($oldSameTimeIdsArr)) {
-                self::updateByIds($oldSameTimeIdsArr, ['sameTimeIds' => $oldSameTimeIdsStr]);
+        if (!empty($oldSameTimeIds) && $oldSameTimeIds != $sameTimeIdsStr) {
+            $oldSameTimeIdsArr = explode(',', $oldSameTimeIds);
+            if (in_array($id, $oldSameTimeIdsArr)) {
+                $oldSameTimeIdsArr = array_diff($oldSameTimeIdsArr, [$id]);
+                $oldSameTimeIdsStr = implode(',', $oldSameTimeIdsArr);
+                if (!empty($oldSameTimeIdsArr)) {
+                    self::updateByIds($oldSameTimeIdsArr, ['sameTimeIds' => $oldSameTimeIdsStr]);
+                }
             }
         }
     }

biz-ghs/order/services/OrderService.php

@@ -902,27 +902,7 @@ class OrderService extends BaseService
         StatKhCgClass::replace($order, $amount);
 
         //当天同个人同地址的订单汇总
-        $sameDate = date("Y_m_d");
-        $sameAddress = $order->showAddress ?? '';
-        $addressMd5 = md5($sameAddress);
-        $sameKey = $customId . '_' . $addressMd5 . '_' . $sameDate;
-        $sameString = Yii::$app->redis->executeCommand('GET', [$sameKey]);
-        if (!empty($sameString)) {
-            $newString = $sameString . ',' . $orderId;
-            $newIdsArray = explode(',', $newString);
-            if (count($newIdsArray) <= 90) {
-                Yii::$app->redis->executeCommand('SETEX', [$sameKey, 186400, $newString]);
-                foreach ($newIdsArray as $currentOrderId) {
-                    OrderClass::updateById($currentOrderId, ['sameTimeIds' => $newString]);
-                }
-                //noticeUtil::push($sameKey . '' . $sameAddress . " 当天汇总ids:" . $newString, '15280215347');
-            }
-        } else {
-            Yii::$app->redis->executeCommand('SETEX', [$sameKey, 186400, $orderId]);
-            $order->sameTimeIds = $orderId;
-            $order->save();
-            //noticeUtil::push($sameKey . '' . $sameAddress . " 当天汇总ids:" . $orderId, '15280215347');
-        }
+        OrderClass::updateSameTimeIds($order, date("Y-m-d"));
 
     }
 
@@ -1009,4 +989,4 @@ class OrderService extends BaseService
         return $saleRefund;
     }
 
-}
+}