Merge branch 'master' of http://git.dev.2b3.cn/tencent/services

src/Goods/Lib/GoodsInterface.php

@@ -209,4 +209,12 @@ interface GoodsInterface
 	 *               ]
 	 *               ]
 	 */
 	 */
 	public function addStock($storeId, $goods);
 	public function addStock($storeId, $goods);
+
+	/**
+	 * 计算商品价格
+	 * @param $storeId
+	 * @param $goods ['goodsId'=>num]
+	 * @return mixed
+	 */
+	public function sumGoodsPrice($storeId, $goods);
 }
 }

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 $points=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)
@@ -52,8 +52,9 @@ interface OrderInterface
      * @param integer $goodsPrice
      * @param integer $goodsPrice
      * @param string $message
      * @param string $message
      * @param integer $skuId
      * @param integer $skuId
-     * @param integer $subStoreId
-     * @param integer $couponId
+     * @param integer $subStoreId 
+     * @param integer $couponId 优惠券iD
+     * @param integer $points 积分
      * @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     $points=0
     );
     );
     /**
     /**
     * 根据子订单ID查询订单详情
     * 根据子订单ID查询订单详情