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/general/GeneralSv.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 e074e82..58eb1c7 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
@@ -128,7 +128,7 @@
// 鎺ユ敹浼犲叆鍙傛暟锛氭搷浣滄棩鏈熴�佹敹閾跺憳ID
JSONArray array_paymentSums = new JSONArray();
- String tradeDate = vo.getTradeDate();
+ String tradeDate = vo.getTradeTime();
Long cashierId = vo.cashierId;
// 鍒嗗埆璁＄畻鎸囧畾鏃ユ湡銆佹寚瀹氭敹閾跺憳銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰�
@@ -198,14 +198,13 @@
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
-
rsVo.calculateAndSet(itemTotal, params);
- //rsVo.obj = seGeneralMapper.getTradeDetails(params);
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++) {
@@ -217,9 +216,12 @@
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);
--
Gitblit v1.8.0