Merge remote-tracking branch 'origin/test' into test

src/Common/Entity/User.php

@@ -178,6 +178,11 @@ class User
         return $this->getValue('referId');
         return $this->getValue('referId');
     }
     }
 
 
+    public function getAgentId()
+    {
+        return intval($this->getValue('agentId'));
+    }
+
     public function getScope()
     public function getScope()
     {
     {
         return $this->getValue('scope');
         return $this->getValue('scope');

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * order servcie
  * order servcie
  *
  *
- * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0);
+ * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message='',int $skuId=0,int $subStoreId=0,int $couponId=0,int $agentId=0);
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailBySubId(int $storeId,int $subOrderId,$ifSelf=true,bool $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByPid(int $storeId,int $pId, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
  * @method ResultInterface deferGetOrderDetailByMainSn(int $storeId,string  $orderSn, $ifSelf=false, $ifExtend=false)
@@ -54,6 +54,7 @@ interface OrderInterface
      * @param integer $skuId
      * @param integer $skuId
      * @param integer $subStoreId
      * @param integer $subStoreId
      * @param integer $couponId
      * @param integer $couponId
+     * @param integer $agentId 代理商Id
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
@@ -71,8 +72,9 @@ interface OrderInterface
         int     $goodsPrice,
         int     $goodsPrice,
         string  $message = '',
         string  $message = '',
         int     $skuId=0,
         int     $skuId=0,
-        int $subStoreId=0,
-        int $couponId=0
+        int     $subStoreId=0,
+        int     $couponId=0,
+        int     $agentId=0
     );
     );
     /**
     /**
     * 根据子订单ID查询订单详情
     * 根据子订单ID查询订单详情