From 7ccce6911249a0a9df42f2e04e7a34da4c66a6da Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 30 八月 2024 10:01:33 +0800
Subject: [PATCH] 2024-08-30 朱宝民 获取地图中心坐标、是否允许开卡验证
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
index 83c819e..49c1cce 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
@@ -88,8 +88,25 @@
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seGeneralMapper.getGenerals(params);
+ return rsVo ;
+ }
+
+ /**
+ * 瀵煎嚭鎸囧畾鏉′欢鐨勬�昏处璁板綍
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoGeneral>> exportGenerals(QoGeneral queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = seGeneralMapper.getRecordCount(params);
+ QueryResultVo<List<VoGeneral>> rsVo = new QueryResultVo<>() ;
rsVo.calculateAndSet(itemTotal, params);
+ params.remove("start");
+ params.remove("count");
rsVo.obj = seGeneralMapper.getGenerals(params);
return rsVo ;
}
@@ -131,6 +148,12 @@
public Map getSummaries(QoSummary vo) throws ParseException {
DecimalFormat df = new DecimalFormat("0.00");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ Integer pageSize = vo.getPageSize();
+ Integer pageCurr = vo.getPageCurr();
+ // 璧峰绱㈠紩浣嶇疆
+ Integer startIndex = (pageCurr - 1) * pageSize;
+
// 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳ID
JSONArray array_paymentSums = new JSONArray();
@@ -196,18 +219,34 @@
totalRefund = totalRefund + Optional.ofNullable(job_summary.getFloat("refundAmount")).orElse(0f);
}
- Map map_record = new HashMap();
- //map_record.put("itemTotal", itemTotal);
- map_record.put("list", list);
-
Map map_result = new HashMap();
map_result.put("totalCount", totalCount);
map_result.put("totalReceived", totalReceived);
map_result.put("totalGift", totalGift);
map_result.put("totalRefund", totalRefund);
+ // 鍒嗛〉鏍煎紡缁勮璁板綍鍒楄〃
+ Map map_record = new HashMap();
+ map_record.put("itemTotal", list.size());
+ map_record.put("pageCurr", pageCurr);
+ map_record.put("pageSize", pageSize);
+ map_record.put("pageTotal", (int)Math.ceil((double)list.size() / pageSize));
+ JSONArray array_record = (JSONArray) JSON.toJSON(list);
+ JSONArray array_record_page = (JSONArray)JSON.toJSON(array_record.subList(startIndex, Math.min(startIndex + pageSize, array_record.size())));
+ map_record.put("list", array_record_page);
+
+ // 鍒嗛〉鏍煎紡缁勮鏀粯鏂瑰紡鍒楄〃
+ Map map_paymentSums = new HashMap();
+ map_paymentSums.put("itemTotal", array_paymentSums.size());
+ map_paymentSums.put("pageCurr", pageCurr);
+ map_paymentSums.put("pageSize", pageSize);
+ map_paymentSums.put("pageTotal", (int)Math.ceil((double)array_paymentSums.size() / pageSize));
+ JSONArray array_paymentSums_page = (JSONArray) JSON.toJSON(array_paymentSums.subList(startIndex, Math.min(startIndex + pageSize, array_paymentSums.size())));
+ map_paymentSums.put("list", array_paymentSums_page);
+
+
map_result.put("records", map_record);
- map_result.put("paymentSums", array_paymentSums);
+ map_result.put("paymentSums", map_paymentSums);
return map_result;
}
@@ -257,4 +296,52 @@
return map_result;
}
+
+ /**
+ * 瀵煎嚭浜ゆ槗鏄庣粏璁板綍
+ * @param queryVo
+ * @return
+ */
+ public Map exportTradeDetails(QoToAudit queryVo) {
+ DecimalFormat df = new DecimalFormat("0.00");
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = seGeneralMapper.getTradeDetailsRecordCount(params);
+
+ QueryResultVo<List<VoTradeDetails>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ params.remove("start");
+ params.remove("count");
+ List<VoTradeDetails> list = Optional.ofNullable(seGeneralMapper.getTradeDetails(params)).orElse(new ArrayList<>());
+ if(list.size() == 0) {
+ return new HashMap();
+ }
+
+ // 閬嶅巻浜ゆ槗鏄庣粏璁板綍锛屾眹鎬讳氦鏄撻噾棰�
+ Double totalTradeAmount = 0.0;
+ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
+ for(int i = 0; i < array.size(); i++) {
+ JSONObject job = array.getJSONObject(i);
+ Double tradeAmount = Optional.ofNullable(job.getDouble("tradeAmount")).orElse(0.0);
+ totalTradeAmount = totalTradeAmount + tradeAmount;
+ }
+
+ Map map_record = new HashMap();
+ map_record.put("itemTotal", rsVo.itemTotal);
+ map_record.put("pageCurr", rsVo.pageCurr);
+ map_record.put("pageSize", rsVo.pageSize);
+ map_record.put("pageTotal", rsVo.pageTotal);
+ map_record.put("list", list);
+
+ Map map_result = new HashMap();
+
+ map_result.put("totalTradeAmount", df.format(totalTradeAmount));
+ map_result.put("records", map_record);
+
+ return map_result;
+
+ }
}
--
Gitblit v1.8.0