dd

xggsve-order/app/base/db/impl/order/oorderdeliverDao.js

@@ -97,6 +97,9 @@ class OorderdeliverDao extends Dao {
     if(params.id){
       sql.push(`AND b.id = :id `);
     }
+    if(params.order_id){
+      sql.push(`AND b.order_id = :order_id `);
+    }
     if(params.operator_id){
       sql.push(`AND b.operator_id = :operator_id `);
     }
@@ -104,10 +107,10 @@ class OorderdeliverDao extends Dao {
       sql.push(`AND a.status = :status `);
     }
     if (params.createdBegin) {
-      sql.push(`AND created_at >= :createdBegin `);
+      sql.push(`AND a.created_at >= :createdBegin `);
     }
     if (params.createdEnd) {
-      sql.push(`AND created_at <= :createdEnd`);
+      sql.push(`AND a.created_at <= :createdEnd`);
     }
 
     

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

@@ -123,7 +123,8 @@ class OorderService extends ServiceBase {
     await this.formateProduct([order]);
 
     this.handleDate(order, ["created_at", "sign_time","assign_time"], "YYYY-MM-DD HH:mm:ss", -8);
-    this.handleDate(businessmen, ["tax_reg_day","created_at" ], "YYYY-MM-DD HH:mm:ss", -8);
+    this.handleDate(businessmen, ["tax_reg_day","created_at",'reg_date' ], "YYYY-MM-DD HH:mm:ss", -8);
+    this.handleDate(orderInfo, ["created_at"], "YYYY-MM-DD HH:mm:ss", -8);
     
     orderDeliver.deliver_divide =  system.f2y(orderDeliver.deliver_divide);
     orderInfo.capital = system.f2y(orderInfo.capital);

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

@@ -48,6 +48,9 @@ class OorderdeliverService extends ServiceBase {
     if(params.status){
       where.status = this.trim(params.status);
     }
+    if(params.order_id){
+      where.order_id = this.trim(params.order_id);
+    }
     
     where.currentPage = Number(params.currentPage || 1);
     where.pageSize = Number(params.pageSize || 10);

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

@@ -883,10 +883,10 @@ class OorderstatusService extends ServiceBase {
     }
 
     let _obusinessmenProperty = {};
-    _obusinessmenProperty.common_tax_ladder = JSON.stringify(this.trim(params.common_tax_ladder));
-    _obusinessmenProperty.common_other_ladder = JSON.stringify(this.trim(params.common_other_ladder));
-    _obusinessmenProperty.special_tax_ladder = JSON.stringify(this.trim(params.special_tax_ladder));
-    _obusinessmenProperty.special_other_ladder = JSON.stringify(this.trim(params.special_other_ladder));
+    _obusinessmenProperty.common_tax_ladder = JSON.stringify(params.common_tax_ladder);
+    _obusinessmenProperty.common_other_ladder = JSON.stringify(params.common_other_ladder);
+    _obusinessmenProperty.special_tax_ladder = JSON.stringify(params.special_tax_ladder);
+    _obusinessmenProperty.special_other_ladder = JSON.stringify(params.special_other_ladder);
 
     _obusinessmenProperty.add_value_up_type = this.trim(params.add_value_up_type);
     _obusinessmenProperty.tax_up_type = this.trim(params.tax_up_type);