From e18c4a8ac170fea6e079047a27f72032c80eee67 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 九月 2024 14:12:18 +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 | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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..9349b5e 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,9 @@
// 鑾峰彇鍚勬敮浠樻柟寮廔D
Long paymentId_cash = 0L;
- Long paymentId_wechat = 0L;
- Long paymentId_alipay = 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,11 +170,14 @@
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("寰俊鏀粯")) {
+ // 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();
@@ -193,15 +197,17 @@
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 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("receivedWechat", receivedWechat);
+ //job.put("receivedAlipay", receivedAlipay);
+ job.put("receivedPos", receivedPos);
job.put("receivedTransfer", receivedTransfer);
array_paymentSums.add(job);
--
Gitblit v1.8.0