| | |
|---|
| | | if (list.size() == 0) { |
|---|
| | | return new HashMap(); |
|---|
| | | } |
|---|
| | | //元谋一期陆常丽需求把赠送金额与充值金额分开显示 |
|---|
| | | for (int i = list.size()-1; i >= 0 ; i--) { |
|---|
| | | Optional.ofNullable(list.get(i).getGift()).orElse(0d); |
|---|
| | | if (!list.get(i).getGift().equals(0d)){ |
|---|
| | | Double gift1 = list.get(i).getGift(); |
|---|
| | | String districtTitle = list.get(i).getDistrictTitle(); |
|---|
| | | String clientNum = list.get(i).getClientNum(); |
|---|
| | | String clientName = list.get(i).getClientName(); |
|---|
| | | String phone = list.get(i).getPhone(); |
|---|
| | | Date tradeTime = list.get(i).getTradeTime(); |
|---|
| | | |
|---|
| | | list.get(i).setGift(0d); |
|---|
| | | |
|---|
| | | VoTradeDetails voTradeDetail = new VoTradeDetails(); |
|---|
| | | voTradeDetail.setDistrictTitle(districtTitle); |
|---|
| | | voTradeDetail.setClientNum(clientNum); |
|---|
| | | voTradeDetail.setClientName(clientName); |
|---|
| | | voTradeDetail.setPhone(phone); |
|---|
| | | voTradeDetail.setOperateType("赠送"); |
|---|
| | | voTradeDetail.setTradeTime(tradeTime); |
|---|
| | | voTradeDetail.setWaterCost(0d); |
|---|
| | | voTradeDetail.setCardCost(0d); |
|---|
| | | voTradeDetail.setGift(gift1); |
|---|
| | | |
|---|
| | | list.add(voTradeDetail); |
|---|
| | | itemTotal = itemTotal + 1; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | rsVo.obj = list; |
|---|
| | | rsVo.calculateAndSet(itemTotal, params); |
|---|
| | | |
|---|
| | | // 遍历交易明细记录，汇总购水金额、购卡金额 |
|---|
| | | Double totalWaterCost = 0.0; |
|---|
