花材优化

app-hd/controllers/OrderController.php

@@ -389,14 +389,16 @@ class OrderController extends BaseController
         }
         $productList = json_decode($productJson, true);
         if (empty($productList) && empty($groupId)) {
-            if (isset($post['lsGoodsPrice']) == false || $post['lsGoodsPrice'] <= 0) {
-                util::fail('请填写金额或选商品');
+            //商家上传图片开单并要求生成制作单
+            if (isset($post['unitGoodsPrice']) && !empty($post['unitGoodsPrice'])) {
+                $productList = GoodsClass::kdWorkGoods($post);
             }
         }
 
-        //商家上传图片开单并要求生成制作单
-        if (isset($post['cover']) && !empty($post['cover'])) {
-            $productList = GoodsClass::kdWorkGoods($post);
+        if (empty($productList) && empty($groupId)) {
+            if (isset($post['lsGoodsPrice']) == false || $post['lsGoodsPrice'] <= 0) {
+                util::fail('请填写金额或选商品');
+            }
         }
 
         $connection = Yii::$app->db;

biz-hd/goods/classes/GoodsClass.php

@@ -40,7 +40,7 @@ class GoodsClass extends BaseClass
             util::fail('请选择分类');
         }
         $catIds = [$catId];
-        $cover = $data['cover'] ?? '';
+        $cover = isset($data['cover']) && !empty($data['cover']) ? $data['cover'] : 'default-img.png';
         $shopImg = [$cover];
         $addGoodsData = [
             'name' => $name,
@@ -61,7 +61,7 @@ class GoodsClass extends BaseClass
         $property = dict::getDict('property', 'goods');
         $num = $data['num'] ?? 0;
         $unitType = 0;
-        $unitPrice = 0;
+        $unitPrice = $data['unitGoodsPrice'] ?? 0;
         $product = [['productId' => $id, 'num' => $num, 'unitType' => $unitType, 'unitPrice' => $unitPrice, 'property' => $property]];
         return $product;
     }