From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +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/cardOperate/CardOperateSv.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 244dea3..b144bb3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -435,6 +435,7 @@
String operateType = list.get(i).getOperateType();//涓氬姟绫诲瀷
String cardState = list.get(i).getCardState();//鍗＄姸鎬�
Long villageId = list.get(i).getVillageId();//鏉慽d
+ Long cashierId = list.get(i).getCashierId();//鏀堕摱鍛榠d
list.get(i).setGift(0d);
list.get(i).setMoney(money-gift1);
@@ -457,7 +458,7 @@
voTradeDetail.setCardNum(cardNum);//2
voTradeDetail.setIdCard(idCard);//2
voTradeDetail.setCashierName(cashierName);//2
- voTradeDetail.setCashierId(0L);//2
+ voTradeDetail.setCashierId(cashierId);//2
voTradeDetail.setCardState(cardState);//2
voTradeDetail.setVillageId(villageId);//2
@@ -465,6 +466,7 @@
itemTotal = itemTotal + 1;
}
}
+ list.sort(Comparator.comparing(VoTradeDetails::getTradeTime));
rsVo.obj = list;
rsVo.calculateAndSet(itemTotal, params);
--
Gitblit v1.8.0