wdy

f3c8d8a8 · 王栋源 · feb1d83b · f3c8d8a8 · f3c8d8a8 · f3c8d8a8
Commit f3c8d8a8 authored Jul 03, 2020 by 王栋源
10 changed files
--- a/brg-user-center/app/base/api/api.base.js
+++ b/brg-user-center/app/base/api/api.base.js
@@ -9,20 +9,21 @@ class APIBase {
        this.userCenterAction = {
            "GetOverviewInfoByUser": "getOverviewInfoByUser",
            "GetOrderList": "getOrderList",
+            "GetQualificationCertificateOrderList": "getQcOrderList",
            "GetQcOrderList": "getQcOrderList",
            "GetOrderDetail": "getOrderDetail",
            "GetApplyListByUserAndType": "getApplyListByUserAndType",
            "GetApplyAndSolutionInfo": "getApplyAndSolutionInfo",
            "SelPrice2TX": "selPrice2TX",
            "GetOverviewInfoByUser": "getOverviewInfoByUser",
-            "SubmitGoodsinfo": "submitGoodsinfo",
+            "SubmitGoodsInfo": "submitGoodsinfo",
            "SubmitNeed": "needSubmit",
            "GetNeedList": "needList",
            "GetNeedDetail": "needDetail",
            "GetOrderListByStatus": "getOrderListByStatus",
            "GetQualificationCertificateListByUserAndType": "getQualificationCertificateListByUserAndType",
            "GetQualificationCertificateDetail": "getQualificationCertificateDetail",
-            "RefusalSolution": "refusalSolution",
+            "RefuseSolution": "refusalSolution",
            "SendVerificationCode": "sendVerificationCode",
            "CheckBusinessNameList": "checkBusinessNameList",
        };

--- a/brg-user-center/app/base/api/impl/action/need.js
+++ b/brg-user-center/app/base/api/impl/action/need.js
@@ -28,15 +28,15 @@ class Need extends APIBase {
        ];
        var self = this;
        if (verificationCodeList.indexOf(action_type) > -1) {
-            if (!pobj.actionBody.ContactsMoblie) {
+            if (!pobj.actionBody.ContactsMobile) {
-                opResult = system.getResult(null, "contactsMoblie参数错误");
+                opResult = system.getResult(null, "ContactsMobile参数错误");
                return opResult;
            }
            if (!pobj.actionBody.VerificationCode) {
                opResult = system.getResult(null, "verificationCode参数错误");
                return opResult;
            }
-            var v = await self.utilsMsgSendSve.getVerificationCode(pobj.actionBody.ContactsMoblie);
+            var v = await self.utilsMsgSendSve.getVerificationCode(pobj.actionBody.ContactsMobile);
            if (v != pobj.actionBody.VerificationCode) {
                opResult = system.getResult(null, "验证码错误");
                return opResult;

--- a/brg-user-center/app/base/db/impl/order/orderDeliveryDao.js
+++ b/brg-user-center/app/base/db/impl/order/orderDeliveryDao.js
@@ -31,7 +31,10 @@ class OrderDeliveryDao extends Dao{
      userId:userId,
      status:status
    };
-    var sql = "select * from v_order_oproduct_odelivery where deleted_at is null and delivery_status = :status "+
+    var sql = "select `order_num`,`tx_orders_num` as main_orders_num,`need_num`,`user_name`,`user_id`,"+
+    "`updated_at`,`total_sum`,`refund_sum`,`pay_time`,`order_status`,`order_status_name`,`servicer_code`,"+
+    "`servicer_name`,`product_type`,`product_type_name`,`order_snapshot`,`end_time`,`time_span`,`time_unit`,"+
+    "`region_id`,`region_name`,`delivery_status`,`delivery_status_name`,`deliver_content` from v_order_oproduct_odelivery where deleted_at is null and delivery_status = :status "+
    " and user_id = :userId ";
    var list = await this.customQuery(sql, params);
    return list;

--- a/brg-user-center/app/base/db/models/need/needInfo.js
+++ b/brg-user-center/app/base/db/models/need/needInfo.js
@@ -6,7 +6,7 @@ module.exports = (db, DataTypes) => {
    user_id: DataTypes.STRING(100),
    user_name: DataTypes.STRING(100),	//user_name	用户名称
    contacts_name: DataTypes.STRING(20),	//contacts_name	联系人姓名
-    contacts_moblie: DataTypes.STRING(20),	//contacts_moblie	联系人电话
+    contacts_mobile: DataTypes.STRING(20),	//contacts_mobile	联系人电话
    region_id: DataTypes.STRING(100),	//region_id	地区id
    region_name: DataTypes.STRING(100),	//region_name	地区名称
    consult_type: DataTypes.STRING(100),	//consult_type	需求类型（产品二类id）

--- a/brg-user-center/app/base/service/impl/need/needInfoSve.js
+++ b/brg-user-center/app/base/service/impl/need/needInfoSve.js
@@ -50,8 +50,8 @@ class NeedInfoService extends ServiceBase {
   */
  //创建需求
  async needSubmit(actionBody) {
-    if (!actionBody.ContactsMoblie) {
+    if (!actionBody.ContactsMobile) {
-      return system.getResultFail(-102, "contactsMoblie cannot be empty");
+      return system.getResultFail(-102, "ContactsMobile cannot be empty");
    }
    if (!actionBody.RegionId) {
      return system.getResultFail(-102, "regionId cannot be empty");
@@ -86,7 +86,7 @@ class NeedInfoService extends ServiceBase {
      var datavalue = {
        need_num: need_num,
        user_id: actionBody.UserId,
-        contacts_moblie: actionBody.ContactsMoblie,
+        contacts_mobile: actionBody.ContactsMobile,
        contacts_name: actionBody.ContactsName || "",
        region_id: actionBody.RegionId,
        region_name: actionBody.RegionName,
@@ -96,7 +96,9 @@ class NeedInfoService extends ServiceBase {
        servicer_code: actionBody.ServicerCode,
        servicer_name: actionBody.ServicerName,
        status: 1,
-        user_name: actionBody.UserName
+        user_name: actionBody.UserName,
+        email: actionBody.Email,
+        wechat_no: actionBody.WechatNo
      }
      if (actionBody.CompanyName) {
        datavalue.need_info = {

--- a/brg-user-center/app/base/service/impl/order/applyInfoSve.js
+++ b/brg-user-center/app/base/service/impl/order/applyInfoSve.js
@@ -121,10 +121,10 @@ class ApplyInfoService extends ServiceBase {
    var waitReceiveFileOrderCount = await this.orderDeliveryDao.findOverviewCount(150, ab.UserId, ab.ProductTypeOne);//待收文件数量
    // var unpaidCount = await this.orderInfoDao.findCount({where:{order_status:0}});//待支付订单数量
    if(ab.ProductTypeOne == "qcfw"){//资质证照
-      var icpCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/icp/",ab.UserId);//icp数量
+      var internetContentProviderCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/icp/",ab.UserId);//icp数量
-      var ediCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/edi/",ab.UserId);//edi数量
+      var electronicDataInterchangeCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/edi/",ab.UserId);//edi数量
      var resultObj = {
-        icpCount: icpCount, waitConfirmCount: waitConfirmCount, ediCount: ediCount,
+        internetContentProviderCount: internetContentProviderCount, waitConfirmCount: waitConfirmCount, electronicDataInterchangeCount: electronicDataInterchangeCount,
        waitReceiveFileOrderCount: waitReceiveFileOrderCount
      };
      return system.getResult(resultObj);

--- a/brg-user-center/app/base/service/impl/order/orderInfoSve.js
+++ b/brg-user-center/app/base/service/impl/order/orderInfoSve.js
@@ -31,7 +31,7 @@ class OrderInfoService extends ServiceBase {
      attributes: [
        "pay_time",
        "order_num",
-        "tx_orders_num",   //腾讯主订单号
+        ["tx_orders_num","main_orders_num"],   //腾讯主订单号
        "need_num",   //需求号
        "user_name",   //用户名称
        "quantity",   //订单数量
@@ -50,8 +50,8 @@ class OrderInfoService extends ServiceBase {
      return system.getResultFail(-300, "未知订单信息");
    }
    var relatedProductsList = [];
-    if (orderinfo.tx_orders_num) {
+    if (orderinfo.main_orders_num) {
-      relatedProductsList = await this.getRelatedProductsList(orderinfo.tx_orders_num, ab.UserId, ab.OrderNum);
+      relatedProductsList = await this.getRelatedProductsList(orderinfo.main_orders_num, ab.UserId, ab.OrderNum);
    }
    orderinfo["relatedProductsList"] = relatedProductsList;
    var deliveryParams = {
@@ -236,7 +236,9 @@ class OrderInfoService extends ServiceBase {
        order_num: pobj.actionBody.interface.para.dealName,
        user_id: pobj.actionBody.interface.para.uin,
        delivery_status: 1,
-        user_name: txorderdetail.goodsDetail.formInfo.userName
+        user_name: txorderdetail.goodsDetail.formInfo.userName,
+        email: txorderdetail.goodsDetail.formInfo.email || "",
+        wechat_no: txorderdetail.goodsDetail.formInfo.wechatNo || ""
      }
      var orderDeliveryinfo = await self.orderDeliveryDao.create(orderDeliveryobj, t);
      var orderPayobj = {
@@ -280,7 +282,7 @@ class OrderInfoService extends ServiceBase {
          "regionId": txorderdetail.goodsDetail.formInfo.serviceCode,
          "regionName": txorderdetail.goodsDetail.formInfo.serviceArea,
          "contactsName": txorderdetail.goodsDetail.formInfo.contactsName,
-          "contactsMoblie": txorderdetail.goodsDetail.formInfo.contactsMoblie,
+          "contactsMobile": txorderdetail.goodsDetail.formInfo.contactsMobile,
          "productType": txorderdetail.goodsDetail.product.productType,
          "productTypeName": txorderdetail.goodsDetail.product.productTypeName,
          "txPriceCode": txorderdetail.goodsDetail.product.txPriceCode,
@@ -495,7 +497,9 @@ class OrderInfoService extends ServiceBase {
        order_num: pobj.actionBody.interface.para.dealName,
        user_id: pobj.actionBody.interface.para.uin,
        delivery_status: 1,
-        user_name: txorderdetail.goodsDetail.formInfo.userName
+        user_name: txorderdetail.goodsDetail.formInfo.userName,
+        email: txorderdetail.goodsDetail.formInfo.email || "",
+        wechat_no: txorderdetail.goodsDetail.formInfo.wechatNo || ""
      }
      var orderDeliveryinfo = await self.orderDeliveryDao.create(orderDeliveryobj, t);
      var orderPayobj = {
@@ -539,7 +543,7 @@ class OrderInfoService extends ServiceBase {
          "regionId": txorderdetail.goodsDetail.formInfo.serviceCode,
          "regionName": txorderdetail.goodsDetail.formInfo.serviceArea,
          "contactsName": txorderdetail.goodsDetail.formInfo.contactsName,
-          "contactsMoblie": txorderdetail.goodsDetail.formInfo.contactsMoblie,
+          "contactsMobile": txorderdetail.goodsDetail.formInfo.contactsMobile,
          "productType": txorderdetail.goodsDetail.product.productType,
          "productTypeName": txorderdetail.goodsDetail.product.productTypeName,
          "txPriceCode": txorderdetail.goodsDetail.product.txPriceCode,

--- a/brg-user-center/app/base/service/impl/order/orderProductSve.js
+++ b/brg-user-center/app/base/service/impl/order/orderProductSve.js
@@ -21,7 +21,7 @@ class OderproductService extends ServiceBase {
  //       "regionId":actionbody.regionId,
  //       "regionName":actionbody.regionName,
  //       "contactsName":actionbody.contactsName,
-  //       "contactsMoblie":actionbody.contactsMoblie,
+  //       "contactsMobile":actionbody.contactsMobile,
  //       "productType":actionbody.productType,
  //       "orderSnapshot":order_snapshot
  //   }

--- a/brg-user-center/app/front/entry/public/apidoc/customer/order.md
+++ b/brg-user-center/app/front/entry/public/apidoc/customer/order.md
@@ -7,12 +7,12 @@
 1. [用户获取业务主体详情](#GetApplyAndSolutionInfo)
 1. [商城询价接口](#SelPrice2TX)
 1. [用户获取概览数据](#GetOverviewInfoByUser)
-1. [立即购买](#SubmitGoodsinfo)
+1. [立即购买](#SubmitGoodsInfo)
 1. [需求提交](#SubmitNeed)
 1. [需求列表](#GetNeedList)
 1. [需求详情](#GetNeedDetail)
 1. [根据交付状态获取订单列表](#GetOrderListByStatus)
-1. [关闭需求](#RefusalSolution)
+1. [关闭需求](#RefuseSolution)
 1. [我的资质证照列表](#GetQualificationCertificateListByUserAndType)
 1. [我的资质证照详情](#GetQualificationCertificateDetail)
@@ -440,13 +440,13 @@
 }
 ```
-## **<a name="SubmitGoodsinfo"> 立即购买</a>**
+## **<a name="SubmitGoodsInfo"> 立即购买</a>**
 [返回到目录](#menu)
 ##### URL
 [/api/action/order/springBoard]
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`
-#### 功能模块 Action：SubmitGoodsinfo
+#### 功能模块 Action：SubmitGoodsInfo
 #### 参数说明
@@ -466,7 +466,7 @@
 #### 参数示例
 ``` javascript
   {
-	"Action": "SubmitGoodsinfo",
+	"Action": "SubmitGoodsInfo",
    "VerificationCode": "564264",
    "Info":"[{\"product\":{\"productIcon\":null,\"productType\":\"/ic/kzfw/\",\"productTypeName\":\"/工商服务/刻章服务/\",\"servicerCode\":\"测试服务商\"},\"productSnapshot\":{\"timeSpan\":\"1\",\"timeUnit\":\"p\",\"pid\":1003952,\"productCode\":\"p_business_registration\",\"goodsSubType\":\"sp_business_registration_chapter\",\"subProductCode\":\"sp_business_registration_chapter\",\"qifuzidingyi\":\"beijing\",\"sv_business_registration_type_fivechapter\":\"1\"},\"showInfo\":[{\"name\":\"公司名称\",\"value\":\"公司宝\"},{\"name\":\"公司名称\",\"value\":\"公司宝\"}],\"formInfo\":{}}]"
@@ -500,7 +500,7 @@
 |   参数名   | 必填  |  类型   | 描述  |
 |  ----  | ----  |  ----  | ----  |
 | UserName  | 是 |  string   | 用户名称  |
-| ContactsMoblie  | 是 |  string   | 联系人电话  |
+| ContactsMobile  | 是 |  string   | 联系人电话  |
 | ContactsName  | 否 |  string   | 联系人名称  |
 | RegionId  | 是 |  string   | 地区id  |
 | RegionName  | 是 |  string   | 地区名称  |
@@ -520,7 +520,7 @@
   {
        "Action": "SubmitNeed",
        "UserName": "011",
-        "ContactsMoblie":"17610163852",
+        "ContactsMobile":"17610163852",
        "ContactsName":"wdy",
        "RegionId":"110100",
        "RegionName":"北京",
@@ -583,7 +583,7 @@
        "Status": 1,
        "InstanceSet": {
            "Count": 8,
-            "Rows": "[{\"id\":103,\"need_num\":\"N202006201537aL6MrDE\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"wdy\",\"contacts_moblie\":\"17610163852\",\"region_id\":\"320100\",\"region_name\":\"南京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"svlhusghsjhvseiluhuvuivfhi\",\"need_info\":null,\"servicer_code\":\"GSB\",\"servicer_name\":null,\"created_at\":\"2020-06-20T07:37:44.000Z\",\"updated_at\":\"2020-06-20T07:37:44.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":102,\"need_num\":\"N202006201142FJdqXPC\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"wdy\",\"contacts_moblie\":\"17610163852\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"svlhusghsjhvseiluhuvuivfhi\",\"need_info\":null,\"servicer_code\":\"S_202006201007FI8tuF\",\"servicer_name\":\"网易云\",\"created_at\":\"2020-06-20T03:42:37.000Z\",\"updated_at\":\"2020-06-20T03:42:37.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":100,\"need_num\":\"N202006201129Qba19e2\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"wdy\",\"contacts_moblie\":\"17610163852\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"svlhusghsjhvseiluhuvuivfhi\",\"need_info\":null,\"servicer_code\":\"S_202006201007FI8tuF\",\"servicer_name\":\"网易云\",\"created_at\":\"2020-06-20T03:29:33.000Z\",\"updated_at\":\"2020-06-20T03:29:33.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":67,\"need_num\":\"N202006161642ODMRsRW\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_moblie\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":68,\"need_num\":\"N202006161642nBRBToJ\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_moblie\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":69,\"need_num\":\"N202006161642dtAo81x\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_moblie\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":70,\"need_num\":\"N202006161642AjjLIsr\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_moblie\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":61,\"need_num\":\"N202006141134GQ7HV3a\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"北京\",\"contacts_moblie\":\"18262855372\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"00000000000000000\",\"need_info\":null,\"servicer_code\":\"S_202006051002UE4Lse\",\"servicer_name\":\"测试服务商\",\"created_at\":\"2020-06-14T03:34:50.000Z\",\"updated_at\":\"2020-06-14T03:34:50.000Z\",\"deleted_at\":null,\"version\":0}]"
+            "Rows": "[{\"id\":103,\"need_num\":\"N202006201537aL6MrDE\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"wdy\",\"contacts_mobile\":\"17610163852\",\"region_id\":\"320100\",\"region_name\":\"南京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"svlhusghsjhvseiluhuvuivfhi\",\"need_info\":null,\"servicer_code\":\"GSB\",\"servicer_name\":null,\"created_at\":\"2020-06-20T07:37:44.000Z\",\"updated_at\":\"2020-06-20T07:37:44.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":102,\"need_num\":\"N202006201142FJdqXPC\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"wdy\",\"contacts_mobile\":\"17610163852\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"svlhusghsjhvseiluhuvuivfhi\",\"need_info\":null,\"servicer_code\":\"S_202006201007FI8tuF\",\"servicer_name\":\"网易云\",\"created_at\":\"2020-06-20T03:42:37.000Z\",\"updated_at\":\"2020-06-20T03:42:37.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":100,\"need_num\":\"N202006201129Qba19e2\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"wdy\",\"contacts_mobile\":\"17610163852\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"svlhusghsjhvseiluhuvuivfhi\",\"need_info\":null,\"servicer_code\":\"S_202006201007FI8tuF\",\"servicer_name\":\"网易云\",\"created_at\":\"2020-06-20T03:29:33.000Z\",\"updated_at\":\"2020-06-20T03:29:33.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":67,\"need_num\":\"N202006161642ODMRsRW\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_mobile\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":68,\"need_num\":\"N202006161642nBRBToJ\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_mobile\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":69,\"need_num\":\"N202006161642dtAo81x\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_mobile\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":70,\"need_num\":\"N202006161642AjjLIsr\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"\",\"contacts_mobile\":\"18735397229\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":null,\"created_at\":\"2020-06-16T08:42:14.000Z\",\"updated_at\":\"2020-06-16T08:42:14.000Z\",\"deleted_at\":null,\"version\":0},{\"id\":61,\"need_num\":\"N202006141134GQ7HV3a\",\"user_id\":\"011\",\"user_name\":null,\"contacts_name\":\"北京\",\"contacts_mobile\":\"18262855372\",\"region_id\":\"110100\",\"region_name\":\"北京\",\"consult_type\":\"/ic/gsreg/\",\"consult_type_name\":\"/工商服务/公司注册/\",\"status\":1,\"status_name\":\"已提交\",\"notes\":\"00000000000000000\",\"need_info\":null,\"servicer_code\":\"S_202006051002UE4Lse\",\"servicer_name\":\"测试服务商\",\"created_at\":\"2020-06-14T03:34:50.000Z\",\"updated_at\":\"2020-06-14T03:34:50.000Z\",\"deleted_at\":null,\"version\":0}]"
        },
        "RequestId": "af0cf310-b2ce-11ea-9dd5-03e6b499c7e6"
    }
@@ -619,7 +619,7 @@
    "Response": {
        "Status": 1,
        "InstanceSet": {
-            "NeedInfo": "{\"id\":20,\"need_num\":\"N202006130012\",\"user_id\":\"1\",\"user_name\":\"张三\",\"contacts_name\":\"张三\",\"contacts_moblie\":\"13075556693\",\"region_id\":\"1\",\"region_name\":\"北京\",\"consult_type\":\"/qcfw/icp/\",\"consult_type_name\":\"/资质证照/icp/\",\"status\":2,\"status_name\":\"待用户确认\",\"notes\":\"测试数据勿删\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":\"公司宝\",\"created_at\":\"2020-06-03T16:04:45.000Z\",\"updated_at\":\"2020-06-20T08:58:06.000Z\",\"deleted_at\":null,\"version\":null}",
+            "NeedInfo": "{\"id\":20,\"need_num\":\"N202006130012\",\"user_id\":\"1\",\"user_name\":\"张三\",\"contacts_name\":\"张三\",\"contacts_mobile\":\"13075556693\",\"region_id\":\"1\",\"region_name\":\"北京\",\"consult_type\":\"/qcfw/icp/\",\"consult_type_name\":\"/资质证照/icp/\",\"status\":2,\"status_name\":\"待用户确认\",\"notes\":\"测试数据勿删\",\"need_info\":null,\"servicer_code\":\"gsb\",\"servicer_name\":\"公司宝\",\"created_at\":\"2020-06-03T16:04:45.000Z\",\"updated_at\":\"2020-06-20T08:58:06.000Z\",\"deleted_at\":null,\"version\":null}",
            "SolutionInfo": "{\"id\":17,\"need_num\":\"N202006130012\",\"solution_num\":\"NS_202006130920sregN\",\"user_id\":\"1\",\"user_name\":\"张三\",\"solution_content\":{\"id\":26,\"bizopt_id\":32,\"clerkName\":\"小三\",\"clerkPhone\":\"4567800\",\"updated_at\":\"2020-06-02 20:32:14\",\"remark_info\":\"77777777777777777777777\",\"scheme_info\":{\"address\":\"hangzhou\",\"company\":\"77777777777777\",\"annual_report\":true},\"businessType\":\"/qcfw/icp/\",\"servicerCode\":\"1\",\"servicerName\":\"公司宝\",\"salesman_name\":\"小三\",\"facilitator_id\":\"test\",\"salesman_phone\":\"199299949424\",\"refusal_content\":\"\",\"facilitator_name\":\"测试服务商\"},\"is_refusal\":1,\"refusal_notes\":\"测试修改方案\",\"created_at\":\"2020-06-13T01:20:30.000Z\",\"deleted_at\":null,\"version\":0}"
        },
        "RequestId": "626a5c90-b2d4-11ea-b81b-89b08281dc19"
@@ -708,14 +708,14 @@
 ```
-## **<a name="RefusalSolution"> 关闭需求推送到服务商</a>**
+## **<a name="RefuseSolution"> 关闭需求推送到服务商</a>**
 [返回到目录](#menu)
 ##### URL
 [/api/receive/needApi/springBoard]
 #### 参数格式  `JSON`人
 #### HTTP请求方式 `POST`
-#### 渠道执行的类型 Action：RefusalSolution
+#### 渠道执行的类型 Action：RefuseSolution
 参数名 |  必须 | 字段类型 | 长度限制 | 说明
 -|-|-|-|-
@@ -726,7 +726,7 @@ RefusalContent | Y | string | 100 | 备注信息
 #### 参数示例
 ``` javascript
 {
-    "Action": "RefusalSolution",
+    "Action": "RefuseSolution",
    "NeedNum":"",
    "SolutionNum":"",
    "RefusalContent":""  //描述

--- a/brg-user-center/app/front/entry/public/apidoc/pushReceive/push.md
+++ b/brg-user-center/app/front/entry/public/apidoc/pushReceive/push.md
@@ -25,7 +25,7 @@ servicerName | Y | string | 100 | 服务商名称
 regionId | Y | string | 100 | 地区id
 regionName | Y | string | 100 | 地区名称
 contactsName | Y | string | 100 | 用户名称
-contactsMoblie | Y | string | 100 | 用户电话
+ContactsMobile | Y | string | 100 | 用户电话
 consultType | Y | int | 100 | 需求类型
 consultTypeName | Y | int | 100 | 需求类型名称
@@ -39,7 +39,7 @@ servicerName | Y | string | 100 | 服务商名称
 regionId | Y | string | 100 | 地区id
 regionName | Y | string | 100 | 地区名称
 contactsName | Y | string | 100 | 用户名称
-contactsMoblie | Y | string | 100 | 用户电话
+ContactsMobile | Y | string | 100 | 用户电话
 consultType | Y | int | 100 | 需求类型
 consultTypeName | Y | int | 100 | 需求类型名称
 companyName | Y | int | 100 | 公司名称
@@ -55,7 +55,7 @@ companyName | Y | int | 100 | 公司名称
        "regionId":"1",
        "regionName":"北京",
        "contactsName":"张三",
-        "contactsMoblie":"17610163853",
+        "ContactsMobile":"17610163853",
        "consultType":"/ic/gsreg/"，
        "consultTypeName":"/工商服务/公司注册/"，
        "servicerCode: "gsb",
@@ -94,7 +94,7 @@ servicerName | Y | string | 100 | 服务商名称
 regionId | Y | string | 100 | 地区id
 regionName | Y | string | 100 | 地区名称
 contactsName | Y | string | 100 | 用户名称
-contactsMoblie | Y | string | 100 | 用户电话
+contactsMobile | Y | string | 100 | 用户电话
 productType | Y | int | 100 | 产品类型
 productTypeName | Y | int | 100 | 产品类型名称
@@ -109,7 +109,7 @@ servicerName | Y | string | 100 | 服务商名称
 regionId | Y | string | 100 | 地区id
 regionName | Y | string | 100 | 地区名称
 contactsName | Y | string | 100 | 用户名称
-contactsMoblie | Y | string | 100 | 用户电话
+contactsMobile | Y | string | 100 | 用户电话
 productType | Y | int | 100 | 产品类型
 productTypeName | Y | int | 100 | 产品类型名称
 order_snapshot | Y | string | 500 | 订单快照(json转字符串)
@@ -126,7 +126,7 @@ order_snapshot | Y | string | 500 | 订单快照(json转字符串)
        "regionId":"",
        "regionName":"",
        "contactsName":"",
-        "contactsMoblie":"",
+        "contactsMobile":"",
        "productType":""
        "orderSnapshot":{}
    }