From 4fe39e9df868a8fdd40549f169adbea2e8bd622a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 27 十一月 2024 15:34:09 +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 | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 58609ec..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
@@ -160,8 +160,7 @@
// 鑾峰彇鍚勬敮浠樻柟寮廔D
Long paymentId_cash = 0L;
- Long paymentId_wechat = 0L;
- Long paymentId_alipay = 0L;
+ Long paymentId_pos = 0L;
Long paymentId_transfer = 0L;
List<SePaymentMethod> list_payment = sePaymentMethodMapper.getPaymentMethods();
for (int i = 0; i < list_payment.size(); i++) {
@@ -169,16 +168,12 @@
if(paymentMethod.getName().equals("鐜伴噾")) {
paymentId_cash = paymentMethod.getId();
}
- if(paymentMethod.getName().equals("寰俊鏀粯")) {
- paymentId_wechat = paymentMethod.getId();
- }
- if(paymentMethod.getName().equals("鏀粯瀹濇敮浠�")) {
- paymentId_alipay = paymentMethod.getId();
+ if(paymentMethod.getName().equals("POS鏈�")) {
+ paymentId_pos = paymentMethod.getId();
}
if(paymentMethod.getName().equals("閾惰杞处")) {
paymentId_transfer = paymentMethod.getId();
}
-
}
// 鎺ユ敹浼犲叆鍙傛暟锛氫氦鏄撹捣姝㈡棩鏈熴�佹敹閾跺憳ID
@@ -193,20 +188,19 @@
String tradeDate = dateFormat.format(calendar.getTime()) ;
if(cashierId != 1000000L) {
Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_cash)).orElse(0f);
- Float receivedWechat = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_wechat)).orElse(0f);
- Float receivedAlipay = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_alipay)).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("receivedWechat", receivedWechat);
- job.put("receivedAlipay", receivedAlipay);
+ 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;
@@ -372,4 +366,11 @@
return map_result;
}
+
+ /**
+ * 鍒犻櫎浠婂ぉ鐨勬�昏处
+ */
+ public void deleteTodayGeneral() {
+ int i = seGeneralMapper.deleteTodayGeneral();
+ }
}
--
Gitblit v1.8.0