Skip to content

Z
zhichan
Commit 5a844df6 by 孙亚楠
Options

修改短信服务bug

parent a7267b07
Showing with 41 additions and 35 deletions
xggsve-common/app/base/service/impl/common/smsinfoSve.js
...@@ -2,7 +2,7 @@ const system = require("../../../system"); ...@@ -2,7 +2,7 @@ const system = require("../../../system");
const settings = require("../../../../config/settings") const settings = require("../../../../config/settings")
const Core = require('@alicloud/pop-core'); const Core = require('@alicloud/pop-core');
const ServiceBase = require("../../sve.base"); const ServiceBase = require("../../sve.base");
class SmsinfoService extends ServiceBase { class SmsinfoService extends ServiceBase {
constructor() { constructor() {
super("common", ServiceBase.getDaoName(SmsinfoService)); super("common", ServiceBase.getDaoName(SmsinfoService));
let aliSmsConfig = settings.aliSmsConfig(); let aliSmsConfig = settings.aliSmsConfig();
...@@ -26,40 +26,45 @@ class SmsinfoService extends ServiceBase { ...@@ -26,40 +26,45 @@ class SmsinfoService extends ServiceBase {
if (!loginTemplateConfig) { if (!loginTemplateConfig) {
return system.getResult(-1, `参数错误 模板不存在`); return system.getResult(-1, `参数错误 模板不存在`);
} }
if(!params.phoneNumbers){ if (!params.phoneNumbers) {
return system.getResult(null,`参数错误 手机号不能为空`); return system.getResult(null, `参数错误 手机号不能为空`);
} }
let data = { let data = {
"RegionId": "cn-hangzhou", "RegionId": "cn-hangzhou",
"PhoneNumbers":params.phoneNumbers, "PhoneNumbers": params.phoneNumbers,
"TemplateCode":loginTemplateConfig.code, "TemplateCode": loginTemplateConfig.code,
"TemplateParam": `{\"code\":\"${params.code}\"}`,
"SignName":this.aliSmsConfigration.signName "SignName": this.aliSmsConfigration.signName
}
if (params.hasOwnProperty("code")) {
data.TemplateParam = `{\"code\":\"${params.code}\"}`;
}else if(params.hasOwnProperty("name")){
data.TemplateParam = `{\"name\":\"${params.name}\"}`;
} }
try { try {
//创建记录 //创建记录
let _smsInfo = await this.dao.create({ let _smsInfo = await this.dao.create({
regionId:data.RegionId, regionId: data.RegionId,
phoneNumbers:data.PhoneNumbers, phoneNumbers: data.PhoneNumbers,
templateCode:data.TemplateCode, templateCode: data.TemplateCode,
templateParam:data.TemplateParam, templateParam: data.TemplateParam,
signName:data.SignName signName: data.SignName
}); });
let res = await this.client.request('SendSms', data, { let res = await this.client.request('SendSms', data, {
method: 'POST' method: 'POST'
}); });
_smsInfo.result = JSON.stringify(res); _smsInfo.result = JSON.stringify(res);
if(res.Code=="OK"){ if (res.Code == "OK") {
_smsInfo.success = 1; _smsInfo.success = 1;
}else{ } else {
_smsInfo.success =0; _smsInfo.success = 0;
} }
await _smsInfo.save(); await _smsInfo.save();
return system.getResult(res); return system.getResult(res);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
...@@ -68,15 +73,15 @@ class SmsinfoService extends ServiceBase { ...@@ -68,15 +73,15 @@ class SmsinfoService extends ServiceBase {
* @param {*} params * @param {*} params
*/ */
async querySendDetails(params) { async querySendDetails(params) {
if(!params.phoneNumbers){ if (!params.phoneNumbers) {
return system.getResult(null,`参数错误 手机号不能为空`); return system.getResult(null, `参数错误 手机号不能为空`);
} }
if(!params.sendDate){ if (!params.sendDate) {
return system.getResult(null,`参数错误 日期不能为空`); return system.getResult(null, `参数错误 日期不能为空`);
} }
let data = { let data = {
"RegionId": "cn-hangzhou", "RegionId": "cn-hangzhou",
"PhoneNumbers":params.phoneNumbers, "PhoneNumbers": params.phoneNumbers,
"SendDate": this.trim(params.sendDate), "SendDate": this.trim(params.sendDate),
"PageSize": Number(this.trim(params.pageSize) || 10), "PageSize": Number(this.trim(params.pageSize) || 10),
"CurrentPage": Number(this.trim(params.currentPage) || 1), "CurrentPage": Number(this.trim(params.currentPage) || 1),
...@@ -85,10 +90,10 @@ class SmsinfoService extends ServiceBase { ...@@ -85,10 +90,10 @@ class SmsinfoService extends ServiceBase {
let res = await this.client.request('QuerySendDetails', data, { let res = await this.client.request('QuerySendDetails', data, {
method: 'POST' method: 'POST'
}); });
return system.getResult(res); return system.getResult(res);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
return system.getResult(null,`系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
...@@ -96,24 +101,24 @@ class SmsinfoService extends ServiceBase { ...@@ -96,24 +101,24 @@ class SmsinfoService extends ServiceBase {
* 条件查询所有的记录 * 条件查询所有的记录
* @param {*} params * @param {*} params
*/ */
async querySmsInfos(params){ async querySmsInfos(params) {
let where = {}; let where = {};
if(params.regionId){ if (params.regionId) {
where.regionId = this.trim(params.regionId); where.regionId = this.trim(params.regionId);
} }
if(params.phoneNumbers){ if (params.phoneNumbers) {
where.phoneNumbers = this.trim(params.phoneNumbers); where.phoneNumbers = this.trim(params.phoneNumbers);
} }
if(params.templateCode){ if (params.templateCode) {
where.templateCode = this.trim(params.templateCode); where.templateCode = this.trim(params.templateCode);
} }
if(params.templateParam){ if (params.templateParam) {
where.templateParam = this.trim(params.templateParam); where.templateParam = this.trim(params.templateParam);
} }
if(params.signName){ if (params.signName) {
where.signName = this.trim(params.signName); where.signName = this.trim(params.signName);
} }
if(params.hasOwnProperty("success")){ if (params.hasOwnProperty("success")) {
where.success = this.trim(params.success); where.success = this.trim(params.success);
} }
var currentPage = Number(params.currentPage || 1); var currentPage = Number(params.currentPage || 1);
...@@ -122,19 +127,19 @@ class SmsinfoService extends ServiceBase { ...@@ -122,19 +127,19 @@ class SmsinfoService extends ServiceBase {
["id", 'desc'] ["id", 'desc']
]; ];
var attributes = ["id", "regionId", "phoneNumbers", "templateCode", "templateParam","signName","result","success", "created_at"]; var attributes = ["id", "regionId", "phoneNumbers", "templateCode", "templateParam", "signName", "result", "success", "created_at"];
try { try {
var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes); var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
return system.getResult(page); return system.getResult(page);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
return system.getResult(null,`系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
trim(o) { trim(o) {
if(!o) { if (!o) {
return ""; return "";
} }
return o.toString().trim(); return o.toString().trim();
......
xggsve-common/app/front/entry/public/apidoc/common/aliSms.md
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
"action_body": { "action_body": {
"templateName": "loginTemplate", // 模板类型 loginTemplate（登陆） authenticationTemplate（验证） smsTemplate(短信通知) "templateName": "loginTemplate", // 模板类型 loginTemplate（登陆） authenticationTemplate（验证） smsTemplate(短信通知)
"phoneNumbers": "18833836395", // 手机号 "phoneNumbers": "18833836395", // 手机号
"code":"1111", // 模板参数 "code":"1111", // 模板参数 默认字段 如果是短信通知模板，则请勿传值
"name":"孙总统", // 模板参数 如果templateName值为smsTemplate 则需要传此字段不要传code字段
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment