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

center-channel/app/base/api/impl/auth/accessAuth.js

@@ -100,6 +100,9 @@ class AccessAuthAPI extends WEBBase {
             case "putUserPwdByMobile"://通过手机验证码修改用户密码---已优化
             case "putUserPwdByMobile"://通过手机验证码修改用户密码---已优化
                 opResult = await this.utilsAuthSve.putUserPwdByMobile(pobj, pobj.actionBody);
                 opResult = await this.utilsAuthSve.putUserPwdByMobile(pobj, pobj.actionBody);
                 break;
                 break;
+            case "putUserMobileByVcode"://通过手机验证码修改手机号，邮箱
+                opResult = await this.utilsAuthSve.putUserMobileByVcode(pobj, pobj.actionBody);
+                break;
             case "getLoginInfo"://通过userpin获取用户登录信息--已经废弃，在路由中处理了
             case "getLoginInfo"://通过userpin获取用户登录信息--已经废弃，在路由中处理了
                 opResult = await this.utilsAuthSve.getLoginInfo(pobj, pobj.actionBody);
                 opResult = await this.utilsAuthSve.getLoginInfo(pobj, pobj.actionBody);
                 break;
                 break;

center-channel/app/base/service/impl/common/qcCenterOrderSve.js

@@ -60,7 +60,7 @@ class QcCenterOrderService extends AppServiceBase {
         IntentionBizId: needinfo.channelNeedNo,
         IntentionBizId: needinfo.channelNeedNo,
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
         Area: solution.Area, Note: solution.Note,
         Area: solution.Area, Note: solution.Note,
-        ActionType:solution.ActionType,
+        ActionType:solution.actionType,
         Source:"官网"
         Source:"官网"
       };
       };
       if (needsolution.channelSolutionNo) {
       if (needsolution.channelSolutionNo) {
@@ -635,5 +635,32 @@ async foodRecordLogList(pobj) {
   return system.getResultSuccess(res);
   return system.getResultSuccess(res);
 }
 }
 
 
+// //推送ICP方案
+// async pushIcpSolution1(pushObj, solutionNo, appInfo, self) {
+//         //推送方案确认信息
+//         var confirmRes = await this.aliclient.reqbyget({ action: "ConfirmIntention", reqbody: { BizId: pushObj.IntentionBizId }, apiVersion: "2019-05-08" });
+//         console.log("confirmRes",confirmRes)
+//         // if (confirmRes && confirmRes.status == 0 && confirmRes.data) {
+//         //   var confirmResData = confirmRes.data;
+//         //   if (confirmResData.ConfirmUrl) {
+//         //     var reqObj3 = {
+//         //       actionType: "receiveIcpConfirmUrl",
+//         //       appInfo: appInfo,
+//         //       actionBody: {
+//         //         solutionNo: solutionNo,
+//         //         confirmUrl: confirmResData.ConfirmUrl
+//         //       }
+//         //     };
+//         //     var a = await self.reqCenterOrderApi(reqObj3);//保存用户确认方案url
+//         //   }
+//         // }
+//         // return confirmRes;
+// }
+
 }
 }
-module.exports = QcCenterOrderService;
+module.exports = QcCenterOrderService;
\ No newline at end of file
+
+// var a = new QcCenterOrderService();
+// a.pushIcpSolution1({
+//   IntentionBizId:"20201016103819000001",
+// })

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

@@ -207,6 +207,25 @@ class UtilsAuthService extends AppServiceBase {
     }
     }
     return result;
     return result;
   }
   }
+
+  /**
+   * 通过手机验证码修改用户手机号，邮箱
+   * @param {*} pobj
+   * @param {*} actionBody {mobile:XX,vcode:XXX,newPwd:XXX,userpin:XXXXX}
+   */
+  async putUserMobileByVcode(pobj, actionBody) {
+    if (!actionBody.vcode) {
+      return system.getResult(null, "pobj.vcode can not be empty ！");
+    }
+    if (!pobj.appInfo) {
+      return system.getResult(null, "pobj.appInfo can not be empty ！");
+    }
+    var result = await this.restPostUrl(pobj, this.centerAppUrl + "auth/accessAuth/putUserMobileByVcode");
+    if (result.status == 0) {
+      this.userLogout(pobj, actionBody);
+    }
+    return result;
+  }
   /**
   /**
    * 通过userpin获取用户登录信息
    * 通过userpin获取用户登录信息
    * @param {*} pobj
    * @param {*} pobj

center-channel/app/config/businessConfig.js

@@ -15,7 +15,8 @@ module.exports = {
             "getItemByNeedNo", "opNeedDetailByChannelNo", "getNeedListUser", "manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo", "diagnosisDetail",
             "getItemByNeedNo", "opNeedDetailByChannelNo", "getNeedListUser", "manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo", "diagnosisDetail",
             "submitIcpIntention", "queryIntentionList", "confirmIcpIntention", "tmAccept", "tmStatus", "needBatchUpload",
             "submitIcpIntention", "queryIntentionList", "confirmIcpIntention", "tmAccept", "tmStatus", "needBatchUpload",
             "serviceSubmitOption", "submitWangwenSolution", "closeNeed", "recordLog", "recordLogList", "foodServiceSubmitOption", "submitFoodSolution",
             "serviceSubmitOption", "submitWangwenSolution", "closeNeed", "recordLog", "recordLogList", "foodServiceSubmitOption", "submitFoodSolution",
-            "foodCloseNeed", "foodRecordLog", "foodRecordLogList", "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo"
+            "foodCloseNeed", "foodRecordLog", "foodRecordLogList", "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo","putUserMobileByVcode",
+            "putUserPwdByMobile"
         ],
         ],
         apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo"]
         apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo"]
     }
     }

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

@@ -4,6 +4,7 @@
 1. [验证码登录](#userPinByLgoinVcode)
 1. [验证码登录](#userPinByLgoinVcode)
 1. [用户注册](#userPinByRegister)
 1. [用户注册](#userPinByRegister)
 1. [按照手机号和验证码修改密码](#putUserPwdByMobile)
 1. [按照手机号和验证码修改密码](#putUserPwdByMobile)
+1. [按照验证码修改手机号、邮箱](#putUserMobileByVcode)
 1. [获取用户登录信息](#getLoginInfo)
 1. [获取用户登录信息](#getLoginInfo)
 1. [退出](#logout)
 1. [退出](#logout)
 1. [飞书登录](#feishuLogin)
 1. [飞书登录](#feishuLogin)
@@ -161,6 +162,36 @@
 
 
 ```
 ```
 
 
+## **<a name="putUserMobileByVcode"> 根据验证码修改手机号、邮箱</a>**
+[返回到目录](#menu)
+##### URL
+[/web/auth/accessAuth/springBoard]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+#### 请求头中需要增加userpin（用户登录后的凭证）的值
+#### 渠道执行的类型 actionType：putUserMobileByVcode
+
+``` javascript
+    {
+        "newMobile":"15010929366", // N 手机号
+        "vcode":"593555",   //  Y 验证码
+        "email":"123456" // Y 邮箱
+    }
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,//  0为成功，2030为验证码错误，否则失败
+    "msg": "success",
+    "data": null,
+    "requestId": "1b12b0e9c190436da000386ddf693c8f"
+
+}
+
+```
+
 
 
 ## **<a name="logout"> 退出</a>**
 ## **<a name="logout"> 退出</a>**