From 708dce320caedf9973ff0282098fb70dafd6702e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 14:09:57 +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 | 14 +-------------
1 files changed, 1 insertions(+), 13 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 9349b5e..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
@@ -160,8 +160,6 @@
// 鑾峰彇鍚勬敮浠樻柟寮廔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();
@@ -170,19 +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
@@ -197,22 +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;
--
Gitblit v1.8.0