update

center-order/app/base/service/impl/dbcorder/orderdeliverSve.js

@@ -10,7 +10,6 @@ class OrderInfoService extends ServiceBase {
         this.ordercontactsDao = system.getObject("db.dbcorder.ordercontactsDao");
         this.ordercontactsDao = system.getObject("db.dbcorder.ordercontactsDao");
         this.orderReceiptVoucherDao = system.getObject("db.dbcpay.orderreceiptvoucherDao");
         this.orderReceiptVoucherDao = system.getObject("db.dbcpay.orderreceiptvoucherDao");
         this.officialDao = system.getObject("db.dbcorder.orderofficialDao");
         this.officialDao = system.getObject("db.dbcorder.orderofficialDao");
-        this.centerChannelUrl = settings.centerChannelUrl();
     }
     }
 
 
     //----------------------订单创建-----------start----------------
     //----------------------订单创建-----------start----------------
@@ -194,6 +193,7 @@ class OrderInfoService extends ServiceBase {
             var askforDate = deliveryData.askforDate || "";
             var askforDate = deliveryData.askforDate || "";
         }
         }
         pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
         pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
+        pobj.actionBody.deliveryData.deliveryUpdate = deliveryData.deliveryUpdate || new Date();
         pobj.actionBody.deliveryData.reDate = recDate;
         pobj.actionBody.deliveryData.reDate = recDate;
         pobj.actionBody.deliveryData.askforDate = askforDate;
         pobj.actionBody.deliveryData.askforDate = askforDate;
         pobj.actionBody.deliveryData.notes = actionBody.notes || ""; //  订单备注
         pobj.actionBody.deliveryData.notes = actionBody.notes || ""; //  订单备注
@@ -308,8 +308,8 @@ class OrderInfoService extends ServiceBase {
         if (actionBody.startTime && actionBody.entTime) {
         if (actionBody.startTime && actionBody.entTime) {
             var startTime = actionBody.startTime.trim() + " 00:00:00";
             var startTime = actionBody.startTime.trim() + " 00:00:00";
             var endTime = actionBody.entTime + " 23:59:59";
             var endTime = actionBody.entTime + " 23:59:59";
-            sql += ` and json_extract(deliveryContent,'$.deliveryUpdated') >= '${startTime}' and json_extract(deliveryContent,'$.deliveryUpdated') <= '${endTime}'`;
-            sqlCount += ` and json_extract(deliveryContent,'$.deliveryUpdated') between '${startTime}' and  json_extract(deliveryContent,'$.deliveryUpdated') <= '${endTime}'`;
+            sql += ` and i.updated_at >= '${startTime}' and i.updated_at <= '${endTime}'`;
+            sqlCount += ` and i.updated_at >= '${startTime}' and  i.updated_at <= '${endTime}'`;
         }
         }
 
 
         sql += ` order by i.id desc LIMIT ${pageSize} OFFSET ${from}`;
         sql += ` order by i.id desc LIMIT ${pageSize} OFFSET ${from}`;