From d919e26796ec5a6f78fc0b665840207f185f1274 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 二月 2024 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java | 168 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 125 insertions(+), 43 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 76d9be0..83c819e 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,22 +1,26 @@
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.QoSummary;
import com.dy.pipIrrSell.general.qo.QoToAudit;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -37,6 +41,12 @@
@Autowired
private SeCardOperateMapper seCardOperateMapper;
+
+ @Autowired
+ private SeWalletRechargeMapper seWalletRechargeMapper;
+
+ @Autowired
+ private SeRefundMapper seRefundMapper;
/**
* 鑾峰彇鏈敓鎴愭�昏处鐨勪氦鏄撴棩鏈熷垪琛紙褰撳ぉ鐨勪氦鏄撹褰曚笉鐢熸垚鎬昏处锛�
@@ -75,18 +85,9 @@
Long itemTotal = seGeneralMapper.getRecordCount(params);
QueryResultVo<List<VoGeneral>> rsVo = new QueryResultVo<>() ;
- Integer pageCurr = 0;
- Integer pageSize = 10000;
- rsVo.pageCurr = 1;
- rsVo.pageSize = 10000;
- if(queryVo.pageSize != null && queryVo.pageCurr != null) {
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr;
- pageSize = queryVo.pageSize ;
- pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
- }
- params.put("pageCurr", pageCurr);
- params.put("pageSize", pageSize);
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seGeneralMapper.getGenerals(params);
@@ -112,7 +113,7 @@
}
/**
- * t娣诲姞鎬昏处瀹℃牳璁板綍
+ * 娣诲姞鎬昏处瀹℃牳璁板綍
* @param po
* @return
*/
@@ -120,59 +121,140 @@
return seAuditsMapper.insert(po);
}
+
/**
- * 璐㈠姟瀵硅处瀹℃牳椤碉紝鏀堕摱鍛�+鏃ユ湡鍒嗙粍锛屾帓闄や氦鏄撶被鍨嬪垎缁�
+ * 寮�鍗＄郴缁熶氦鏄撴眹鎬绘煡璇笌瀵硅处绯荤粺浜ゆ槗姹囨�绘煡璇㈠叡鐢ㄦ湇鍔″疄鐜扮被
* @param vo
* @return
+ * @throws ParseException
*/
- public Map getToAudit(QoToAudit vo) {
- /**
- * 鍙栧嚭鎸囧畾鏃ユ湡涓夌鏀粯鏂瑰紡锛堢幇閲戙�佹壂鐮併�佽浆璐︼級瀹炴敹閲戦
- */
+ public Map getSummaries(QoSummary vo) throws ParseException {
+ DecimalFormat df = new DecimalFormat("0.00");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ // 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳ID
JSONArray array_paymentSums = new JSONArray();
- String tradeDate = vo.getTradeDate();
+ Date timeStart = dateFormat.parse(vo.getTimeStart());
+ Date timeStop = dateFormat.parse(vo.getTimeStop());
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);
- JSONObject job = new JSONObject();
- job.put("tradeDate", tradeDate);
- job.put("receivedCash", receivedCash);
- job.put("receivedQRCode", receivedQRCode);
- job.put("receivedTransfer", receivedTransfer);
- array_paymentSums.add(job);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(timeStart);
+ 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);
+
+ JSONObject job = new JSONObject();
+ job.put("tradeDate", tradeDate);
+ job.put("receivedCash", receivedCash);
+ job.put("receivedQRCode", receivedQRCode);
+ 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;
+
+ // 寰俊瀹炴敹閲戦鍐欏叆杩斿洖瀵硅薄锛堝啓鍏ュ墠鏍煎紡鍖栵級
+ JSONObject job = new JSONObject();
+ job.put("receiveWeChat", df.format(receiveWeChat));
+ array_paymentSums.add(job);
+ }
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ }
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
- //鑾峰彇绗旀暟鍚堣銆佸疄鏀堕噾棰濆悎璁°�佽禒閫侀噾棰濆悎璁�
+ // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟(浠ｇ爜鍏ㄩ儴娉ㄩ噴鎺変簡锛屾病鍒�)
+ //Long itemTotal = seGeneralMapper.getToAuditRecordCount(params);
+
+ /**
+ * 鏍规嵁鏀堕摱鍛樼紪鍙枫�佷氦鏄撴棩鏈熸煡璇㈡眹鎬昏褰�
+ * 閬嶅巻姹囨�昏褰曟煡璇㈢粨鏋滐紝璁＄畻绗旀暟鍚堣銆佸疄鏀堕噾棰濆悎璁°�佽禒閫侀噾棰濆悎璁°�佽繑杩橀噾棰濆悎璁�
+ */
+ List<VoTransactionStatistics> list = Optional.ofNullable(seGeneralMapper.getSummaries(params)).orElse(new ArrayList<>());
+ if(list.size() == 0) {
+ return new HashMap();
+ }
+
Integer totalCount = 0;
Float totalReceived = 0f;
Float totalGift = 0f;
- Map map_sum = Optional.ofNullable(seGeneralMapper.getTransactionStatisticsSums(params)).orElse(new HashMap());
- if(map_sum.size() > 0) {
- totalCount = Integer.parseInt(map_sum.get("totalCount").toString());
- totalReceived = Float.parseFloat(map_sum.get("totalReceived").toString());
- totalGift = Float.parseFloat(map_sum.get("totalGift").toString());
+ Float totalRefund = 0f;
+ JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
+ for(int i = 0; i < array.size(); i++) {
+ JSONObject job_summary = array.getJSONObject(i);
+ totalCount = totalCount + Optional.ofNullable(job_summary.getInteger("count")).orElse(0);
+ totalReceived = totalReceived + Optional.ofNullable(job_summary.getFloat("received")).orElse(0f);
+ totalGift = totalGift + Optional.ofNullable(job_summary.getFloat("gift")).orElse(0f);
+ totalRefund = totalRefund + Optional.ofNullable(job_summary.getFloat("refundAmount")).orElse(0f);
}
- // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
- Long itemTotal = seGeneralMapper.getToAuditRecordCount(params);
-
- List<VoTransactionStatistics> list = seGeneralMapper.getToAudit(params);
Map map_record = new HashMap();
- map_record.put("itemTotal", itemTotal);
- map_record.put("pageCurr", vo.pageCurr);
+ //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_result.put("records", map_record);
map_result.put("paymentSums", array_paymentSums);
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