Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

tx-fi-tax/app/base/api/impl/common/apps.js

@@ -7,8 +7,8 @@ class AppAPI extends APIBase {
       this.appS = system.getObject("service.common.appSve");
       this.appS = system.getObject("service.common.appSve");
    }
    }
    async create(pobj,q,req){
    async create(pobj,q,req){
-      // console.log("oooooooooooooooooooooooooooooooooooooooooooooooo")
-      // console.log(req.xctx)
+      console.log("oooooooooooooooooooooooooooooooooooooooooooooooo")
+      console.log(req.xctx)
       let rtn=this.appS.create(pobj,q,req);
       let rtn=this.appS.create(pobj,q,req);
       return system.getResult(rtn);
       return system.getResult(rtn);
    }
    }

tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -146,8 +146,9 @@ class DeliverybillCtl extends CtlBase {
 
 
   // 创建融易算服务实例
   // 创建融易算服务实例
   async insertInfo(mobj, qobj, req) {
   async insertInfo(mobj, qobj, req) {
+    console.log('mobj--------------------------------',mobj);
     try {
     try {
-      var pobj = mobj.actionBody.messageBody;
+      var pobj = mobj.actionBody;
       var cachestr = sha235(JSON.stringify(pobj));
       var cachestr = sha235(JSON.stringify(pobj));
       var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
       var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
       if (cacheInfo && cacheInfo != 'undefined') {
       if (cacheInfo && cacheInfo != 'undefined') {
@@ -178,12 +179,15 @@ class DeliverybillCtl extends CtlBase {
         obj.source_name = "tencentCloud";
         obj.source_name = "tencentCloud";
         pobj.contactsPhone = pobj.contactMobile;
         pobj.contactsPhone = pobj.contactMobile;
         delete pobj.contactMobile;
         delete pobj.contactMobile;
-        // if (pobj.taxpayerType == 1) {
-        //   pobj.taxpayerName = "generalTaxpayer";
-        // }
-        // else if (pobj.taxpayerType == 2) {
-        //   pobj.taxpayerName = "smallScaleTaxpayer";
-        // }
+        if (pobj.taxpayerType == 1) {
+          pobj.taxpayerType = "generalTaxpayer";
+          pobj.taxpayerName = "一般纳税人";
+
+        }
+        else if (pobj.taxpayerType == 2) {
+          pobj.taxpayerType = "smallScaleTaxpayer";
+          pobj.taxpayerName = "小规模纳税人";
+        }
         obj.delivery_info = pobj;
         obj.delivery_info = pobj;
         obj.biz_id = pobj.bizId;
         obj.biz_id = pobj.bizId;
         var buInfo = await this.service.insertInfo(obj);
         var buInfo = await this.service.insertInfo(obj);
@@ -209,7 +213,7 @@ class DeliverybillCtl extends CtlBase {
   //更新融易算服务实例
   //更新融易算服务实例
   async updateServer(mobj, qobj, req) {
   async updateServer(mobj, qobj, req) {
     try {
     try {
-      var pobj = mobj.actionBody.messageBody;
+      var pobj = mobj.actionBody;
       var cachestr = sha235(JSON.stringify(pobj));
       var cachestr = sha235(JSON.stringify(pobj));
       var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
       var cacheInfo = await this.cacheManager["TxCache"].getCache(cachestr);
       if (cacheInfo && cacheInfo != 'undefined') {
       if (cacheInfo && cacheInfo != 'undefined') {
@@ -230,6 +234,15 @@ class DeliverybillCtl extends CtlBase {
         delete pobj.companyBizType;
         delete pobj.companyBizType;
         pobj.creditCode = pobj.uscc;
         pobj.creditCode = pobj.uscc;
         delete pobj.uscc;
         delete pobj.uscc;
+        if (pobj.taxpayerType == 1) {
+          pobj.taxpayerType = "generalTaxpayer";
+          pobj.taxpayerName = "一般纳税人";
+
+        }
+        else if (pobj.taxpayerType == 2) {
+          pobj.taxpayerType = "smallScaleTaxpayer";
+          pobj.taxpayerName = "小规模纳税人";
+        }
         obj = {
         obj = {
           "delivery_code": pobj.orderId + "_book",
           "delivery_code": pobj.orderId + "_book",
           "delivery_info": pobj,
           "delivery_info": pobj,
@@ -267,32 +280,36 @@ class DeliverybillCtl extends CtlBase {
       return system.getResult(null, err.message)
       return system.getResult(null, err.message)
     }
     }
   }
   }
+
+  async portog(){
+    console.log(settings.port);
+  }
 }
 }
 module.exports = DeliverybillCtl;
 module.exports = DeliverybillCtl;
 
 
-// var task = new DeliverybillCtl();
-// var obj = {
-//   "actionType": "produceData",
-//   "actionBody": {
-//     "pushUrl": "http://ic.com:8000/web/bizchance/deliverybillCtl",
-//     "actionType": "insertInfo",
-//     "identifyCode": "book-manage",
-//     "messageBody": {
-//       "requestId": "825da0a74432-738f-4bed-468d-d51aa880",
-//       "bizId": "2292748809",
-//       "userId": "24173452443103825",
-//       "orderId": "235184456620496",
-//       "areatype": "city",
-//       "area": "100010",
-//       "topOrgCode": "rong_yi_suan",
-//       "taxpayerType": 1,
-//       "contactMobile": "18510669321"
-//     }
-//   }
-// }
-// task.insertInfo(obj, {}, {}).then(d => {
-//   console.log(JSON.stringify(d));
-// })
+var task = new DeliverybillCtl();
+var obj = {
+  "actionType": "produceData",
+  "actionBody": {
+    "pushUrl": "http://ic.com:8000/web/bizchance/deliverybillCtl",
+    "actionType": "insertInfo",
+    "identifyCode": "book-manage",
+    "messageBody": {
+      "requestId": "825da0a74432-738f-4bed-468d-d51aa880",
+      "bizId": "2292748809",
+      "userId": "24173452443103825",
+      "orderId": "235184456620496",
+      "areatype": "city",
+      "area": "100010",
+      "topOrgCode": "rong_yi_suan",
+      "taxpayerType": 1,
+      "contactMobile": "18510669321"
+    }
+  }
+}
+task.portog().then(d => {
+  console.log(JSON.stringify(d));
+})
 
 
 // var obj = {
 // var obj = {
 //   "actionType": "produceData",
 //   "actionType": "produceData",