dd

xggsve-order/app/base/db/models/order/obusinessmen.js

@@ -43,7 +43,7 @@ module.exports = function (db, DataTypes) {
     cost_rate: {type: DataTypes.INTEGER, field: 'cost_rate', allowNull: true, defaultValue:0, comment:'核定成本费用率' },
     cost_rate: {type: DataTypes.INTEGER, field: 'cost_rate', allowNull: true, defaultValue:0, comment:'核定成本费用率' },
     tax_rate: {type: DataTypes.INTEGER, field: 'tax_rate', allowNull: true, defaultValue:0, comment:'含税价百分比' },
     tax_rate: {type: DataTypes.INTEGER, field: 'tax_rate', allowNull: true, defaultValue:0, comment:'含税价百分比' },
     add_value_up_type: {type: DataTypes.STRING, field: 'add_value_up_type', allowNull: true, defaultValue:'1', comment:'增值税累计类型 1按月 2按季度' },
     add_value_up_type: {type: DataTypes.STRING, field: 'add_value_up_type', allowNull: true, defaultValue:'1', comment:'增值税累计类型 1按月 2按季度' },
-    tax_up_type: {type: DataTypes.STRING, field: 'tax_up_type', allowNull: true, defaultValue:'1', comment:'个税累计类型 1按月累计 2按年累计' },
+    tax_up_type: {type: DataTypes.STRING, field: 'tax_up_type', allowNull: true, defaultValue:'1', comment:'个税累计类型 1按月累计 2按季度' },
     service_rate: {type: DataTypes.INTEGER, field: 'service_rate', allowNull: true, defaultValue:0, comment:'服务费比例' },
     service_rate: {type: DataTypes.INTEGER, field: 'service_rate', allowNull: true, defaultValue:0, comment:'服务费比例' },
     sign_notes: {type: DataTypes.STRING, field: 'sign_notes', allowNull: true, defaultValue:'', comment:'签约备注' },
     sign_notes: {type: DataTypes.STRING, field: 'sign_notes', allowNull: true, defaultValue:'', comment:'签约备注' },
     sign_time: {type: DataTypes.DATE, field: 'sign_time', allowNull: true, defaultValue:null, comment:'签约时间' },
     sign_time: {type: DataTypes.DATE, field: 'sign_time', allowNull: true, defaultValue:null, comment:'签约时间' },

xggsve-order/app/base/service/impl/order/oorderstatusSve.js

@@ -877,7 +877,9 @@ class OorderstatusService extends ServiceBase {
     if (!params.status) {
     if (!params.status) {
       return system.getResult(null, `参数错误 状态码不能为空`);
       return system.getResult(null, `参数错误 状态码不能为空`);
     }
     }
-
+    if (!params.cost_rate) {
+      return system.getResult(null, `参数错误 核定成本费用率不能为空`);
+    }
     if (!params.common_tax_ladder) {
     if (!params.common_tax_ladder) {
       return system.getResult(null, `参数错误 普票个税阶梯不能为空`);
       return system.getResult(null, `参数错误 普票个税阶梯不能为空`);
     }
     }
@@ -905,7 +907,7 @@ class OorderstatusService extends ServiceBase {
 
 
     _obusinessmenProperty.add_value_up_type = this.trim(params.add_value_up_type);
     _obusinessmenProperty.add_value_up_type = this.trim(params.add_value_up_type);
     _obusinessmenProperty.tax_up_type = this.trim(params.tax_up_type);
     _obusinessmenProperty.tax_up_type = this.trim(params.tax_up_type);
-
+    _obusinessmenProperty.cost_rate = this.trim(params.cost_rate);
     let _order = params._order;
     let _order = params._order;
     _obusinessmenProperty.id = _order.busi_id;
     _obusinessmenProperty.id = _order.busi_id;
     let orderProperty = {};
     let orderProperty = {};