update:增加拼单商品

application/modules/Goods/controllers/Goods.php

@@ -16,6 +16,7 @@ use \Validate\PaySuccessGoodsCallbackValidate;
 use \Validate\GoodsInitShopValidate;
 use \App\Services\goods\ElasticGoodService;
 use \App\Services\goods\MarketingPindanGoodsService;
+use \App\Models\marketing\mysql\Marketing;
 
 
 class GoodsController extends Base
@@ -46,15 +47,19 @@ class GoodsController extends Base
     public function addAction()
     {
         $params = $this->params;
-        if (!empty($params["marketing_type"]) && $params["marketing_type"] == \App\Models\marketing\mysql\Marketing::MARKETING_TYPE_PINDAN) {
+        if (!empty($params["marketing_type"]) && $params["marketing_type"] == Marketing::MARKETING_TYPE_PINDAN) {
 
         } else {
             (new GoodsAddValidate())->validate();
         }
 
-        GoodsService::addGoods($params);
+        $res = GoodsService::addGoods($params);
+        if (!empty($params["marketing_type"]) && $params["marketing_type"] == Marketing::MARKETING_TYPE_PINDAN) {
+            $this->success(["result" => $res]);
+        } else {
             $this->success();
         }
+    }
 
     /**
      * 编辑商品
@@ -62,7 +67,7 @@ class GoodsController extends Base
     public function editAction()
     {
         $params = $this->params;
-        if (!empty($params["marketing_type"]) && $params["marketing_type"] == \App\Models\marketing\mysql\Marketing::MARKETING_TYPE_PINDAN) {
+        if (!empty($params["marketing_type"]) && $params["marketing_type"] == Marketing::MARKETING_TYPE_PINDAN) {
 
         } else {
             (new GoodsEditValidate())->validate();

application/services/goods/MarketingPindanGoodsService.php

@@ -75,7 +75,21 @@ class MarketingPindanGoodsService
             GoodsSpu::rollback();
             throw new GoodsException(["cus" => 0]);
         }
-        return $skuId;
+
+        $sku = PindanGoodsSku::getRecordMaster(["goods_sku_id" => $skuId]);
+        $data = [];
+        if (!empty($sku[0])) {
+            $sku = $sku[0];
+            $data["goods_info"] = $sku;
+            $data["goods_info"]["original_price"] = empty($sku["original_price"]) ? '' : (string)($sku["original_price"] / 100);
+            $data["goods_info"]["price"] = $sku["price"] / 100;
+            $data["goods_info"]["desc_pic_url_list"] = [];
+            if (!empty($sku["desc_pic_url"])) {
+                $ksyun = GoodsService::getUrlList($sku["desc_pic_url"]);
+                $data["goods_info"]["desc_pic_url_list"] = $ksyun;
+            }
+        }
+        return $data;
     }
 
     /**
@@ -384,6 +398,12 @@ class MarketingPindanGoodsService
         return ["list" => $list, "count" => $count];
     }
 
+    /**
+     * 获取拼单商品详情
+     * @param $params
+     * @return array
+     * @throws GoodsException
+     */
     public static function pindanGoodsInfo($params)
     {
         $data = [];