From 004391089df2fda26b9c514d76bac1c329cad750 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 23 十月 2024 16:47:22 +0800
Subject: [PATCH] 2024-10-23 朱宝民 可同时支持多个微信小程序
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 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 49c1cce..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;
@@ -47,6 +48,9 @@
@Autowired
private SeRefundMapper seRefundMapper;
+
+ @Autowired
+ private SePaymentMethodMapper sePaymentMethodMapper;
/**
* 鑾峰彇鏈敓鎴愭�昏处鐨勪氦鏄撴棩鏈熷垪琛紙褰撳ぉ鐨勪氦鏄撹褰曚笉鐢熸垚鎬昏处锛�
@@ -154,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();
@@ -166,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;
--
Gitblit v1.8.0