添加产品

biz-ghs/product/classes/ProductClass.php

@@ -2310,35 +2310,37 @@ class ProductClass extends BaseClass
                     /****************产品模块********************/
                     if (!empty($ptCpIds)) {
                         $ptCpClassList = PtCpClassClass::getAllByCondition(['delStatus' => 0], null, '*', 'id');
-                        $thisCpClassList = CpClassClass::getAllByCondition(['mainId' => $thisMainId, 'delStatus' => 0], null, '*', 'id');
-                        $thisCpDefaultClassId = 0;
-                        foreach ($thisCpClassList as $thisCpClass) {
+                        $shopCpClassList = CpClassClass::getAllByCondition(['mainId' => $thisMainId, 'delStatus' => 0], null, '*', 'id');
+                        $shopCpDefaultClassId = 0;
+                        foreach ($shopCpClassList as $thisCpClass) {
                             if ($thisCpClass['isDefault'] == 1) {
-                                $thisCpDefaultClassId = $thisCpClass['id'] ?? 0;
+                                $shopCpDefaultClassId = $thisCpClass['id'] ?? 0;
                             }
                         }
-                        if (empty($thisCpDefaultClassId)) {
+                        if (empty($shopCpDefaultClassId)) {
                             util::fail('没有找到产品的默认分类哦');
                         }
                         $ptCpList = PtCpClass::getAllByCondition(['id' => ['in', $ptCpIds]], null, '*', 'id');
-                        $thisCpList = CpClass::getAllByCondition(['mainId' => $thisMainId, 'ptCpId' => ['in', $ptCpIds]], null, '*', 'ptCpId', true);
+                        $shopCpList = CpClass::getAllByCondition(['mainId' => $thisMainId, 'ptCpId' => ['in', $ptCpIds]], null, '*', 'ptCpId', true);
                         foreach ($ptCpList as $ptCpId => $ptCpInfo) {
-                            $ptCpClassId = $ptCpInfo['classId'] ?? 0;
-                            $ptCpClassName = '';
-                            if (isset($ptCpClassList[$ptCpClassId])) {
-                                $ptCpClassName = $ptCpClassList[$ptCpClassId]['name'] ?? '';
-                            }
-                            $currentCpClassId = $thisCpDefaultClassId;
-                            if (!empty($ptCpClassName)) {
-                                foreach ($thisCpClassList as $thisCpClass) {
-                                    if ($thisCpClass['name'] == $ptCpClassName) {
-                                        $currentCpClassId = $thisCpClass['id'] ?? 0;
+
+                            if (isset($shopCpList[$ptCpId])) {
+                                $currentCp = $shopCpList[$ptCpId];
+                            } else {
+                                $ptCpClassId = $ptCpInfo['classId'] ?? 0;
+                                $ptCpClassName = '';
+                                if (isset($ptCpClassList[$ptCpClassId])) {
+                                    $ptCpClassName = $ptCpClassList[$ptCpClassId]['name'] ?? '';
+                                }
+                                $currentCpClassId = $shopCpDefaultClassId;
+                                if (!empty($ptCpClassName)) {
+                                    foreach ($shopCpClassList as $thisCpClass) {
+                                        if (isset($thisCpClass['name']) && $thisCpClass['name'] == $ptCpClassName) {
+                                            $currentCpClassId = $thisCpClass['id'] ?? 0;
+                                        }
                                     }
                                 }
-                            }
-                            if (isset($thisCpList[$ptCpId])) {
-                                $currentCp = $thisCpList[$ptCpId];
-                            } else {
+
                                 unset($ptCpInfo['id']);
                                 unset($ptCpInfo['addTime']);
                                 unset($ptCpInfo['updateTime']);