Commit 52f2b4ed by 孙亚楠

dd

parent e76dd987
...@@ -493,8 +493,8 @@ class OorderService extends ServiceBase { ...@@ -493,8 +493,8 @@ class OorderService extends ServiceBase {
//当月订单的数量统计和订单总金额 //当月订单的数量统计和订单总金额
var orderData = await this.dao.statOrderByTime(begin, end) || {}; var orderData = await this.dao.statOrderByTime(begin, end) || {};
result.orderCount = orderData.orderCount; result.orderCount = orderData[orderData.begin].orderCount;
result.orderPrice = system.f2y(orderData.orderPrice); result.orderPrice = system.f2y(orderData[orderData.begin].orderPrice);
result.days = days; result.days = days;
result.dayCounts = dayCounts; result.dayCounts = dayCounts;
......
...@@ -168,12 +168,14 @@ class OorderdeliverService extends ServiceBase { ...@@ -168,12 +168,14 @@ class OorderdeliverService extends ServiceBase {
} }
let _deliverArr = Array.from(deliverSet); let _deliverArr = Array.from(deliverSet);
let orderCompletes = await this.dao.orderCompletesCount(_deliverArr, begin, end); let orderCompletes = await this.dao.orderCompletesCount(_deliverArr, begin, end) ;
let orderHanding = await this.dao.orderHandingCount(_deliverArr, begin, end); let orderHanding = await this.dao.orderHandingCount(_deliverArr, begin, end) ;
for (let item of deliverList) { for (let item of deliverList) {
item.order_complete_count = orderCompletes[item.deliver_id]; item.order_complete_count = orderCompletes[item.deliver_id] || 0;
item.order_handing_count = orderHanding[item.deliver_id]; item.order_handing_count = orderHanding[item.deliver_id] || 0;
} }
return system.getResult(deliverList); return system.getResult(deliverList);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment