moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1: 账单获取增加按天返回礼物价值总额信息

Browse Source
This commit is contained in:
lzm
2022-10-10 10:52:38 +08:00
parent b5e4e19c58
commit 6a14754e39
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/record/BillRecordService.java
View File

@@ -299,7 +299,10 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
map.put(String.valueOf(key), voList);
map.put("date",key);
// 每天总计从数据库查询，考虑到前后分页还没有结束的情况
map.put("total", getBillRecordsDailySum(uid, objTypes, key));
Map<String, Object> dailySumMap = getBillRecordsDailySum(uid, objTypes, key);
map.put("total", Double.valueOf(String.valueOf(dailySumMap.get("total"))));
map.put("totalGiftGoldNumDailySum", Long.valueOf(String.valueOf(dailySumMap.get("totalGiftGoldNumDailySum"))));
result.add(map);
}
return result;
@@ -318,7 +321,7 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
return list;
}
private Double getBillRecordsDailySum(Long uid, List<Byte> objTypes, Long date) {
private Map<String, Object> getBillRecordsDailySum(Long uid, List<Byte> objTypes, Long date) {
Date nextDate = DateTimeUtil.getNextDay(new Date(date), 1);
Date start = DateUtils.addDays(nextDate, -1);
QueryWrapper<BillRecord> wrapper = new QueryWrapper<>();
@@ -328,10 +331,9 @@ public class BillRecordService extends ServiceImpl<BillRecordMapper,BillRecord>
// TODO 针对活动支出记录为负号进行处理，暂时先处理 需优化
String objType = CollectionUtil.join(NEED_ABS_OBJ_TPYES, ",");
wrapper.select("ifnull( sum(if(obj_type in(" + objType + ")," +
"-amount,amount)), 0 ) AS total ");
"-amount,amount)), 0 ) AS total, ifnull( sum(gift_total_gold_num), 0 ) AS totalGiftGoldNumDailySum ");
// 只查询一天selectMaps返回只有一条
Map<String, Object> map = billRecordMapper.selectMaps(wrapper).get(0);
return Double.valueOf(String.valueOf(map.get("total")));
return billRecordMapper.selectMaps(wrapper).get(0);
}
private List<BillSearchVo> convertBillRecord2SearchVo(List<BillRecord> billRecords) {