dd

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

@@ -128,7 +128,7 @@ class OorderService extends ServiceBase {
     
     
     orderDeliver.deliver_divide =  system.f2y(orderDeliver.deliver_divide);
     orderDeliver.deliver_divide =  system.f2y(orderDeliver.deliver_divide);
     orderInfo.capital = system.f2y(orderInfo.capital);
     orderInfo.capital = system.f2y(orderInfo.capital);
-
+    order.service_items = order.service_items.split(",")
     result.order = order;
     result.order = order;
     result.regInfo = orderInfo;
     result.regInfo = orderInfo;
     result.businessmen = businessmen;
     result.businessmen = businessmen;

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

@@ -70,7 +70,7 @@ class OorderdeliverService extends ServiceBase {
       await this.formateServiceItems(rows);
       await this.formateServiceItems(rows);
 
 
       for (var row of rows) {
       for (var row of rows) {
-        this.handleDate(row, ["created_at"], "YYYY-MM-DD HH:mm:ss", -8);
+        this.handleDate(row, ["created_at","completed_at"], "YYYY-MM-DD HH:mm:ss", -8);
       }
       }
 
 
       let res = {
       let res = {

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

@@ -386,7 +386,7 @@ class OorderstatusService extends ServiceBase {
     
     
     let orderDeliverProperty={};
     let orderDeliverProperty={};
     orderDeliverProperty.completed_at=new Date();
     orderDeliverProperty.completed_at=new Date();
-    orderDeliverProperty.id=params._order.id;
+    orderDeliverProperty.id=params._order.deliver_id;
 
 
     let orderProperty = {};
     let orderProperty = {};
     orderProperty.status = this.trim(params.status);
     orderProperty.status = this.trim(params.status);