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 | 84 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 11 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 749ad4e..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
@@ -1,14 +1,14 @@
package com.dy.pipIrrSell.general;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.daoSe.SeAuditsMapper;
-import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
-import com.dy.pipIrrGlobal.daoSe.SeGeneralMapper;
+import com.dy.pipIrrGlobal.daoSe.*;
import com.dy.pipIrrGlobal.pojoSe.SeAudits;
import com.dy.pipIrrGlobal.pojoSe.SeGeneral;
import com.dy.pipIrrGlobal.voSe.VoGeneral;
+import com.dy.pipIrrGlobal.voSe.VoTradeDetails;
import com.dy.pipIrrGlobal.voSe.VoTransactionStatistics;
import com.dy.pipIrrSell.general.qo.QoGeneral;
import com.dy.pipIrrSell.general.qo.QoToAudit;
@@ -17,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -37,6 +38,12 @@
@Autowired
private SeCardOperateMapper seCardOperateMapper;
+
+ @Autowired
+ private SeWalletRechargeMapper seWalletRechargeMapper;
+
+ @Autowired
+ private SeRefundMapper seRefundMapper;
/**
* 鑾峰彇鏈敓鎴愭�昏处鐨勪氦鏄撴棩鏈熷垪琛紙褰撳ぉ鐨勪氦鏄撹褰曚笉鐢熸垚鎬昏处锛�
@@ -103,7 +110,7 @@
}
/**
- * t娣诲姞鎬昏处瀹℃牳璁板綍
+ * 娣诲姞鎬昏处瀹℃牳璁板綍
* @param po
* @return
*/
@@ -117,21 +124,30 @@
* @return
*/
public Map getToAudit(QoToAudit vo) {
- /**
- * 鍙栧嚭鎸囧畾鏃ユ湡涓夌鏀粯鏂瑰紡锛堢幇閲戙�佹壂鐮併�佽浆璐︼級瀹炴敹閲戦
- */
+ DecimalFormat df = new DecimalFormat("0.00");
+
+ // 鎺ユ敹浼犲叆鍙傛暟锛氭搷浣滄棩鏈熴�佹敹閾跺憳ID
JSONArray array_paymentSums = new JSONArray();
- String tradeDate = vo.getTradeDate();
+ String tradeDate = vo.getTradeTime();
Long cashierId = vo.cashierId;
+ // 鍒嗗埆璁＄畻鎸囧畾鏃ユ湡銆佹寚瀹氭敹閾跺憳銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰�
Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, 1L)).orElse(0f);
Float receivedQRCode = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,2L)).orElse(0f);
Float receivedTransfer = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, 3L)).orElse(0f);
+
+ // 鍒嗙骇璁＄畻鎸囧畾鏃ユ湡寰俊鏀堕��娆惧悎璁★紝鍐嶈绠楀疄鏀堕噾棰�
+ Double rechargeWeChat = Optional.ofNullable(seWalletRechargeMapper.getRechargeSum(tradeDate)).orElse(0.0);
+ Double refundWeChat = Optional.ofNullable(seRefundMapper.getRefundSum(tradeDate)).orElse(0.0);
+ Double receiveWeChat = rechargeWeChat - refundWeChat;
+
+ // 鍥涚鏀粯鏂瑰紡瀹炴敹閲戦鍚堣鍐欏叆杩斿洖瀵硅薄锛堝啓鍏ュ墠鏍煎紡鍖栵級
JSONObject job = new JSONObject();
job.put("tradeDate", tradeDate);
- job.put("receivedCash", receivedCash);
- job.put("receivedQRCode", receivedQRCode);
- job.put("receivedTransfer", receivedTransfer);
+ job.put("receivedCash", df.format(receivedCash));
+ job.put("receivedQRCode", df.format(receivedQRCode));
+ job.put("receivedTransfer", df.format(receivedTransfer));
+ job.put("receiveWeChat", df.format(receiveWeChat));
array_paymentSums.add(job);
// 鐢熸垚鏌ヨ鍙傛暟
@@ -166,4 +182,50 @@
return map_result;
}
+
+ /**
+ * 鏍规嵁鏀堕摱鍛業D鍙婃棩鏈熻幏鍙栬储鍔″璐浜ゆ槗鏄庣粏璁板綍
+ * @param queryVo
+ * @return
+ */
+ public Map getTradeDetails(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);
+ 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