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

center-channel/app/base/api/impl/opaction/opOrder.js

@@ -32,6 +32,9 @@ class ProductAPI extends WEBBase {
             case "updateTmOrder"://修改商标订单信息
             case "updateTmOrder"://修改商标订单信息
                 opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody);
                 opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody);
                 break;
                 break;
+            case "tmConfirm"://商标方案确认
+                opResult = await this.utilsOpOrderSve.tmConfirm(pobj,pobj.actionBody);
+                break;
             default:
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
                 break;

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

@@ -49,5 +49,15 @@ class UtilsOpOrderService extends AppServiceBase {
       this.utilsPushSve.pushBusInfo(tmpPobj, opType, 1);
       this.utilsPushSve.pushBusInfo(tmpPobj, opType, 1);
     }
     }
   }
   }
+
+
+  async tmConfirm(pobj,actionBody){//商标方案确认
+    if (!actionBody.orderNo) {
+      return system.getResult(null, "actionBody.orderNo can not be empty，100025");
+    }
+    var reqUrl = this.centerOrderUrl + "action/order/springBoard";
+    var result = await this.restPostUrl(pobj, reqUrl);
+    return result;
+  }
 }
 }
 module.exports = UtilsOpOrderService;
 module.exports = UtilsOpOrderService;

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

@@ -462,5 +462,6 @@ class UtilsOrderService extends AppServiceBase {
       return system.getResultFail(-200, e.stack);
       return system.getResultFail(-200, e.stack);
     }
     }
   }
   }
+
 }
 }
 module.exports = UtilsOrderService;
 module.exports = UtilsOrderService;

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

@@ -109,7 +109,7 @@ module.exports = function (app) {
 		}
 		}
 		req.body.appInfo = result.data;
 		req.body.appInfo = result.data;
 		req.body.actionProcess = result.data.app_code;
 		req.body.actionProcess = result.data.app_code;
-		var lst = [
+		var lst = ["tmConfirm",
 			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
 			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
 			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo"
 			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo"

center-channel/app/config/settings.js

@@ -57,7 +57,7 @@ var settings = {
   },
   },
   centerOrderUrl: function () {
   centerOrderUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "http://centerapp.apps.com:4011/";
+      return "http://centerorder.apps.com:4011/";
     } else {
     } else {
       return "http://center-order-service/";
       return "http://center-order-service/";
     }
     }

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

@@ -7,6 +7,7 @@
 1. [商标订单修改-商标尼斯信息修改](#updateNclInfo)
 1. [商标订单修改-商标尼斯信息修改](#updateNclInfo)
 1. [商标订单修改-修改申请人信息](#updateCustomerInfo)
 1. [商标订单修改-修改申请人信息](#updateCustomerInfo)
 1. [商标订单修改-修改交官材料](#updateOfficial)
 1. [商标订单修改-修改交官材料](#updateOfficial)
+1. [商标方案确认](#tmConfirm)
 
 
 ## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
 ## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
 [返回到目录](#menu)
 [返回到目录](#menu)
@@ -359,3 +360,33 @@
 }
 }
 
 
 ```
 ```
+
+## **<a name="tmConfirm"> 商标方案确认</a>**
+[返回到目录](#menu)
+##### URL
+[/web/opaction/opOrder/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 请求头中需要增加userpin（用户登录后的凭证）的值
+#### 渠道执行的类型 actionType：tmConfirm
+
+``` javascript
+{
+    "orderNo ":"346c3091684e4e0eef",
+    "isConfirm ":"1",
+    "notes ":"",
+
+}
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status":0,
+    "data":null,
+    "msg":"商标方案确认成功",
+    "requestId":"0c14f04dc187486b829e392dc87c70c6"
+}
+
+```