From 4d6f344319654bb50aa58a366517630b99615398 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 18 九月 2024 15:27:43 +0800
Subject: [PATCH] 2024-09-18 朱宝民 获取消费记录接口、获取返还记录接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 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 e1b1c04..8dc78b3 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
@@ -7,8 +7,10 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
+import com.dy.pipIrrGlobal.daoRm.RmOpenCloseValveHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.*;
import com.dy.pipIrrGlobal.pojoSe.*;
+import com.dy.pipIrrGlobal.voRm.VoExpend;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
@@ -61,6 +63,9 @@
@Autowired
private SeRechargeHistoryMapper seRechargeHistoryMapper;
+
+ @Autowired
+ private RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapper;
@Value("${project.projectNo}")
private Integer projectNo;
@@ -208,18 +213,19 @@
seClientCard.setId(cardId);
seClientCard.setMoney(afterRecharge);
seClientCard.setRechargedt(rechargeTime);
- if(paymentName != null && paymentName.equals("鎹㈠崱")) {
- seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
- }else {
- seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
- }
+ //if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ // seClientCard.setLastoper(LastOperateENUM.CHANGE_RECHARGE.getCode ());
+ //}else {
+ // seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
+ //}
+ seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
- * 娣诲姞姘村崱鎿嶄綔璁板綍
+ * 娣诲姞姘村崱鍏呭�兼搷浣滆褰�
*/
SeCardOperate seCardOperate = new SeCardOperate();
seCardOperate.setCardId(cardId);
@@ -227,11 +233,12 @@
seCardOperate.setMoney(money);
seCardOperate.setTradeAmount(amount);
seCardOperate.setGift(gift);
- if(paymentName != null && paymentName.equals("鎹㈠崱")) {
- seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
- }else {
- seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
- }
+ //if(paymentName != null && paymentName.equals("鎹㈠崱")) {
+ // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_RECHARGE.getCode());
+ //}else {
+ // seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
+ //}
+ seCardOperate.setOperateType(OperateTypeENUM.RECHARGE.getCode());
seCardOperate.setPaymentId(paymentId);
seCardOperate.setPrice(price);
seCardOperate.setRemarks(remarks);
@@ -304,6 +311,63 @@
}
/**
+ * 鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoRechargeNew>> getRechargesNew(QoRecharge queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = seCardOperateMapper.getRechargesCountNew(params);
+
+ QueryResultVo<List<VoRechargeNew>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seCardOperateMapper.getRechargesNew(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鑾峰彇杩旇繕璁板綍锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoRefund>> getRefunds(QoRecharge queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = seCardOperateMapper.getRefundsCount(params);
+
+ QueryResultVo<List<VoRefund>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seCardOperateMapper.getRefunds(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鑾峰彇姘村崱娑堣垂璁板綍锛岀鐞嗗钩鍙颁娇鐢�
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoExpend>> getExpends(QoRecharge queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = rmOpenCloseValveHistoryMapper.getExpendsCount(params);
+
+ QueryResultVo<List<VoExpend>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOpenCloseValveHistoryMapper.getExpends(params);
+ return rsVo ;
+ }
+
+ /**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍
* @param vo
* @return
@@ -328,12 +392,13 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(seCardOperateMapper.getTransactionRecordCount(params)).orElse(0L);
- QueryResultVo rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoTradeDetails>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = vo.pageSize ;
rsVo.pageCurr = vo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- List<VoTradeDetails> list = seCardOperateMapper.getTransactions(params);
+ rsVo.obj = seCardOperateMapper.getTransactions(params);
+ List<VoTradeDetails> list = rsVo.obj;
if(list.size() == 0) {
return new HashMap();
}
@@ -359,15 +424,13 @@
}
Map map_record = new HashMap();
- map_record.put("itemTotal", itemTotal);
- map_record.put("list", list);
+ map_record.put("list", rsVo);
Map map_result = new HashMap();
map_result.put("waterCost", df.format(totalWaterCost));
map_result.put("cardCost", df.format(totalCardCost));
map_result.put("gift", df.format(totalGift));
map_result.put("refund", df.format(totalRefund));
-
map_result.put("records", map_record);
--
Gitblit v1.8.0