From e29ff6ff2de584854531e443ed4d8da0347e08bd Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 10:40:59 +0800
Subject: [PATCH] 优化接口 小程序下的获得全部取水口接口与项目管理下的获得全部取水口接口同步
---
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