Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/api/impl/action/opNeed.js

@@ -28,17 +28,17 @@ class OpNeed extends APIBase {
         pobj.requestId = req.requestId;
         var opResult = null;
         switch (action_type) {
-            case "submitNeed"://提交需求 2020 0807 lin 新增 
-                opResult = await this.utilsOpNeedSve.submitNeed(pobj, pobj.actionBody);
+            case "opSubmitNeed"://提交需求 2020 0807 lin 新增 
+                opResult = await this.utilsOpNeedSve.opSubmitNeed(pobj, pobj.actionBody);
                 break;
-            case "needList"://需求列表
-                opResult = await this.utilsOpNeedSve.needList(pobj, pobj.actionBody);
+            case "opNeedList"://需求列表
+                opResult = await this.utilsOpNeedSve.opNeedList(pobj, pobj.actionBody);
                 break;
-            case "needClose"://关闭需求
-                opResult = await this.utilsOpNeedSve.needClose(pobj, pobj.actionBody);
+            case "opNeedClose"://关闭需求
+                opResult = await this.utilsOpNeedSve.opNeedClose(pobj, pobj.actionBody);
                 break;
-            case "needDetailByChannelNo"://需求详情－－包含方案
-                opResult = await this.utilsOpNeedSve.needDetailByChannelNo(pobj, pobj.actionBody);
+            case "opNeedDetailByChannelNo"://需求详情－－包含方案
+                opResult = await this.utilsOpNeedSve.opNeedDetailByChannelNo(pobj, pobj.actionBody);
                 break;
             // case "getItemByChannelNeedNo"://方案反馈
             //     opResult = await this.utilsOpNeedSve.getItemByChannelNeedNo(pobj, pobj.actionBody);

center-channel/app/base/service/impl/utilsSve/utilsOpNeedSve.js

@@ -19,10 +19,10 @@ class UtilsOpNeedService extends AppServiceBase {
 
   /**
     * 提交需求 h5/pc 通用
-   * @param {*} pobj 
+    * @param {*} pobj 
     * @param {*} actionBody 
     */
-  async submitNeed(pobj, actionBody) {
+  async opSubmitNeed(pobj, actionBody) {
     var sobj = pobj;
     // 获取商品类型
     sobj.actionType = "getProductTypeInfo";
@@ -36,7 +36,7 @@ class UtilsOpNeedService extends AppServiceBase {
     pobj.actionBody.channel_type_code = opResult.data.channel_type_code;
     pobj.actionBody.channel_type_name = opResult.data.channel_type_name;
     // 提交需求 暂未做推送
-    pobj.actionType = "submitNeed";
+    pobj.actionType = "opSubmitNeed";
     var reqUrl = this.centerOrderUrl + "action/opNeed/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
     if (result.status == 0) {
@@ -48,6 +48,18 @@ class UtilsOpNeedService extends AppServiceBase {
   }
 
   /**
+    * 提交需求 h5/pc 通用
+    * @param {*} pobj 
+    * @param {*} actionBody 
+    */
+   async opNeedList(pobj, actionBody) {
+    // 获取需求列表
+    var reqUrl = this.centerOrderUrl + "action/opNeed/springBoard";
+    var opNeedListResult =await this.restPostUrl(pobj,reqUrl);
+    return opNeedListResult;
+  }
+
+  /**
   * 获取需求详情
   * @param {*} pobj 
   * @param {*} actionBody needNo 需求号
@@ -66,7 +78,7 @@ class UtilsOpNeedService extends AppServiceBase {
   * @param {*} pobj 
   * @param {*} actionBody 
   */
-  async needClose(pobj, actionBody) {
+  async opNeedClose(pobj, actionBody) {
     if (!actionBody.needNo) {
       return system.getResult(null, "actionBody.channelNeedNo can not be empty，100395");
     }

center-channel/app/config/routes/api.js

@@ -243,7 +243,7 @@ module.exports = function (app) {
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
 			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo",
             "getPaidLogoListByUser","getCollectibleLogoListByUser","collectLogo","getLogoMaterial","cancelCollectLogo","icpNotify","createName","getNameDetail","orderConfirm",
-            "orderTotalSum", "collect", "reg", "orderCheck","getReOrderList","getOfficalList","addReviewList","submitNeedWeb","needCloseWeb","needListWeb","needDetailByChannelNoWeb"
+            "orderTotalSum", "collect", "reg", "orderCheck","getReOrderList","getOfficalList","addReviewList","opSubmitNeed","opNeedClose","opNeedList","opNeedDetailByChannelNo"
 		];
 		if (lst.indexOf(req.body.actionType) >= 0) {
 			var userpin = req.headers["userpin"] || "";

center-channel/app/front/entry/public/apidoc/platform/opNeed.md

+<a name="menu" href="/doc">返回主目录</a>
+1. [下需求](#opSubmitNeed)
+2. [需求关闭](#opNeedClose)
+3. [需求列表](#opNeedList)
+
+## **<a name="opSubmitNeed"> 下需求</a>**
+[返回到目录](#menu)
+##### URL
+[/web/action/opNeed/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 渠道执行的类型 actionType：opSubmitNeed
+``` javascript
+    {
+        "area": "北京市-北京市-大兴区",
+		"description": "公司注册 - ",
+		"mobile": "13911391996",
+		"type": "gszc",
+		"userName": ""
+    }
+```
+
+#### 返回结果
+``` javascript
+    {
+        "status": 0,
+        "msg": "success",
+        "data": null,
+        "requestId": "d8ff1ec957e8473f863e79ad91440c60"
+    }
+```
+
+## **<a name="opNeedClose"> 需求关闭</a>**
+[返回到目录](#menu)
+##### URL
+[/web/action/opNeed/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 渠道执行的类型 actionType：opNeedClose
+``` javascript
+    {
+        "needNo": "N202008081803V5zoAk4", // 必填
+		"note":"不想买了" // 必填
+    }
+```
+
+#### 返回结果
+``` javascript
+    {
+        "status": 0,
+        "msg": "success",
+        "data": null,
+        "requestId": "d8ff1ec957e8473f863e79ad91440c60"
+    }
+```
+
+## **<a name="opNeedList"> 需求列表</a>**
+[返回到目录](#menu)
+##### URL
+[/web/action/opNeed/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 渠道执行的类型 actionType：opNeedList
+``` javascript
+    {
+        // 时间段，分页，排序，需求状态 条件展示未做
+    }
+```
+
+#### 返回结果
+``` javascript
+    // 返回字段需要根据原型来做，目前只返回基础数据
+    {
+        "status": 0,
+        "msg": "操作成功",
+        "data": [
+            {
+                "needNo": "N202008081803V5zoAk4",
+                "status": "ygb",
+                "statusName": "已关闭"
+            },
+            {
+                "needNo": "N202008081637iFxoxrE",
+                "status": "wts",
+                "statusName": "未推送"
+            }
+        ],
+        "bizmsg": "empty",
+        "requestId": "c1e67d2f7eb7416b988f60ce0c93559b"
+    }
+```
\ No newline at end of file

center-channel/app/front/entry/public/apidoc/platform/zzzd.md

@@ -28,7 +28,7 @@
     }
     通过
     {
-    "status": 0,
+        "status": 0,
         "msg": "success",
         "data": null,
         "requestId": "837ea5c284074d568fa198f7f259088a"