dd

xggsve-order/app/base/api/impl/op/action.js

@@ -103,6 +103,7 @@ class ActionAPI extends APIBase {
                 case "statDeliverData":    //交付商统计
                 case "statDeliverData":    //交付商统计
                     opResult = await this.oorderdeliverSve.statDeliverData(action_body);
                     opResult = await this.oorderdeliverSve.statDeliverData(action_body);
                     break;
                     break;
+                    
                 // 统计数据（交付商）
                 // 统计数据（交付商）
                 case "deliverStatTransData":    //交付商统计
                 case "deliverStatTransData":    //交付商统计
                     opResult = await this.oorderdeliverSve.deliverStatTransData(action_body);
                     opResult = await this.oorderdeliverSve.deliverStatTransData(action_body);

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

@@ -219,10 +219,11 @@ class OorderdeliverDao extends Dao {
     var sql = [];
     var sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
     sql.push("DATE_FORMAT(a.created_at, '%Y-%m-%d') AS `day`, SUM(b.deliver_divide) AS orderPrice, COUNT(1) AS orderCount");
     sql.push("DATE_FORMAT(a.created_at, '%Y-%m-%d') AS `day`, SUM(b.deliver_divide) AS orderPrice, COUNT(1) AS orderCount");
-
+    sql.push("from o_order a inner join o_order_deliver b on a.deliver_id = b.id where 1=1 and b.deliver_id = :deliver_id");
     var params = {
     var params = {
       begin: begin,
       begin: begin,
-      end: end
+      end: end,
+      deliver_id:deliver_id
     };
     };
     if (begin) {
     if (begin) {
       sql.push("AND a.created_at >= :begin");
       sql.push("AND a.created_at >= :begin");
@@ -243,7 +244,7 @@ class OorderdeliverDao extends Dao {
   }
   }
 
 
     /**
     /**
-   * 平台数据概览
+   * 交付商数据概览
    * @param {*} begin 
    * @param {*} begin 
    * @param {*} end 
    * @param {*} end 
    */
    */
@@ -251,7 +252,9 @@ class OorderdeliverDao extends Dao {
     var result = {};
     var result = {};
     var sql = [];
     var sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
-    sql.push(`WHERE 1 = 1  and b.deliver_id = '${deliver_id}' and a.status="1180"`);
+    sql.push("DATE_FORMAT(a.created_at, '%Y-%m') AS `month`, SUM(b.deliver_divide) AS orderPrice, COUNT(1) AS orderCount");
+    sql.push("FROM `o_order` a inner join o_order_deliver b on a.deliver_id = b.id");
+    sql.push(`WHERE 1 = 1  and b.deliver_id = '${deliver_id}'`);
 
 
     var params = {
     var params = {
       begin: begin,
       begin: begin,
@@ -287,6 +290,8 @@ class OorderdeliverDao extends Dao {
     return result;
     return result;
   }
   }
 
 
+/*********************************************以下是交付商首页**************************************************** */
+
   /**
   /**
    * 完成订单
    * 完成订单
    * @param {*} begin 
    * @param {*} begin 

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

@@ -526,6 +526,9 @@ class OorderService extends ServiceBase {
    * @param {*} params 
    * @param {*} params 
    */
    */
   async needToBeDealtWith(params) {
   async needToBeDealtWith(params) {
+    if (!params.current_date) {
+      return system.getResult(null, `参数错误 当前时间不能为空`);
+    }
     try {
     try {
       let begin, end;
       let begin, end;
       begin = moment(params.current_date).format("YYYY-MM") + "-01 00:00:00";
       begin = moment(params.current_date).format("YYYY-MM") + "-01 00:00:00";

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

@@ -154,12 +154,12 @@ class OorderdeliverService extends ServiceBase {
    */
    */
   async statDeliverData(params) {
   async statDeliverData(params) {
 
 
-    if (!params.currentDate) {
+    if (!params.current_date) {
       return system.getResult(null, `参数错误 当前时间不能为空`);
       return system.getResult(null, `参数错误 当前时间不能为空`);
     }
     }
     try {
     try {
       let begin, end;
       let begin, end;
-      begin = moment(params.currentDate).format("YYYY-MM") + "-01 00:00:00";
+      begin = moment(params.current_date).format("YYYY-MM") + "-01 00:00:00";
       end = moment(begin).add(1, "months").subtract(1, 'days').format("YYYY-MM-DD") + " 23:59:59";
       end = moment(begin).add(1, "months").subtract(1, 'days').format("YYYY-MM-DD") + " 23:59:59";
       let deliverList = await this.dao.deliverList(begin, end);
       let deliverList = await this.dao.deliverList(begin, end);
       let deliverSet = new Set();
       let deliverSet = new Set();