From e5ac29afd5569196a54bd4f77457848afc7adf55 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 24 十月 2024 11:47:25 +0800
Subject: [PATCH] 2024-10-24 朱宝民 添加反写接口，完善各相关查询接口，兼容反写信息
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 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 7c6804d..932eb21 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
@@ -7,6 +7,7 @@
import com.dy.pipIrrGlobal.daoSe.*;
import com.dy.pipIrrGlobal.pojoSe.SeAudits;
import com.dy.pipIrrGlobal.pojoSe.SeGeneral;
+import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
import com.dy.pipIrrGlobal.voSe.VoGeneral;
import com.dy.pipIrrGlobal.voSe.VoTradeDetails;
import com.dy.pipIrrGlobal.voSe.VoTransactionStatistics;
@@ -48,6 +49,9 @@
@Autowired
private SeRefundMapper seRefundMapper;
+ @Autowired
+ private SePaymentMethodMapper sePaymentMethodMapper;
+
/**
* 鑾峰彇鏈敓鎴愭�昏处鐨勪氦鏄撴棩鏈熷垪琛紙褰撳ぉ鐨勪氦鏄撹褰曚笉鐢熸垚鎬昏处锛�
* @return
@@ -88,8 +92,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 ;
}
@@ -137,6 +158,23 @@
// 璧峰绱㈠紩浣嶇疆
Integer startIndex = (pageCurr - 1) * pageSize;
+ // 鑾峰彇鍚勬敮浠樻柟寮廔D
+ Long paymentId_cash = 0L;
+ Long paymentId_pos = 0L;
+ Long paymentId_transfer = 0L;
+ List<SePaymentMethod> list_payment = sePaymentMethodMapper.getPaymentMethods();
+ for (int i = 0; i < list_payment.size(); i++) {
+ SePaymentMethod paymentMethod = list_payment.get(i);
+ if(paymentMethod.getName().equals("鐜伴噾")) {
+ paymentId_cash = paymentMethod.getId();
+ }
+ if(paymentMethod.getName().equals("POS鏈�")) {
+ paymentId_pos = paymentMethod.getId();
+ }
+ if(paymentMethod.getName().equals("閾惰杞处")) {
+ paymentId_transfer = paymentMethod.getId();
+ }
+ }
// 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳ID
JSONArray array_paymentSums = new JSONArray();
@@ -149,19 +187,20 @@
while (calendar.getTime().before(timeStop) || calendar.getTime().equals(timeStop)) {
String tradeDate = dateFormat.format(calendar.getTime()) ;
if(cashierId != 1000000L) {
- 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);
+ Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_cash)).orElse(0f);
+ Float receivedPos = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_pos)).orElse(0f);
+ Float receivedTransfer = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_transfer)).orElse(0f);
JSONObject job = new JSONObject();
job.put("tradeDate", tradeDate);
job.put("receivedCash", receivedCash);
- job.put("receivedQRCode", receivedQRCode);
+ job.put("receivedPos", receivedPos);
job.put("receivedTransfer", receivedTransfer);
array_paymentSums.add(job);
}else {
// 鍒嗙骇璁＄畻鎸囧畾鏃ユ湡寰俊鏀堕��娆惧悎璁★紝鍐嶈绠楀疄鏀堕噾棰�
+ // 姝ゅ搴旂敤鏃跺啀浼樺寲
Double rechargeWeChat = Optional.ofNullable(seWalletRechargeMapper.getRechargeSum(tradeDate)).orElse(0.0);
Double refundWeChat = Optional.ofNullable(seRefundMapper.getRefundSum(tradeDate)).orElse(0.0);
Double receiveWeChat = rechargeWeChat - refundWeChat;
@@ -279,4 +318,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