Skip to content

Z
zhichan
Commit deab83bc by 兰国旗
Options

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

parents c099cb21 6e4eb847
Showing with 31 additions and 22 deletions
center-channel/app/base/api/impl/opreceive/service.js
...@@ -12,6 +12,12 @@ class edi extends APIBase { ...@@ -12,6 +12,12 @@ class edi extends APIBase {
async create(pobj,query,req) { async create(pobj,query,req) {
console.log(pobj); console.log(pobj);
this.logCtl.info({
op: "service/impl/utilsSve/service.js/create",
content: "参数=" + JSON.stringify(pobj),
clientIp: req.client_ip || "",
optitle: "服务单创建接口 controller层"
});
// 校验必填 pannong 2.1 // 校验必填 pannong 2.1
var checkResult = await this.serviceCreateCheck(pobj,req.headers); var checkResult = await this.serviceCreateCheck(pobj,req.headers);
if(checkResult.status != 0) { if(checkResult.status != 0) {
...@@ -59,16 +65,16 @@ class edi extends APIBase { ...@@ -59,16 +65,16 @@ class edi extends APIBase {
return system.getResult(null, "contactName cannot be empty"); return system.getResult(null, "contactName cannot be empty");
} }
if(!pobj.contactMobile) { if(!pobj.contactMobile) {
return system.getResult(null, "contactName cannot be empty"); return system.getResult(null, "contactMobile cannot be empty");
} }
if(!pobj.timeUnit) { if(!pobj.timeUnit) {
return system.getResult(null, "contactName cannot be empty"); return system.getResult(null, "timeUnit cannot be empty");
} }
if(!pobj.quantity) { if(!pobj.quantity) {
return system.getResult(null, "contactName cannot be empty"); return system.getResult(null, "quantity cannot be empty");
} }
if(!pobj.companyInfo) { if(!pobj.companyInfo) {
return system.getResult(null, "contactName cannot be empty"); return system.getResult(null, "companyInfo cannot be empty");
} }
if(!pobj.companyInfo.companyName) { if(!pobj.companyInfo.companyName) {
return system.getResult(null, "companyName cannot be empty"); return system.getResult(null, "companyName cannot be empty");
......
center-channel/app/base/service/impl/common/signSve.js
...@@ -137,20 +137,20 @@ module.exports = SignService; ...@@ -137,20 +137,20 @@ module.exports = SignService;
// "status":"16" // "status":"16"
// } // }
// var obj = { // var obj = {
// "bizId":"202011071358", // "bizId":"OD2020110629779500",
// "contactName":"lin", // "contactMobile":"18550295628",
// "contactMobile":"13911391996", // "contactName":"范锋华",
// "timeUnit":"year", // "timeUnit":"year",
// "quantity":1, // "quantity":1,
// "companyInfo":{ // "companyInfo":{
// "companyName":"公司宝", // "companyName":"苏州磐荣信息科技有限公司",
// "taxpayerType":"NORMAL_TAXPAYER", // "taxpayerType":"NORMAL_TAXPAYER",
// "acctgSystemId":"10001", // "acctgSystemId":"10001",
// "companyForm":"1", // "companyForm":"1",
// "industry":1, // "industry":1,
// "taxpayerNumber":"123456789", // "taxpayerNumber":"123456789",
// "companyArea":"北京" // "companyArea":"北京"
// } // }
// } // }
// task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{ // task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{
// console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!"); // console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");
......
center-channel/app/base/service/impl/utilsSve/utilsServiceSve.js
...@@ -188,7 +188,7 @@ class utils360Sve extends AppServiceBase { ...@@ -188,7 +188,7 @@ class utils360Sve extends AppServiceBase {
clientIp: req.client_ip || "", clientIp: req.client_ip || "",
optitle: "服务单处理反馈接收接口" optitle: "服务单处理反馈接收接口"
}); });
return result; return system.getResultSuccess(result);
case "accountingInfo": case "accountingInfo":
var url = settings.pannongUrl() + "pas-api/gsb/service/accountingInfo"; var url = settings.pannongUrl() + "pas-api/gsb/service/accountingInfo";
var result = await this.restPostUrl(obj, url); var result = await this.restPostUrl(obj, url);
...@@ -198,7 +198,7 @@ class utils360Sve extends AppServiceBase { ...@@ -198,7 +198,7 @@ class utils360Sve extends AppServiceBase {
clientIp: req.client_ip || "", clientIp: req.client_ip || "",
optitle: "回传会计信息" optitle: "回传会计信息"
}); });
return result; return system.getResultSuccess(result);
case "booksInfo": case "booksInfo":
var url = settings.pannongUrl() + "pas-api/gsb/service/booksInfo"; var url = settings.pannongUrl() + "pas-api/gsb/service/booksInfo";
var result = await this.restPostUrl(obj, url); var result = await this.restPostUrl(obj, url);
...@@ -208,7 +208,7 @@ class utils360Sve extends AppServiceBase { ...@@ -208,7 +208,7 @@ class utils360Sve extends AppServiceBase {
clientIp: req.client_ip || "", clientIp: req.client_ip || "",
optitle: "帐套信息接受接口" optitle: "帐套信息接受接口"
}); });
return result; return system.getResultSuccess(result);
default: default:
return system.getResult(null, "actionType参数错误"); return system.getResult(null, "actionType参数错误");
} }
......
center-channel/app/config/routes/api.js
...@@ -442,7 +442,7 @@ module.exports = function (app) { ...@@ -442,7 +442,7 @@ module.exports = function (app) {
} }
} }
if (["getAppTokenByHosts", "getAppTokenByAppKey", "getTmNclFilterSearch","feedback"].indexOf(req.body.actionType) >= 0) { if (["getAppTokenByHosts", "getAppTokenByAppKey", "getTmNclFilterSearch","feedback","accountingInfo","booksInfo"].indexOf(req.body.actionType) >= 0) {
req.body.actionBody.appHosts = req.host; req.body.actionBody.appHosts = req.host;
next(); next();
return; return;
......
center-channel/app/config/routes/doc.js
...@@ -22,6 +22,7 @@ module.exports = function (app) { ...@@ -22,6 +22,7 @@ module.exports = function (app) {
} else { } else {
console.log(data); console.log(data);
str = marked(data.toString()); str = marked(data.toString());
res.header('content-type', 'text/html;charset=UTF-8');
res.render('apidoc', { str }); res.render('apidoc', { str });
} }
}); });
...@@ -37,6 +38,7 @@ module.exports = function (app) { ...@@ -37,6 +38,7 @@ module.exports = function (app) {
} else { } else {
console.log(data); console.log(data);
str = marked(data.toString()); str = marked(data.toString());
res.header('content-type', 'text/html;charset=UTF-8');
res.render('apidoc', { str }); res.render('apidoc', { str });
} }
}); });
...@@ -69,6 +71,7 @@ module.exports = function (app) { ...@@ -69,6 +71,7 @@ module.exports = function (app) {
console.log(data); console.log(data);
str = marked(data.toString()); str = marked(data.toString());
console.log(str); console.log(str);
res.header('content-type', 'text/html;charset=UTF-8');
res.render('apidoc', { str }); res.render('apidoc', { str });
} }
}); });
......
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