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

src/Logistics/Lib/LogisticsInterface.php

@@ -55,12 +55,13 @@ interface LogisticsInterface
 	 *                                ['name'=>'商品名称','image'=>'shang_pin_tu_pian'],
 	 *                                ['name'=>'商品名称','image'=>'shang_pin_tu_pian'],
 	 *                                ['name'=>'商品名称','image'=>'shang_pin_tu_pian'],
 	 *                                ['name'=>'商品名称','image'=>'shang_pin_tu_pian'],
 	 *                                ]
 	 *                                ]
+	 * @param       $unique
 	 * @param       $orderSn          订单号
 	 * @param       $orderSn          订单号
 	 * @param       $price            商品总价
 	 * @param       $price            商品总价
 	 * @param       $deliveryCode     配送服务代码 不同配送公司自定义, 顺丰和达达不填
 	 * @param       $deliveryCode     配送服务代码 不同配送公司自定义, 顺丰和达达不填
 	 * @return mixed
 	 * @return mixed
 	 */
 	 */
-	public function preOrder($storeId, $buyerId, array $receiver, $items, $orderSn, $price, $deliveryCode = null);
+	public function preOrder($storeId, $buyerId, array $receiver, $items, $unique, $orderSn, $price, $deliveryCode = null);
 
 
 
 
 	/**
 	/**
@@ -90,4 +91,27 @@ interface LogisticsInterface
 	 * @return mixed
 	 * @return mixed
 	 */
 	 */
 	public function getByMainOrderIds($orderIds, $fields = ['*']);
 	public function getByMainOrderIds($orderIds, $fields = ['*']);
+
+	/**
+	 * 获取物流状态
+	 * @param $orderIds
+	 * @return mixed
+	 */
+	public function getPathByMainOrderIds($orderIds);
+
+	/**
+	 * 取消物流订单
+	 * @param        $storeId
+	 * @param        $orderSn
+	 * @param string $cancelReason
+	 * @return mixed
+	 */
+	public function cancelOrder($storeId, $orderSn, $cancelReason = '');
+
+	/**
+	 * 获取充值订单
+	 * @param $orderSn
+	 * @return mixed
+	 */
+	public function getRechargeOrder($orderSn);
 }
 }
\ No newline at end of file