优化用户下单方法-进行中

app/common/enum/CommonEnum.php

@@ -4,6 +4,15 @@ namespace app\common\enum;
 
 class CommonEnum
 {
+
+    // 系统指定的 商户ID
+    const DESIGN_MERCHANT_ID = [
+        'MemberZone' => ['code' => 496, 'name' => '会员专区'],
+        'WonderfulLiving' => ['code' => 439, 'name' => '精彩生活区'],
+        'Repurchase' => ['code' => 491, 'name' => '复购区'],
+    ];
+
+
     const IS_DEL = [
         'No' => ['code' => 0, 'name' => '未删除'],
         'Yes' => ['code' => 1, 'name' => '已删除'],

app/entity/data/store/ProductAttrValueEntity.php

@@ -34,55 +34,90 @@ class ProductAttrValueEntity extends DataEntity
     public $stockNum = '0';  // 股权%
     public $sharesNum = '0';  // 股票
 
+    /**
+     * @return int
+     */
     public function getProductId(): int
     {
         return $this->productId;
     }
 
+    /**
+     * @param int $productId
+     * @return ProductAttrValueEntity
+     */
     public function setProductId(int $productId): ProductAttrValueEntity
     {
         $this->productId = $productId;
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getDetail(): string
     {
         return $this->detail;
     }
 
+    /**
+     * @param string $detail
+     * @return ProductAttrValueEntity
+     */
     public function setDetail(string $detail): ProductAttrValueEntity
     {
         $this->detail = $detail;
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getSku(): string
     {
         return $this->sku;
     }
 
+    /**
+     * @param string $sku
+     * @return ProductAttrValueEntity
+     */
     public function setSku(string $sku): ProductAttrValueEntity
     {
         $this->sku = $sku;
         return $this;
     }
 
+    /**
+     * @return int
+     */
     public function getStock(): int
     {
         return $this->stock;
     }
 
+    /**
+     * @param int $stock
+     * @return ProductAttrValueEntity
+     */
     public function setStock(int $stock): ProductAttrValueEntity
     {
         $this->stock = $stock;
         return $this;
     }
 
+    /**
+     * @return int
+     */
     public function getSales(): int
     {
         return $this->sales;
     }
 
+    /**
+     * @param int $sales
+     * @return ProductAttrValueEntity
+     */
     public function setSales(int $sales): ProductAttrValueEntity
     {
         $this->sales = $sales;
@@ -90,7 +125,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getImage()
     {
@@ -98,7 +133,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $image
+     * @param mixed $image
      * @return ProductAttrValueEntity
      */
     public function setImage($image)
@@ -107,77 +142,126 @@ class ProductAttrValueEntity extends DataEntity
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getBarCode(): string
     {
         return $this->barCode;
     }
 
+    /**
+     * @param string $barCode
+     * @return ProductAttrValueEntity
+     */
     public function setBarCode(string $barCode): ProductAttrValueEntity
     {
         $this->barCode = $barCode;
         return $this;
     }
 
+    /**
+     * @return float
+     */
     public function getCost(): float
     {
         return $this->cost;
     }
 
+    /**
+     * @param float $cost
+     * @return ProductAttrValueEntity
+     */
     public function setCost(float $cost): ProductAttrValueEntity
     {
         $this->cost = $cost;
         return $this;
     }
 
+    /**
+     * @return float
+     */
     public function getOtPrice(): float
     {
         return $this->otPrice;
     }
 
+    /**
+     * @param float $otPrice
+     * @return ProductAttrValueEntity
+     */
     public function setOtPrice(float $otPrice): ProductAttrValueEntity
     {
         $this->otPrice = $otPrice;
         return $this;
     }
 
+    /**
+     * @return float
+     */
     public function getPrice(): float
     {
         return $this->price;
     }
 
+    /**
+     * @param float $price
+     * @return ProductAttrValueEntity
+     */
     public function setPrice(float $price): ProductAttrValueEntity
     {
         $this->price = $price;
         return $this;
     }
 
+    /**
+     * @return float
+     */
     public function getVolume(): float
     {
         return $this->volume;
     }
 
+    /**
+     * @param float $volume
+     * @return ProductAttrValueEntity
+     */
     public function setVolume(float $volume): ProductAttrValueEntity
     {
         $this->volume = $volume;
         return $this;
     }
 
+    /**
+     * @return float
+     */
     public function getWeight(): float
     {
         return $this->weight;
     }
 
+    /**
+     * @param float $weight
+     * @return ProductAttrValueEntity
+     */
     public function setWeight(float $weight): ProductAttrValueEntity
     {
         $this->weight = $weight;
         return $this;
     }
 
+    /**
+     * @return int
+     */
     public function getType(): int
     {
         return $this->type;
     }
 
+    /**
+     * @param int $type
+     * @return ProductAttrValueEntity
+     */
     public function setType(int $type): ProductAttrValueEntity
     {
         $this->type = $type;
@@ -185,7 +269,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getExtensionOne()
     {
@@ -193,7 +277,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $extensionOne
+     * @param mixed $extensionOne
      * @return ProductAttrValueEntity
      */
     public function setExtensionOne($extensionOne)
@@ -203,15 +287,15 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getExtensionTwo()
     {
-        return $this->extensionTwo;
+        return is_null($this->extensionTwo) ? 0.00 : $this->extensionTwo;
     }
 
     /**
-     * @param null $extensionTwo
+     * @param mixed $extensionTwo
      * @return ProductAttrValueEntity
      */
     public function setExtensionTwo($extensionTwo)
@@ -220,22 +304,36 @@ class ProductAttrValueEntity extends DataEntity
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getUnique(): string
     {
         return $this->unique;
     }
 
+    /**
+     * @param string $unique
+     * @return ProductAttrValueEntity
+     */
     public function setUnique(string $unique): ProductAttrValueEntity
     {
         $this->unique = $unique;
         return $this;
     }
 
+    /**
+     * @return float
+     */
     public function getDacangPrice(): float
     {
         return $this->dacangPrice;
     }
 
+    /**
+     * @param float $dacangPrice
+     * @return ProductAttrValueEntity
+     */
     public function setDacangPrice(float $dacangPrice): ProductAttrValueEntity
     {
         $this->dacangPrice = $dacangPrice;
@@ -243,7 +341,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getCostPrice()
     {
@@ -251,7 +349,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $costPrice
+     * @param mixed $costPrice
      * @return ProductAttrValueEntity
      */
     public function setCostPrice($costPrice)
@@ -261,7 +359,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getGongSkuId()
     {
@@ -269,7 +367,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $gongSkuId
+     * @param mixed $gongSkuId
      * @return ProductAttrValueEntity
      */
     public function setGongSkuId($gongSkuId)
@@ -279,7 +377,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getGongMerProfit()
     {
@@ -287,7 +385,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $gongMerProfit
+     * @param mixed $gongMerProfit
      * @return ProductAttrValueEntity
      */
     public function setGongMerProfit($gongMerProfit)
@@ -297,7 +395,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getGongPension()
     {
@@ -305,7 +403,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $gongPension
+     * @param mixed $gongPension
      * @return ProductAttrValueEntity
      */
     public function setGongPension($gongPension)
@@ -315,7 +413,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getGongMarketPrice()
     {
@@ -323,7 +421,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $gongMarketPrice
+     * @param mixed $gongMarketPrice
      * @return ProductAttrValueEntity
      */
     public function setGongMarketPrice($gongMarketPrice)
@@ -333,7 +431,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @return null
+     * @return mixed
      */
     public function getPlateMerProfit()
     {
@@ -341,7 +439,7 @@ class ProductAttrValueEntity extends DataEntity
     }
 
     /**
-     * @param null $plateMerProfit
+     * @param mixed $plateMerProfit
      * @return ProductAttrValueEntity
      */
     public function setPlateMerProfit($plateMerProfit)
@@ -350,44 +448,72 @@ class ProductAttrValueEntity extends DataEntity
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getPensionNum(): string
     {
         return $this->pensionNum;
     }
 
+    /**
+     * @param string $pensionNum
+     * @return ProductAttrValueEntity
+     */
     public function setPensionNum(string $pensionNum): ProductAttrValueEntity
     {
         $this->pensionNum = $pensionNum;
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getShareNum(): string
     {
         return $this->shareNum;
     }
 
+    /**
+     * @param string $shareNum
+     * @return ProductAttrValueEntity
+     */
     public function setShareNum(string $shareNum): ProductAttrValueEntity
     {
         $this->shareNum = $shareNum;
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getStockNum(): string
     {
         return $this->stockNum;
     }
 
+    /**
+     * @param string $stockNum
+     * @return ProductAttrValueEntity
+     */
     public function setStockNum(string $stockNum): ProductAttrValueEntity
     {
         $this->stockNum = $stockNum;
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getSharesNum(): string
     {
         return $this->sharesNum;
     }
 
+    /**
+     * @param string $sharesNum
+     * @return ProductAttrValueEntity
+     */
     public function setSharesNum(string $sharesNum): ProductAttrValueEntity
     {
         $this->sharesNum = $sharesNum;