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

app-ghs/controllers/ConsoleController.php

@@ -50,7 +50,7 @@ class ConsoleController extends BaseController
         $overview = [
             ['name' => "库存数", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
             ['name' => "库存值", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
-            ['name' => "应收款", "url" => '', 'value' => $may, 'type' => 1],
+            ['name' => "应收款", "url" => '/admin/shop/debtChange', 'value' => $may, 'type' => 1],
             ['name' => "未命名", "url" => '/admin/home/member', 'value' => 0, 'type' => 4],
             ['name' => "总访客", "url" => '/admin/home/member', 'value' => 0, 'type' => 4],
             ['name' => "总订单", "url" => '/admin/home/order', 'value' => 0, 'type' => 4],

app-ghs/controllers/TestController.php

@@ -504,7 +504,8 @@ class TestController extends BaseController
             //['name' => '莆田我要花', 'merchantNo' => '82239405992009K', 'wx' => [900215179, 900215380], 'zfb' => '2088780157526852'],
             //['name' => '广州福隆花卉', 'merchantNo' => '8225810599201T8', 'wx' => [900532403, 900531348], 'zfb' => '2088780172288658'],
             //['name' => '张家口万花汇', 'merchantNo' => '82213805992008D', 'wx' => [901551070, 901551037], 'zfb' => '2088780253600870'],
-            ['name' => '深圳每日鲜花批发', 'merchantNo' => '82258405992020E', 'wx' => [902309136, 902307468], 'zfb' => '2088780298610704'],
+            //['name' => '深圳每日鲜花批发', 'merchantNo' => '82258405992020E', 'wx' => [902309136, 902307468], 'zfb' => '2088780298610704'],
+            ['name' => '滨州花镜鲜花', 'merchantNo' => '82246605992005U', 'wx' => [904373612, 904373338], 'zfb' => '2088780426621723'],
             //['name' => '厦门纯彩花艺', 'merchantNo' => '8223930599200LD', 'wx' => [894984230, 894983290], 'zfb' => '2088680439152343'],
             //['name' => '东莞我要花鲜花', 'merchantNo' => '8226020599200R8', 'wx' => [894794554, 894794917], 'zfb' => '2088680405463378'],
             //['name' => '镇江花珩鲜花批发', 'merchantNo' => '82231405992003N', 'wx' => [894925711, 894925626], 'zfb' => '2088680426877183'],

biz-ghs/order/classes/OrderClass.php

@@ -1949,6 +1949,11 @@ class OrderClass extends BaseClass
                 $showPrice = 0;
             }
 
+            //义乌我要花 不带价格
+            if (isset($orderInfo->mainId) && $orderInfo->mainId == 83694) {
+                $showPrice = 0;
+            }
+
             //衡阳昕得鲜花批发，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 85744) {
                 if (!empty($orderInfo->customShopAdminId)) {
@@ -3074,7 +3079,7 @@ XL;
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $order->mainId;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644, 10652, 2084, 89473];
+            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644, 10652, 2084, 89473,83694];
         } else {
             $map = [828];
         }
@@ -3099,7 +3104,7 @@ XL;
             }
         }
         //东莞我要花 手机后四号变星号
-        if (in_array((int)$orderMainId, [2644, 10652, 2084, 89473], true)) {
+        if (in_array((int)$orderMainId, [2644, 10652, 89473], true)) {
             $customMobile = preg_replace('/(.{4})$/u', '****', trim($customMobile));
         }
         $customName = $order->customName ?? '';

biz-ghs/order/classes/OrderItemClass.php

@@ -339,6 +339,48 @@ class OrderItemClass extends BaseClass
         $products = $respond['product'];
         $weight = 0;
         $mainId = $post['mainId'] ?? 0;
+
+        // --- 开始：死锁预防机制 ---
+        // 为了防止在高并发场景下，不同订单包含相同商品但顺序不同导致交叉死锁
+        // 我们提前提取所有涉及的花材ID，按照ID升序排列后统一加锁（SELECT FOR UPDATE）
+        if ($stockMayChange == true) {
+            $lockProductIds = [];
+            foreach ($products as $p) {
+                if (!empty($p['productId'])) {
+                    $lockProductIds[] = $p['productId'];
+                }
+            }
+            if (!empty($lockProductIds)) {
+                $lockProductIds = array_unique($lockProductIds);
+                sort($lockProductIds);
+                foreach ($lockProductIds as $lockPId) {
+                    ProductClass::getLockById($lockPId);
+                }
+            }
+            
+            // 同样为多颜色(xj)库存扣减做死锁预防
+            if (!empty($post['xj']) && is_array($post['xj'])) {
+                $lockXjIds = [];
+                foreach ($post['xj'] as $xjArr) {
+                    if (is_array($xjArr)) {
+                        foreach ($xjArr as $xjItem) {
+                            if (!empty($xjItem['id'])) {
+                                $lockXjIds[] = $xjItem['id'];
+                            }
+                        }
+                    }
+                }
+                if (!empty($lockXjIds)) {
+                    $lockXjIds = array_unique($lockXjIds);
+                    sort($lockXjIds);
+                    foreach ($lockXjIds as $lockXjId) {
+                        XjClass::getLockById($lockXjId);
+                    }
+                }
+            }
+        }
+        // --- 结束：死锁预防机制 ---
+
         self::deleteByCondition(['orderSn' => $orderSn]);
         foreach ($products as $key => $p) {
             $p['orderSn'] = $orderSn;