Merge branch 'ft-0616' into test

UPGRADE_2.x.md

+# 2.0.69
+- 商品销售数量
+
+# 2.0.68
+- 实物订单改运费/流量平台分地区 上线
+
 # 2.0.67
 - 流量平台迁移业务员
 

src/Goods/Lib/GoodsInterface.php

@@ -63,20 +63,22 @@ interface GoodsInterface
 	 * 减少商品库存
 	 * @param $storeId
 	 * @param $goodsId
+	 * @param $num
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function incSales($storeId, $goodsId);
+	public function incSales($storeId, $goodsId, $num = 1);
 
 	/**
 	 * 减少商品销量
 	 * 增加商品库存
 	 * @param $storeId
 	 * @param $goodsId
+	 * @param $num
 	 * @return mixed
 	 * @author Administrator
 	 */
-	public function decSales($storeId, $goodsId);
+	public function decSales($storeId, $goodsId, $num = 1);
 
 
 	/**

src/Order/Lib/OrderInterface.php

@@ -275,4 +275,17 @@ interface OrderInterface
      */
     public function getSummaryTitles(int $storeId, array $subOrderIds, array $mainOrderIds=[]);
     
+    /**
+     * 用于其他服务在没有订单的情况下，添加核销记录
+     * 
+     * @param integer $storeId
+     * @param integer $cmanId
+     * @param integer $amount
+     * @param integer $payOrigin
+     * @param integer $orderClass
+     * @param array $goodsInfo 示例：['goodsId':333, 'name':'酷酷酷', 'image':'xxxxxx']
+     * @return void
+     */
+    public function addDeliverdLog(int $storeId, int $cmanId, int $amount, int $payOrigin, int $orderClass, array $goodsInfo);
+    
 }
\ No newline at end of file