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"://修改商标订单信息
                 opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody);
                 break;
+            case "tmConfirm"://商标方案确认
+                opResult = await this.utilsOpOrderSve.tmConfirm(pobj,pobj.actionBody);
+                break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;
@@ -40,4 +43,4 @@ class ProductAPI extends WEBBase {
     }
 
 }
-module.exports = ProductAPI;
\ No newline at end of file
+module.exports = ProductAPI;

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

@@ -61,4 +61,4 @@ class ProductAPI extends WEBBase {
     }
 
 }
-module.exports = ProductAPI;
\ No newline at end of file
+module.exports = ProductAPI;

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

@@ -49,5 +49,15 @@ class UtilsOpOrderService extends AppServiceBase {
       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;

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

@@ -54,7 +54,7 @@ class UtilsOrderService extends AppServiceBase {
   }
   /**
    * 创建订单
-   * @param {*} pobj 
+   * @param {*} pobj
    * @param {*} actionBody {channelItemCode:渠道产品的编码，id:定价id,quantity:订单数量,totalSum:300}
    */
   async addOrder(pobj, actionBody) {
@@ -153,8 +153,8 @@ class UtilsOrderService extends AppServiceBase {
   }
   /**
    * 获取H5支付地址
-   * @param {*} pobj 
-   * @param {*} actionBody 
+   * @param {*} pobj
+   * @param {*} actionBody
    */
   async getH5PayUrl(pobj, actionBody) {
     if (!actionBody.orderNo) {
@@ -182,7 +182,7 @@ class UtilsOrderService extends AppServiceBase {
   }
   /**
    * 获取二维码
-   * @param {*} pobj 
+   * @param {*} pobj
    * @param {*} actionBody {orderNo:XXXX,opType:"wx"}---"wx":"微信","alipay":"支付宝"
    */
   async getOrderQrCode(pobj, actionBody) {
@@ -260,7 +260,7 @@ class UtilsOrderService extends AppServiceBase {
   }
   /**
    * 查询订单状态
-   * @param {*} pobj 
+   * @param {*} pobj
    * @param {*} actionBody {orderNo:XXXX,opType:"wx"}---"wx":"微信","alipay":"支付宝"
    */
   async queryOrderStatus(pobj, actionBody) {
@@ -308,8 +308,8 @@ class UtilsOrderService extends AppServiceBase {
   }
   /**
    * 获取pc端支付二维码--不跟订单关联
-   * @param {*} pobj 
-   * @param {*} actionBody 
+   * @param {*} pobj
+   * @param {*} actionBody
    * "actionBody": {
         "order_num": order.orderNo,
         "total_fee": Number(order.totalSum) * 100,
@@ -338,7 +338,7 @@ class UtilsOrderService extends AppServiceBase {
   }
   /**
    * 只是检查支付状态--不跟订单关联
-   * @param {*} pobj 
+   * @param {*} pobj
    * @param {*} actionBody { "trxid": payTrxid 支付流水号}
    */
   async queryOrder(pobj, actionBody) {
@@ -426,7 +426,7 @@ class UtilsOrderService extends AppServiceBase {
       }
       parmas.appInfo = appInfo;
       parmas.orderNo = parmas.out_trade_no;
-      //修改并返回订单支付状态，创建收款单 
+      //修改并返回订单支付状态，创建收款单
       var url = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotify";
       var opResult = await this.restPostUrl(parmas, url);
       if (opResult.status == 0) {
@@ -462,5 +462,6 @@ class UtilsOrderService extends AppServiceBase {
       return system.getResultFail(-200, e.stack);
     }
   }
+
 }
 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.actionProcess = result.data.app_code;
-		var lst = [
+		var lst = ["tmConfirm",
 			"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
 			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo"

center-channel/app/config/settings.js

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

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

@@ -122,7 +122,7 @@
     "channelItemCode":"fzsbzc",// Y 产品的渠道编码
     "payCode": "fzsbzc-1", // Y 支付价格code
     "quantity":1,// Y 购买数量
-    "totalSum":699,// Y 订单总金额 
+    "totalSum":699,// Y 订单总金额
     "payTotalSum":699,	// Y 订单付款总金额	 
     "notes": "订单备注信息",// N 订单备注
     "orderContact":{ // N 订单联系人信息，没有则填写{}
@@ -233,9 +233,9 @@
             "channelItemCode": "FW_GOODS-582221-1",
             "channelItemName": "京东云PLUS公司注册（北京市）",
             "channelItemAppendName": "",
-            "price":"10.00", 
-            "priceTypeName":"件", 
-            "priceDesc":"海淀区内资一般人", 
+            "price":"10.00",
+            "priceTypeName":"件",
+            "priceDesc":"海淀区内资一般人",
             "serviceItemCode": null,
             "picUrl": null,
             "created_at":""
@@ -362,4 +362,4 @@
     "requestId": "f21446617c5e46ad889f3fab7bb69456"
 }
 
-```
\ No newline at end of file
+```

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

@@ -7,6 +7,7 @@
 1. [商标订单修改-商标尼斯信息修改](#updateNclInfo)
 1. [商标订单修改-修改申请人信息](#updateCustomerInfo)
 1. [商标订单修改-修改交官材料](#updateOfficial)
+1. [商标方案确认](#tmConfirm)
 
 ## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
 [返回到目录](#menu)
@@ -270,7 +271,7 @@
             ]
         }
     ]
-} 
+}
 
 ```
 
@@ -358,4 +359,34 @@
     "requestId":"ab3dbb7dce5b4b44bc1d1c83e887ffee"
 }
 
-```
\ No newline at end of file
+```
+
+## **<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"
+}
+
+```