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

src/Coupon/Lib/CouponInterface.php

@@ -16,7 +16,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * The interface of coupon service
  * The interface of coupon service
  *
  *
- * @method ResultInterface deferCheckCoupon(int $buyerId, int $storeId, int $couponId, int $itemId)
+ * @method ResultInterface deferCheckCoupon(int $buyerId, int $storeId, int $couponId, array $itemIds)
  * @method ResultInterface deferGetCouponRecvdList(int $buyerId, int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetCouponRecvdList(int $buyerId, int $storeId, int $subStoreId = 0, int $itemId = 0)
  * @method ResultInterface deferGetDataByCouponId(int $buyerId, int $storeId, int $couponId)
  * @method ResultInterface deferGetDataByCouponId(int $buyerId, int $storeId, int $couponId)
  */
  */
@@ -40,10 +40,10 @@ interface CouponInterface
      * @param integer $buyerId
      * @param integer $buyerId
      * @param integer $storeId
      * @param integer $storeId
      * @param integer $couponId
      * @param integer $couponId
-     * @param integer $itemId
+     * @param array $itemIds
      * @return int|boolen 如果可用返回优惠券的面值，不可用返回false
      * @return int|boolen 如果可用返回优惠券的面值，不可用返回false
      */
      */
-    public function checkCoupon(int $buyerId, int $storeId, int $couponId, int $itemId);
+    public function checkCoupon(int $buyerId, int $storeId, int $couponId, array $itemIds);
 
 
     /**
     /**
      * 更新优惠券状态
      * 更新优惠券状态

src/Order/Lib/OrderInterface.php

@@ -15,7 +15,7 @@ use Swoft\Core\ResultInterface;
 /**
 /**
  * The interface of demo service
  * The interface of demo service
  *
  *
- * @method ResultInterface deferCreateOrder(int $buyerId,int $storeId,int $consigneeId,int $itemId,int $selectedNum,int $orderType,int $total,int $activityPrice,string $goodsName,string $goodsImage,string $activityName,int $goodsId,int $goodsPrice,string $message = ''); * @method ResultInterface deferGetOrderInfoBySn(int $storeId, string $orderSn, array $consigneeFields = [], array $itemFields = [])
+ * @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 deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferGetOrderInfo(int $storeId,int $orderId)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferUpdateInfoById(int $storeId,int $orderId, array  $updateInfo)
  * @method ResultInterface deferGetSimpleList($storeId, $condition, $fields = ['*'])
  * @method ResultInterface deferGetSimpleList($storeId, $condition, $fields = ['*'])
@@ -31,20 +31,22 @@ interface OrderInterface
     /**
     /**
      * 创建订单
      * 创建订单
      *
      *
-     * @param int $buyerId
-     * @param int $storeId
-     * @param int $consigneeId
-     * @param int $itemId
-     * @param int $selectedNum
-     * @param int $orderType
-     * @param int $total
-     * @param int $activityPrice
+     * @param integer $buyerId
+     * @param integer $storeId
+     * @param integer $consigneeId
+     * @param integer $itemId
+     * @param integer $selectedNum
+     * @param integer $orderType
+     * @param integer $activityPrice
      * @param string $goodsName
      * @param string $goodsName
      * @param string $goodsImage
      * @param string $goodsImage
      * @param string $activityName
      * @param string $activityName
-     * @param int $goodsId
-     * @param int $goodsPrice
+     * @param integer $goodsId
+     * @param integer $goodsPrice
      * @param string $message
      * @param string $message
+     * @param integer $skuId
+     * @param integer $subStoreId
+     * @param integer $couponId
      * @return mixed
      * @return mixed
      */
      */
     public function createOrder(
     public function createOrder(
@@ -54,14 +56,16 @@ interface OrderInterface
         int     $itemId,
         int     $itemId,
         int     $selectedNum,
         int     $selectedNum,
         int     $orderType,
         int     $orderType,
-        int     $total,
         int     $activityPrice,
         int     $activityPrice,
         string  $goodsName,
         string  $goodsName,
         string  $goodsImage,
         string  $goodsImage,
         string  $activityName,
         string  $activityName,
         int     $goodsId,
         int     $goodsId,
         int     $goodsPrice,
         int     $goodsPrice,
-        string  $message = ''
+        string  $message = '',
+        int     $skuId=0,
+        int $subStoreId=0,
+        int $couponId=0
     );
     );
 
 
     public function getOrderInfo(int $storeId,int $orderId);
     public function getOrderInfo(int $storeId,int $orderId);