ddg

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

@@ -124,23 +124,23 @@ class OorderDao extends Dao {
   async statDayByTime(begin, end) {
   async statDayByTime(begin, end) {
     var result = {};
     var result = {};
     var sql = [];
     var sql = [];
-    sql.push("SELECT");
-    sql.push("DATE_FORMAT(created_at, '%Y-%m-%d') AS `day`, SUM(price) AS orderPrice, COUNT(1) AS orderCount");
-    sql.push("FROM `o_order`");
-    sql.push("WHERE 1 = 1");
+    sql.push("select");
+    sql.push("date_format(created_at, '%y-%m-%d') as `day`, sum(price) as orderprice, count(1) as ordercount");
+    sql.push("from `o_order`");
+    sql.push("where 1 = 1");
 
 
     var params = {
     var params = {
       begin: begin,
       begin: begin,
       end: end
       end: end
     };
     };
     if (begin) {
     if (begin) {
-      sql.push("AND created_at >= :begin");
+      sql.push("and created_at >= :begin");
     }
     }
     if (end) {
     if (end) {
-      sql.push("AND created_at <= :end");
+      sql.push("and created_at <= :end");
     }
     }
-    sql.push("GROUP BY `day` ORDER BY `day` ASC");
-    var list = await this.customQuery(sql.join(" "), params);
+    sql.push("group by `day` order by `day` asc");
+    var list = await this.customquery(sql.join(" "), params);
 
 
     if (!list || list.length == 0) {
     if (!list || list.length == 0) {
       return result;
       return result;
@@ -164,8 +164,8 @@ class OorderDao extends Dao {
     sql.push("FROM `o_order` t1 inner join `o_order_deliver` t2 on t1.deliver_id = t2.id");
     sql.push("FROM `o_order` t1 inner join `o_order_deliver` t2 on t1.deliver_id = t2.id");
     sql.push("WHERE 1 = 1");
     sql.push("WHERE 1 = 1");
     this.aliSetParams(sql,params);
     this.aliSetParams(sql,params);
-    sql.push("ORDER BY t1.created_at DESC");
-    sql.push("LIMIT :startRow, :pageSize");
+    // sql.push("ORDER BY t1.created_at DESC");
+    // sql.push("LIMIT :startRow, :pageSize");
 
 
     let list = await this.customQuery(sql.join(" "), params);
     let list = await this.customQuery(sql.join(" "), params);
     if(!list || list.length==0){
     if(!list || list.length==0){
@@ -194,6 +194,14 @@ class OorderDao extends Dao {
     if (params.createdEnd) {
     if (params.createdEnd) {
       sql.push("AND t1.created_at <= :createdEnd");
       sql.push("AND t1.created_at <= :createdEnd");
     }
     }
+    if (params.delier_user_id) {
+      sql.push("AND t2.delier_user_id = :delier_user_id");
+    }
+    if (params.deliver_user_path) {
+      // sql.push("AND t2.delier_user_id like ':deliver_user_path%'");
+      params.deliver_user_path_like = params.deliver_user_path + "%";
+      sql.push("AND t2.delier_user_id like :deliver_user_path_like");
+    }
   }
   }
 
 
   /**
   /**
@@ -205,9 +213,9 @@ class OorderDao extends Dao {
     var result = {};
     var result = {};
     var sql = [];
     var sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
-    sql.push("t1.*,t3.name");
-    sql.push("FROM `o_order` t1 inner join `o_order_deliver` t2 on t1.deliver_id = t2.id inner join o_process t3 on t1.product_id = t3.product_id ");
-    sql.push("WHERE 1 = 1 and t1.status = t3.status ");
+    sql.push("t1.*");
+    sql.push("FROM `o_order` t1 inner join `o_order_deliver` t2 on t1.deliver_id = t2.id");
+    sql.push("WHERE 1 = 1");
     this.aliSetParams(sql,params);
     this.aliSetParams(sql,params);
     sql.push("ORDER BY t1.created_at DESC");
     sql.push("ORDER BY t1.created_at DESC");
     sql.push("LIMIT :startRow, :pageSize");
     sql.push("LIMIT :startRow, :pageSize");

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

@@ -121,7 +121,9 @@ class OorderService extends ServiceBase {
           order_id:order.id,
           order_id:order.id,
           deliver_id:self.trim(params.deliver_id),
           deliver_id:self.trim(params.deliver_id),
           deliver_name:self.trim(params.deliver_name),
           deliver_name:self.trim(params.deliver_name),
-          deliver_divide:self.trim(params.deliver_divide) || 0
+          deliver_divide:self.trim(params.deliver_divide) || 0,
+          delier_user_id : this.trim(params.delier_user_id),
+          deliver_user_path: this.trim(params.deliver_user_path),
         }, t);
         }, t);
         await self.dao.update({id:order.id,deliver_id:_oorderdeliver.id},t);
         await self.dao.update({id:order.id,deliver_id:_oorderdeliver.id},t);
       }
       }
@@ -813,7 +815,7 @@ class OorderService extends ServiceBase {
           element.obusinessmen.special_other_ladder = JSON.parse(element.obusinessmen.special_other_ladder);
           element.obusinessmen.special_other_ladder = JSON.parse(element.obusinessmen.special_other_ladder);
         }
         }
         element.price = system.f2y(element.price);
         element.price = system.f2y(element.price);
-        element.orderDeliver.deliver_divide = system.f2y(element.orderDeliver.deliver_divide);
+        element.odeliver.deliver_divide = system.f2y(element.odeliver.deliver_divide);
         element.orderInfoReg.capital = system.f2y(element.orderInfoReg.capital);
         element.orderInfoReg.capital = system.f2y(element.orderInfoReg.capital);
       }
       }
       return system.getResult({count: countRes.count, row: list});
       return system.getResult({count: countRes.count, row: list});
@@ -844,20 +846,6 @@ class OorderService extends ServiceBase {
     }
     }
   }
   }
 
 
-  /**
-   * 格式化订单状态
-   * @param list
-   * @param ids
-   * @returns {Promise<void>}
-   */
-/*  async aliFormateOrderStatus(list){
-    let statusMap = await this.oprocessDao.getByOrderStatus(statusArray);
-    for(let item of list){
-      item.obusinessmen = obusinessmenMap[item.id] || {};
-    }
-
-
-  }*/
 
 
   /**
   /**
    * 阿里我的业务订单
    * 阿里我的业务订单
@@ -865,10 +853,22 @@ class OorderService extends ServiceBase {
    * @returns {Promise<void>}
    * @returns {Promise<void>}
    */
    */
   async aliOrderPage(params){
   async aliOrderPage(params){
-
+    let where = {
+      deliver_id:this.trim(params.deliver_id),
+      status: this.trim(params.status),
+      id:this.trim(params.id),
+      createdBegin:params.createdBegin,
+      createdEnd:params.createdEnd
+    };
+    if(!params.isManager){//如果是管理员 则可能看到所有的数据
+      if(params.isMain){  //如果是主管 则可以看到自己和下属的所有的订单
+        where.deliver_user_path = params.deliver_user_path
+      }else{ //否则可以看到自己的订单
+        where.delier_user_id = params.delier_user_id
+      }
+    }
+    return await this.aliOrderPageAll(where);
   }
   }
-
-
 }
 }
 
 
 module.exports = OorderService;
 module.exports = OorderService;
\ No newline at end of file