Merge branch 'master' of ssh://pha.lemonsports.cn:2222/source/libjdvop

# Conflicts: # tests/Product_GetDetail.php
zeevin · Sep 20, 2018 · 5670eb5 · 5670eb5
2 parents fa94c08 + c660961
commit 5670eb5
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/src/Product/RequestAttribute/GetDetail/Request.php b/src/Product/RequestAttribute/GetDetail/Request.php
@@ -24,6 +24,15 @@ class Request extends BaseRequestAttribute
      * @JMS\Type("string")
      */
     protected $sku;
+
+	/**
+	 * @var 默认 false:查询商品基本信息；
+	 * true:商品基本信息 + 商品售后信息 + 移动商品详情介绍信息
+	 * @JMS\XmlElement(cdata=false)
+	 * @SerializedName("isShow")
+	 * @JMS\Type("string")
+	 */
+    protected $isShow;
     /**
      * 可选扩展参数，支持单个/多个查询[逗号间隔]: appintroduce:移动商品详情介绍信息 shouhou:商品售后信息
      * isFactoryShip 是否厂商直送
@@ -42,6 +51,29 @@ public function getSku()
         return $this->sku;
     }
 
+	/**
+	 * @return mixed
+	 */
+	public function getIsShow()
+	{
+		return $this->isShow;
+	}
+
+	/**
+	 * @param $isShow
+	 *
+	 * @return $this
+	 */
+	public function setIsShow($isShow=false)
+	{
+		if(is_bool($isShow)){
+			$this->isShow =  var_export($isShow,true);
+		}else{
+			$this->isShow = $isShow;
+		}
+
+		return $this;
+	}
     /**
      * @param $sku
      *

diff --git a/src/Product/ResponseAttribute/GetDetail/Struct/Result.php b/src/Product/ResponseAttribute/GetDetail/Struct/Result.php
@@ -100,6 +100,20 @@ class Result
      */
     protected $wareQD;
 
+	/**
+	 * @JMS\XmlElement(cdata=false)
+	 * @SerializedName("shouhou")
+	 * @JMS\Type("string")
+	 */
+    protected $shouhou;
+
+	/**
+	 * @JMS\XmlElement(cdata=false)
+	 * @SerializedName("appintroduce")
+	 * @JMS\Type("string")
+	 */
+	protected $appintroduce;
+
     /**
      * @return mixed
      */
@@ -215,4 +229,12 @@ public function getWareQD()
     {
         return $this->wareQD;
     }
+
+    public function getShouhou(){
+    	return $this->shouhou;
+    }
+
+    public function getAppintroduce(){
+    	return $this->appintroduce;
+    }
 }