From e5c29d6ac2b210a9385723598d79a42ae5a9679e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 15:20:13 +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 | 134 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 9 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 83c819e..828b764 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 ;
}
@@ -132,6 +153,29 @@
DecimalFormat df = new DecimalFormat("0.00");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Integer pageSize = vo.getPageSize();
+ Integer pageCurr = vo.getPageCurr();
+ // 璧峰绱㈠紩浣嶇疆
+ 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();
Date timeStart = dateFormat.parse(vo.getTimeStart());
@@ -143,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;
@@ -196,18 +241,34 @@
totalRefund = totalRefund + Optional.ofNullable(job_summary.getFloat("refundAmount")).orElse(0f);
}
- Map map_record = new HashMap();
- //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 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;
}
@@ -257,4 +318,59 @@
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;
+
+ }
+
+ /**
+ * 鍒犻櫎浠婂ぉ鐨勬�昏处
+ */
+ public void deleteTodayGeneral() {
+ int i = seGeneralMapper.deleteTodayGeneral();
+ }
}
--
Gitblit v1.8.0