From 39baeee8fe6d86d8898082c3f3100a810be91eec Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 15:45:24 +0800
Subject: [PATCH] 强制停止请求成功后，返回信息重构
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 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 7f438a3..31e7ab8 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
@@ -412,6 +412,36 @@
if (list.size() == 0) {
return new HashMap();
}
+//鍏冭皨涓�鏈熼檰甯镐附闇�姹傛妸璧犻�侀噾棰濅笌鍏呭�奸噾棰濆垎寮�鏄剧ず
+ for (int i = list.size()-1; i >= 0 ; i--) {
+ Optional.ofNullable(list.get(i).getGift()).orElse(0d);
+ if (!list.get(i).getGift().equals(0d)){
+ Double gift1 = list.get(i).getGift();
+ String districtTitle = list.get(i).getDistrictTitle();
+ String clientNum = list.get(i).getClientNum();
+ String clientName = list.get(i).getClientName();
+ String phone = list.get(i).getPhone();
+ Date tradeTime = list.get(i).getTradeTime();
+
+ list.get(i).setGift(0d);
+
+ VoTradeDetails voTradeDetail = new VoTradeDetails();
+ voTradeDetail.setDistrictTitle(districtTitle);
+ voTradeDetail.setClientNum(clientNum);
+ voTradeDetail.setClientName(clientName);
+ voTradeDetail.setPhone(phone);
+ voTradeDetail.setOperateType("璧犻��");
+ voTradeDetail.setTradeTime(tradeTime);
+ voTradeDetail.setWaterCost(0d);
+ voTradeDetail.setCardCost(0d);
+ voTradeDetail.setGift(gift1);
+
+ list.add(voTradeDetail);
+ itemTotal = itemTotal + 1;
+ }
+ }
+ rsVo.obj = list;
+ rsVo.calculateAndSet(itemTotal, params);
// 閬嶅巻浜ゆ槗鏄庣粏璁板綍锛屾眹鎬昏喘姘撮噾棰濄�佽喘鍗￠噾棰�
Double totalWaterCost = 0.0;
@@ -816,4 +846,23 @@
clientCard.setLastoper(LastOperateENUM.REFUND.getCode());
return seClientCardMapper.updateByPrimaryKeySelective(clientCard);
}
+
+ /**
+ * 淇敼鍙嶅啓姘村崱琛ㄧ殑鎿嶄綔淇℃伅鍙婁綑棰�
+ * @param operateType
+ * @param cardId
+ * @return
+ */
+ public Integer updateWriteBack(Integer operateType, Long cardId) {
+ SeCardOperate cardOperate = seCardOperateMapper.getCardOperate(operateType, cardId);
+ Date writeBackTime = Optional.ofNullable(cardOperate.getOperateDt()).orElse(new Date());
+ Float money = cardOperate.getMoney();
+
+ SeClientCard clientCard = new SeClientCard();
+ clientCard.setId(cardId);
+ clientCard.setRefunddt(writeBackTime);
+ clientCard.setMoney(money);
+ clientCard.setLastoper(LastOperateENUM.WRITE_BACK.getCode());
+ return seClientCardMapper.updateByPrimaryKeySelective(clientCard);
+ }
}
--
Gitblit v1.8.0