From 5320225880ad8446100c04a897a9208b03790c55 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 二月 2024 21:00:13 +0800
Subject: [PATCH] 2024-02-02 朱宝民 重构IC卡操作表，调整补扣接口及充值记录查询接口，重构开卡明细记录查询接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 85fdc52..a6aa80d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrSell.cardOperate;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.BaseResponse;
@@ -8,6 +9,7 @@
import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
+import com.dy.pipIrrGlobal.daoSe.SeGeneralMapper;
import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voSe.*;
@@ -48,6 +50,9 @@
@Autowired
private ClientCardSv clientCardSv;
+
+ @Autowired
+ private SeGeneralMapper seGeneralMapper;
/**
@@ -235,6 +240,7 @@
* @return
*/
public Map getTransactions(QoTransaction vo){
+ DecimalFormat df = new DecimalFormat("0.00");
// 琛ラ綈鏌ヨ鏃堕棿
String operateTimeStart = vo.operateTimeStart;
String operateTimeStop = vo.operateTimeStop;
@@ -250,38 +256,33 @@
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
- // 鑾峰彇姹囨�荤殑璐按閲戦銆佽喘鍗￠噾棰�
- Float waterCost = 0f;
- Float cardCost = 0f;
- Map map_sum = Optional.ofNullable(seCardOperateMapper.getTransactionSums(params)).orElse(new HashMap());
- if(map_sum.size() > 0) {
- waterCost = Float.parseFloat(map_sum.get("waterCost").toString());
- cardCost = Float.parseFloat(map_sum.get("cardCost").toString());
+ // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
+ Long itemTotal = Optional.ofNullable(seCardOperateMapper.getTransactionRecordCount(params)).orElse(0L);
+
+ List<VoTradeDetails> list = seCardOperateMapper.getTransactions(params);
+ if(list.size() == 0) {
+ return new HashMap();
}
- // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
- Long itemTotal = seCardOperateMapper.getTransactionRecordCount(params);
+ // 閬嶅巻浜ゆ槗鏄庣粏璁板綍锛屾眹鎬昏喘姘撮噾棰濄�佽喘鍗￠噾棰�
+ Double totalWaterCost = 0.0;
+ Double totalCardCost = 0.0;
+ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
+ for(int i = 0; i < array.size(); i++) {
+ JSONObject job = array.getJSONObject(i);
+ Double waterCost = Optional.ofNullable(job.getDouble("waterCost")).orElse(0.0);
+ Double cardCost = Optional.ofNullable(job.getDouble("cardCost")).orElse(0.0);
+ totalWaterCost = totalWaterCost + waterCost;
+ totalCardCost = totalCardCost + cardCost;
+ }
- Integer pageSize = vo.getPageSize();
- // 璁＄畻鎬婚〉鏁�
- Integer pageTotal ;
- pageTotal = (int)Math.ceil((itemTotal==null?0.0D:itemTotal.doubleValue())/pageSize);
-
- // 鏍规嵁褰撳墠椤电爜鍙婃瘡椤垫暟閲忚绠楀亸绉婚噺
- Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
- params.put("pageCurr", pageCurr);
-
- List<VoTransaction> lit = seCardOperateMapper.getTransactions(params);
Map map_record = new HashMap();
map_record.put("itemTotal", itemTotal);
- map_record.put("pageCurr", vo.pageCurr);
- map_record.put("pageSize", pageSize);
- map_record.put("pageTotal", pageTotal);
- map_record.put("list", lit);
+ map_record.put("list", list);
Map map_result = new HashMap();
- map_result.put("waterCost", waterCost);
- map_result.put("cardCost", cardCost);
+ map_result.put("waterCost", df.format(totalWaterCost));
+ map_result.put("cardCost", df.format(totalCardCost));
map_result.put("records", map_record);
return map_result;
--
Gitblit v1.8.0