gsb

xgg-admin/app/base/controller/impl/business/businessmenCtl.js

@@ -45,18 +45,20 @@ class BusinessmenCtl extends CtlBase {
   async sign(pobj, pobj2, req) {
     var params = {
       id: pobj.id,
-      taxUpType: pobj.taxUpType,
+      taxUpType: pobj.taxUpType || 0,
       addValueUpType: pobj.addValueUpType,
-      costRate: system.y2f(pobj.costRate),
+      costRate: system.y2f(pobj.costRate || 0),
       taxRate: system.y2f(pobj.taxRate),
       serviceRate: system.y2f(pobj.serviceRate),
+      serviceBeginTime: pobj.serviceBeginTime,
+      serviceEndTime: pobj.serviceEndTime,
 
       signNotes: this.trim(pobj.signNotes),
 
-      commonTaxLadder: JSON.stringify(pobj.commonTaxLadder),
-      commonOtherLadder: JSON.stringify(pobj.commonOtherLadder),
-      specialTaxLadder: JSON.stringify(pobj.specialTaxLadder),
-      specialOtherLadder: JSON.stringify(pobj.specialOtherLadder),
+      commonTaxLadder: JSON.stringify(pobj.commonTaxLadder || []),
+      commonOtherLadder: JSON.stringify(pobj.commonOtherLadder || []),
+      specialTaxLadder: JSON.stringify(pobj.specialTaxLadder || []),
+      specialOtherLadder: JSON.stringify(pobj.specialOtherLadder || []),
       invoicecontents: pobj.invoicecontents,
     }
     try {

xgg-admin/app/base/service/impl/business/businessmenSve.js

@@ -164,7 +164,7 @@ class BusinessmenService extends ServiceBase {
         continue;
       }
       try {
-        row[f] = JSON.parse(row[f]);
+        row[f] = JSON.parse(row[f] || "[]");
       } catch (error) {
         console.log(error);
       }

xgg-admin/app/front/entry/public/apidoc/business/businessmen.md

@@ -217,14 +217,16 @@
 
 {
     "id" : "12797237916000358",                         // 个体户id
-    "taxUpType":"10",                                   // 个税累计
+    "taxUpType":"10",                                   // 个税累计     - -!这个字段改没了
     "addValueUpType":""                                 // 增值税累计
-    "costRate":"1122",                                  // 核定成本费用率
+    "costRate":"1122",                                  // 核定成本费用率  - -!这个字段改没了
     "taxRate" : "",                                     // 含税价百分比
     "serviceRate" : "",                                 // 服务费百分比
+    "serviceBeginTime" : "2019-12-05",                  // 服务开始时间 ------- 改版新增字段
+    "serviceEndTime" : "2020-12-05",                    // 服务结束时间 ------- 改版新增字段
 
     "signNotes":"  12qwdwqd",                           // 签约备注
-    "commonTaxLadder": [                    // 普票个税梯度
+    "commonTaxLadder": [                    // 普票个税梯度 - -!这个字段改没了
         {
             "minValue": 0,              // 区间最小值
             "rate": "0",                // 税率
@@ -241,7 +243,7 @@
         },
         
     ],
-    "specialTaxLadder": [                // 专票个税梯度
+    "specialTaxLadder": [                // 专票个税梯度  - -!这个字段改没了
         {
             "minValue": 0,              // 区间最小值
             "rate": "0",                // 税率