花材支持多图片

app-ghs/controllers/ProductController.php

@@ -1123,6 +1123,10 @@ class ProductController extends BaseController
         $post['adminId'] = $this->adminId;
         $post['staffId'] = $this->shopAdmin->id;
         $post['staffName'] = $this->shopAdmin->name;
+        // 图片列表数组转换为字符串
+        if (is_array($post['images'])) {
+            $post['images'] = implode(',', $post['images']);
+        }
 
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
@@ -1232,6 +1236,11 @@ class ProductController extends BaseController
         $source = Yii::$app->request->get('source', '');
         $respond = ProductClass::getItemInfo($id);
         $ptItemId = $respond['itemId'] ?? 0;
+        // 封面图与多花材图片的兼容处理
+        if ($respond['images'] == '' && $respond['shortCover'] != '') {
+            $respond['images'] = $respond['shortCover'];
+        }
+
         $ptItemInfo = PtItemClass::getById($ptItemId);
         $respond['ptItemInfo'] = $ptItemInfo;
         //通知提醒抹除
@@ -1293,11 +1302,6 @@ class ProductController extends BaseController
     {
         $post = Yii::$app->request->post();
 
-        //临时兼容，2023.7.1后可以删除
-        $appVersion = $post['appVersion'] ?? 0;
-        if ($appVersion != 1) {
-            util::fail('请先升级应用');
-        }
         $discountPrice = $post['discountPrice'] ?? 0;
         if ($discountPrice > 0) {
             if (isset($post['hjDiscountPrice']) == false || empty($post['hjDiscountPrice'])) {
@@ -1345,6 +1349,11 @@ class ProductController extends BaseController
             util::fail('请填写重量，最小0.1');
         }
         $post['staffName'] = $shopAdmin->name ?? '';
+        // 图片列表数组转换为字符串
+        if (is_array($post['images'])) {
+            $post['images'] = implode(',', $post['images']);
+        }
+
         ProductClass::addProduct($post, $this->shop);
         util::complete('添加成功');
     }
@@ -1362,10 +1371,6 @@ class ProductController extends BaseController
     {
         $post = Yii::$app->request->post();
 
-        $appVersion = $post['appVersion'] ?? 0;
-        if ($appVersion != 1) {
-            util::fail('请先升级应用');
-        }
         $discountPrice = $post['discountPrice'] ?? 0;
         if ($discountPrice > 0) {
             if (isset($post['hjDiscountPrice']) == false || empty($post['hjDiscountPrice'])) {

app-hd/controllers/ProductController.php

@@ -846,6 +846,10 @@ class ProductController extends BaseController
 
         $pixTextGoods = PicTextGhsItemClass::getByCondition(['mainId' => $ghsInfo->mainId, 'ghsItemId' => $id], true);
         $product['picTextGoods'] = $pixTextGoods;
+        // 封面图与多花材图片的兼容处理
+        if ($product['images'] == '' && $product['shortCover'] != '') {
+            $product['images'] = $product['shortCover'];
+        }
 
         util::success($product);
     }

app-mall/controllers/ItemController.php

@@ -75,6 +75,10 @@ class ItemController extends BaseController
 
         $pixTextGoods = PicTextGhsItemClass::getByCondition(['mainId' => $item['mainId'], 'ghsItemId' => $id], true);
         $item['picTextGoods'] = $pixTextGoods;
+        // 封面图与多花材图片的兼容处理
+        if ($item['images'] == '' && $item['shortCover'] != '') {
+            $item['images'] = $item['shortCover'];
+        }
 
         util::success(['info' => $item]);
     }

biz-ghs/product/classes/ProductClass.php

@@ -6,7 +6,6 @@ namespace bizGhs\product\classes;
 use biz\item\classes\PtItemClass;
 use biz\item\classes\PtItemClassClass;
 use biz\item\classes\UnitClass;
-use biz\shop\services\ShopService;
 use biz\wx\classes\WxMessageClass;
 use bizGhs\base\classes\BaseClass;
 use bizGhs\cp\classes\CpClass;
@@ -16,7 +15,6 @@ use bizGhs\cp\classes\PtCpClass;
 use bizGhs\cp\classes\PtCpClassClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\item\classes\CostChangeClass;
-use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\item\classes\PriceChangeClass;
 use bizGhs\merchant\classes\ShopClass;
@@ -25,17 +23,14 @@ use bizGhs\order\classes\CheckOrderItemClass;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\shop\classes\ShopAdminClass;
 use bizGhs\stock\classes\StockRecordClass;
-use bizGhs\stock\services\StockRecordService;
 use bizHd\notify\classes\NotifyClass;
 use common\components\dict;
 use common\components\imgUtil;
-use common\components\noticeUtil;
 use common\components\orderSn;
 use common\components\stringUtil;
 use common\components\util;
 use common\services\xhItemService;
 use Yii;
-use yii\di\ServiceLocator;
 
 class ProductClass extends BaseClass
 {
@@ -1519,6 +1514,9 @@ class ProductClass extends BaseClass
         if (isset($data['cover']) && !empty($data['cover'])) {
             $upData['cover'] = $data['cover'];
         }
+        if (isset($data['images']) && !empty($data['images'])) {
+            $upData['images'] = $data['images'];
+        }
         if (isset($data['discountPrice']) && is_numeric($data['discountPrice'])) {
             $discountPrice = $data['discountPrice'] ?? 0;
             $currentPrice = $data['price'] ?? 0;
@@ -2143,7 +2141,6 @@ class ProductClass extends BaseClass
         }
 
         $weight = $data['weight'] ?? 0;
-
         $bigUnitId = $data['bigUnitId'] ?? 0;
         $smallUnitId = $data['smallUnitId'] ?? 0;
         if (empty($bigUnitId) || empty($smallUnitId)) {
@@ -2223,7 +2220,6 @@ class ProductClass extends BaseClass
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-
             if (isset($data['itemId']) == false || empty($data['itemId'])) {
                 //添加新品种先在平台新增花材
                 $defaultInfo = PtItemClassClass::getByCondition(['isDefault' => 1]);