| | |
|---|
| | | travelCard.setRechargeTime(new Date()); |
|---|
| | | this.baseMapper.updateById(travelCard); |
|---|
| | | // 新增余额变更记录（出行卡兑换类型） |
|---|
| | | this.baseMapper.insertBalanceModifyRecord(BalanceModifyRecordVo.convert(userInfo.getId(), userInfo.getNickName(), userInfo.getPhone(), travelCard.getAmount())); |
|---|
| | | // this.baseMapper.insertBalanceModifyRecord(BalanceModifyRecordVo.convert(userInfo.getId(), userInfo.getNickName(), userInfo.getPhone(), travelCard.getAmount())); |
|---|
| | | } |
|---|
| | | return travelCard.getAmount(); |
|---|
| | | } |
|---|
| | |
|---|
| | | * @return 变更记录列表 |
|---|
| | | */ |
|---|
| | | public List<BalanceRecordVo> getBalanceModifyRecord(Integer userId, Integer type, String startDate, String endDate) { |
|---|
| | | if(StringUtils.isNotEmpty(startDate)) { |
|---|
| | | startDate = startDate + " 00:00:00"; |
|---|
| | | } |
|---|
| | | if(StringUtils.isNotEmpty(endDate)) { |
|---|
| | | endDate = endDate + " 23:59:59"; |
|---|
| | | } |
|---|
| | | List<BalanceModifyRecordVo> recordVoList = this.baseMapper.getBalanceModifyRecord(userId, type, startDate, endDate); |
|---|
| | | List<BalanceRecordVo> orderRecords = this.baseMapper.getOrderRecord(userId, startDate, endDate); |
|---|
| | | // List<BalanceRecordVo> orderRecords = this.baseMapper.getOrderRecord(userId, startDate, endDate); |
|---|
| | | List<BalanceRecordVo> balanceRecordVos = new ArrayList<>(); |
|---|
| | | if(CollectionUtils.isNotEmpty(recordVoList)) { |
|---|
| | | recordVoList.forEach(r -> balanceRecordVos.add(BalanceRecordVo.convert(r))); |
|---|
| | | } |
|---|
| | | if(CollectionUtils.isNotEmpty(orderRecords)) { |
|---|
| | | /* if(CollectionUtils.isNotEmpty(orderRecords)) { |
|---|
| | | orderRecords.forEach(order -> balanceRecordVos.add(BalanceRecordVo.convert(order, userId))); |
|---|
| | | } |
|---|
| | | }*/ |
|---|
| | | return balanceRecordVos; |
|---|
| | | } |
|---|
| | | |
|---|
