Commit 61d65f92 authored by 姜登's avatar 姜登

ret

parent 096073e6
Pipeline #22016 passed with stage
in 2 seconds
......@@ -85,24 +85,24 @@ class UserDetailService extends Service {
},
};
const ret = await ctx.dataModel[type].findAll({
const detail = await ctx.dataModel[type].findAll({
attributes: ['day', 'pull_volume', 'cost'],
where,
order: [['day', 'desc']]
})
const listMap = new Map();
for (let i = 0; i < ret.length; i++) {
if (listMap.has(ret[i].day)) {
let obj = listMap.get(ret[i].day);
obj.money += parseFloat(ret[i].cost);
obj.amount += ret[i].pull_volume;
listMap.set(ret[i].day, obj);
for (let i = 0; i < detail.length; i++) {
if (listMap.has(detail[i].day)) {
let obj = listMap.get(detail[i].day);
obj.money += parseFloat(detail[i].cost);
obj.amount += detail[i].pull_volume;
listMap.set(detail[i].day, obj);
} else {
listMap.set(ret[i].day, { money: parseFloat(ret[i].cost), amount: ret[i].pull_volume });
listMap.set(detail[i].day, { money: parseFloat(detail[i].cost), amount: detail[i].pull_volume });
}
ret.overview.use_money += parseFloat(ret[i].cost);
ret.overview.use_amount += ret[i].pull_volume;
ret.overview.use_money += parseFloat(detail[i].cost);
ret.overview.use_amount += detail[i].pull_volume;
if (listMap.size > 0) {
listMap.forEach((value, key) => {
......
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