dd

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

@@ -24,7 +24,7 @@ class OorderDao extends Dao {
     let sql = [];
     sql.push(`SELECT * FROM o_order WHERE 1=1 `);
     this.setOrderCount(sql,params);
-    sql.push(`limit ${params.currentPage} ,${params.pageSize}`);
+    sql.push(`limit ${params.startRow} ,${params.pageSize}`);
     return await this.customQuery(sql.join(" "), params);
 
   }
@@ -49,9 +49,6 @@ class OorderDao extends Dao {
     if (params.end) {
       sql.push(`AND created_at <= :end`);
     }
-    if (params.deliver_id) {
-      sql.push(`AND deliver_id = :deliver_id`);
-    }
   }
 
 }

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

@@ -14,7 +14,7 @@ class OorderdeliverDao extends Dao {
       return [];
     }
     let sql = [];
-    sql.push(`SELECT * FROM o_order_deliver WHERE id in (:deliverIdList)`);
+    sql.push(`SELECT * FROM o_order_deliver WHERE deliver_id in (:deliverIdList)`);
     
     return await this.customQuery(sql.join(" "), {deliverIdList: ids});
   }
@@ -23,7 +23,7 @@ class OorderdeliverDao extends Dao {
     let list = await this.listByIds(params);
     var result = {};
     for(let item of list) {
-      result[item.id] = item;
+      result[item.deliver_id] = item;
     }
     return result;
   }

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

@@ -396,7 +396,7 @@ class OorderService extends ServiceBase {
 
         //更新oorder订单记录
         await self.dao.update({
-          deliver_id: self.trim(self.deliver_id),
+          deliver_id: self.trim(params.deliver_id),
           id: self.trim(params.id),
           status: self.trim(params.status)
         }, t);

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

@@ -50,7 +50,7 @@ class OorderdeliverService extends ServiceBase {
       if(count==0){
         return system.getResult({count:0,rows:[]});
       }
-      let rows = await this.dao.findAll(where);
+      let rows = await this.oorderDao.findAll(where);
       //格式化交付商
       await this.formateDeliver(rows);
       //格式化订单状态
@@ -78,7 +78,7 @@ class OorderdeliverService extends ServiceBase {
     }
 
     let deliverMap = await this.dao.mapByIds(deliverIdList);
-    for (let item of deliverMap) {
+    for (let item of orderList) {
       item.odeliver = deliverMap[item.deliver_id] || {}
     }
   }

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

@@ -10,9 +10,3 @@ class PaymentService extends ServiceBase {
 }
 
 module.exports = PaymentService;
\ No newline at end of file
-// var task=new UserService();
-// task.getUserStatisticGroupByApp().then(function(result){
-//   console.log((result));
-// }).catch(function(e){
-//   console.log(e);
-// });
\ No newline at end of file