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

center-channel/app/base/api/impl/opreceive/service.js

@@ -12,6 +12,12 @@ class edi extends APIBase {
 
   async create(pobj,query,req) {
     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
     var checkResult = await this.serviceCreateCheck(pobj,req.headers);
     if(checkResult.status != 0) {
@@ -59,16 +65,16 @@ class edi extends APIBase {
       return system.getResult(null, "contactName cannot be empty");
     }
     if(!pobj.contactMobile) {
-      return system.getResult(null, "contactName cannot be empty");
+      return system.getResult(null, "contactMobile cannot be empty");
     }
     if(!pobj.timeUnit) {
-      return system.getResult(null, "contactName cannot be empty");
+      return system.getResult(null, "timeUnit cannot be empty");
     }
     if(!pobj.quantity) {
-      return system.getResult(null, "contactName cannot be empty");
+      return system.getResult(null, "quantity cannot be empty");
     }
     if(!pobj.companyInfo) {
-      return system.getResult(null, "contactName cannot be empty");
+      return system.getResult(null, "companyInfo cannot be empty");
     }
     if(!pobj.companyInfo.companyName) {
       return system.getResult(null, "companyName cannot be empty");

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

@@ -137,20 +137,20 @@ module.exports = SignService;
 // 	"status":"16"
 // }
 // var obj = {
-// 	"bizId":"202011071358",
-// 	"contactName":"lin",
-// 	"contactMobile":"13911391996",
-// 	"timeUnit":"year",
-// 	"quantity":1,
-// 	"companyInfo":{
-// 		"companyName":"公司宝",
-// 		"taxpayerType":"NORMAL_TAXPAYER",
-// 		"acctgSystemId":"10001",
-// 		"companyForm":"1",
-// 		"industry":1,	
-// 		"taxpayerNumber":"123456789",
-// 		"companyArea":"北京"
-// 	}
+// 	"bizId":"OD2020110629779500",
+//   "contactMobile":"18550295628",
+//   "contactName":"范锋华",
+// "timeUnit":"year",
+// "quantity":1,
+// "companyInfo":{
+//   "companyName":"苏州磐荣信息科技有限公司",
+//   "taxpayerType":"NORMAL_TAXPAYER",
+//   "acctgSystemId":"10001",
+//   "companyForm":"1",
+//   "industry":1,	
+//   "taxpayerNumber":"123456789",
+//   "companyArea":"北京"
+// }
 // }
 // task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{
 //     console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");

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

@@ -188,7 +188,7 @@ class utils360Sve extends AppServiceBase {
           clientIp: req.client_ip || "",
           optitle: "服务单处理反馈接收接口"
         });
-        return result;
+        return system.getResultSuccess(result);
       case "accountingInfo":
         var url = settings.pannongUrl() + "pas-api/gsb/service/accountingInfo";
         var result = await this.restPostUrl(obj, url);
@@ -198,7 +198,7 @@ class utils360Sve extends AppServiceBase {
           clientIp: req.client_ip || "",
           optitle: "回传会计信息"
         });
-        return result;
+        return system.getResultSuccess(result);
       case "booksInfo":
         var url = settings.pannongUrl() + "pas-api/gsb/service/booksInfo";
         var result = await this.restPostUrl(obj, url);
@@ -208,7 +208,7 @@ class utils360Sve extends AppServiceBase {
           clientIp: req.client_ip || "",
           optitle: "帐套信息接受接口"
         });
-        return result;
+        return system.getResultSuccess(result);
       default:
         return system.getResult(null, "actionType参数错误");
     }

center-channel/app/config/routes/api.js

@@ -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;
 			next();
 			return;

center-channel/app/config/routes/doc.js

@@ -22,6 +22,7 @@ module.exports = function (app) {
 			} else {
 				console.log(data);
 				str = marked(data.toString());
+				res.header('content-type', 'text/html;charset=UTF-8');
 				res.render('apidoc', { str });
 			}
 		});
@@ -37,6 +38,7 @@ module.exports = function (app) {
 			} else {
 				console.log(data);
 				str = marked(data.toString());
+				res.header('content-type', 'text/html;charset=UTF-8');
 				res.render('apidoc', { str });
 			}
 		});
@@ -69,6 +71,7 @@ module.exports = function (app) {
 				console.log(data);
 				str = marked(data.toString());
 				console.log(str);
+				res.header('content-type', 'text/html;charset=UTF-8');
 				res.render('apidoc', { str });
 			}
 		});