add recommend

api/cms/merchant/merchant_save.md

@@ -18,7 +18,6 @@
 | bankAccount | string | 银行账户 |
 | depositBank | string | 开户行 |
 | receiptType | string | 发票类型 |
-| recommendIdList | array | 推荐商品id数组 |
 | status | string | 状态 |
 
 ##### 示例

api/cms/merchant/recommend/recommend_GET.md

@@ -0,0 +1,31 @@
+### GET /merchant/recommend/{merchantId}
+* method: GET
+* version: v1.0
+* describe: 获取渠道商推荐位
+
+##### 参数说明
+|name |type| null | desc |
+|---- |:---|:---|:----:
+| merchantId | string | no | 渠道id |
+
+#### 响应示例
+```
+{
+    "code": 200,
+    "success": true,
+    "message": null,
+    "data": [
+        {
+            "id": "fb33a5edc7e64b11b4de1ecdb0cd7aeb",
+            "merchantId": "e4564eaadd75469f850c4e39bd01f9a3",
+            "pid": "e31be418b54147f1a033c8c2671c2d2f",
+            "status": "NORMAL",
+            "sort": 0,
+            "gmtCreated": 1516594769000,
+            "gmtModified": 1516594769000,
+            "type": "PACKAGE",
+            "name": "test-P-05"
+        }
+    ]
+}
+```

api/cms/merchant/recommend/recommend_PUT.md

@@ -0,0 +1,34 @@
+### PUT /merchant/recommend/{merchantId}
+* method: PUT
+* version: v1.0
+* describe: 修改渠道商推荐位
+
+##### 参数说明
+|name |type| null | desc |
+|---- |:---|:---|:----:
+| merchantId | string | no | 渠道id |
+
+##### 参数
+["idxxxx", "idxxxx"]
+
+#### 响应示例
+```
+{
+    "code": 200,
+    "success": true,
+    "message": null,
+    "data": [
+        {
+            "id": "fb33a5edc7e64b11b4de1ecdb0cd7aeb",
+            "merchantId": "e4564eaadd75469f850c4e39bd01f9a3",
+            "pid": "e31be418b54147f1a033c8c2671c2d2f",
+            "status": "NORMAL",
+            "sort": 0,
+            "gmtCreated": 1516594769000,
+            "gmtModified": 1516594769000,
+            "type": "PACKAGE",
+            "name": "test-P-05"
+        }
+    ]
+}
+```

tob/tobApi.md

@@ -256,7 +256,7 @@ DELETE
 ---
 #### 查询渠道产品列表
 ```
-/merchant/products
+/merchant/product
 GET
 {
   'code':'xxx',
@@ -329,7 +329,7 @@ GET
 /merchant/product/detail
 GET
 {
-  'productId':'xxxx',
+  'pid':'xxxx',
   'merchantId': 'xxx',
 }
 返回
@@ -371,7 +371,7 @@ GET
 /merchant/product/status
 PUT
 {
-  'productId':'xxxx',
+  'pid':'xxxx',
   'merchantId': 'xxx',
   'status': 'NORMAL'
 }
@@ -388,7 +388,7 @@ PUT
 /merchant/product/tags
 PUT
 {
-  'productId':'xxxx',
+  'pid':'xxxx',
   'merchantId': 'xxx',
   'tags': [
     'xxx',

tob/tobDB.md

@@ -19,8 +19,11 @@
 |----|:-----|:-------|:------|:-----|:-----|
 | id | varchar(512) | no | | 订单id | pri |
 | uid | varchar(512) | no | | 下单的终端用户id | |
+| cms_uid | varchar(512) | no | | 下单管理员id |
 | finalPrice | float | no | | 订单成交价格 | |
-| priceAdjust | float | no | | 订单价格调整值 | |
+| adjustPrice | float | no | | 订单价格调整值 | |
+| originPrice | float | no | | 订单原价 |
+| status | int | no | | 订单状态 |
 | note | text | no | '' | 下单备注 | |
 | gmt_created | unixStamp | no | | 订单创建时间 | |
 
@@ -44,7 +47,7 @@
 
 ---
 
-### sold_product_snapshoot table structure
+### product_sold_snapshot table structure
 >此表为订单商品快照表, 对于课程包, 将课程包作为商品插入后(此时课程包id作为pid), 再将课程包内商品分解再插入一次(此时pkg_id为课程包id, pid为课程包内的商品id)
 
 | field | type | null | default | desc | extra |