d

xgg-deliver/app/base/controller/impl/order/orderCtl.js

@@ -25,20 +25,11 @@ class OrderCtl extends CtlBase {
     //个税梯度  3000：方案一 4000：方案二 10:按月 20：按季度
     //个税梯度  3000：方案一 4000：方案二 10:按月 20：按季度
     this.schemeTaxMap={
     this.schemeTaxMap={
       "3000":{
       "3000":{
-        "10":{
-          "tax_ladder":[{"minValue":"0","maxValue":"5000000","rate":"1","quiCalDed":"0"}]
-        },
-        "20":{
-          "tax_ladder":[{"minValue":"0","maxValue":"5000000","rate":"1","quiCalDed":"0"}]
-        }
+        "tax_ladder":[{"minValue":"0","maxValue":"300000","rate":"5","quiCalDed":"0"},{"minValue":"300001","maxValue":"900000","rate":"10","quiCalDed":"1500"},{"minValue":"900001","maxValue":"300000","rate":"20","quiCalDed":"10500"},
+          {"minValue":"300001","maxValue":"500000","rate":"30","quiCalDed":"40500"},{"minValue":"500000","maxValue":"99999999999","rate":"35","quiCalDed":"65500"}]
       },
       },
       "4000":{
       "4000":{
-        "10":{
-          "tax_ladder":null
-        },
-        "20":{
-          "tax_ladder":null
-        }
+        "tax_ladder":null
       }
       }
     };
     };
 
 
@@ -472,9 +463,11 @@ class OrderCtl extends CtlBase {
     if (!pobj.add_value_up_type) {
     if (!pobj.add_value_up_type) {
       return system.getResult(null, `参数错误 增值税累计类型不能为空`);
       return system.getResult(null, `参数错误 增值税累计类型不能为空`);
     }
     }
-    if (!pobj.tax_up_type) {
-      return system.getResult(null, `参数错误 个税累计类型不能为空`);
-    }
+    // if (!pobj.tax_up_type) {
+    //   return system.getResult(null, `参数错误 个税累计类型不能为空`);
+    // }
+    //个税累计按年计算
+    pobj.tax_up_type = pobj.tax_up_type || "30";
     try {
     try {
       return await this.orderSve.handleStatus(pobj);
       return await this.orderSve.handleStatus(pobj);
     } catch (error) {
     } catch (error) {
@@ -864,14 +857,11 @@ class OrderCtl extends CtlBase {
     if(!params.code){
     if(!params.code){
       return system.getResult(null, `参数错误 方案编码不能为空`);
       return system.getResult(null, `参数错误 方案编码不能为空`);
     }
     }
-    if(!params.tax_up_type){
-      return system.getResult(null, `参数错误 计费模式不能为空`);
-    }
     let bean = this.schemeTaxMap[params.code];
     let bean = this.schemeTaxMap[params.code];
-    if(!bean ||  !bean[params.tax_up_type]){
+    if(!bean){
       return system.getResult(null, `方案不存在`);
       return system.getResult(null, `方案不存在`);
     }
     }
-    return system.getResult(bean[params.tax_up_type]);
+    return system.getResult(bean);
   }
   }
 
 
   /**
   /**