From 2b3defc58765bdd126901b809448868a5f8feb3c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 15:12:56 +0800
Subject: [PATCH] 2024-05-29 朱宝民
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java | 129 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 38 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..7c6804d 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
@@ -11,6 +11,7 @@
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;
@@ -18,6 +19,8 @@
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -118,67 +121,115 @@
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
+ Integer pageSize = vo.getPageSize();
+ Integer pageCurr = vo.getPageCurr();
+ // 璧峰绱㈠紩浣嶇疆
+ Integer startIndex = (pageCurr - 1) * pageSize;
+
+
+ // 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳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);
+ 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);
- // 鍒嗙骇璁＄畻鎸囧畾鏃ユ湡寰俊鏀堕��娆惧悎璁★紝鍐嶈绠楀疄鏀堕噾棰�
- 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);
+ array_paymentSums.add(job);
- // 鍥涚鏀粯鏂瑰紡瀹炴敹閲戦鍚堣鍐欏叆杩斿洖瀵硅薄锛堝啓鍏ュ墠鏍煎紡鍖栵級
- JSONObject job = new JSONObject();
- job.put("tradeDate", tradeDate);
- 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);
+ }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("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;
}
@@ -198,14 +249,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 +267,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