From a60332d51fec0ae9f1afecc8c7a018c77e4ac101 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 27 二月 2024 10:03:29 +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/recharge/RechargeSv.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
index a82ee98..ce11f65 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
@@ -1,15 +1,16 @@
package com.dy.pipIrrSell.recharge;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoSe.SeRechargeHistoryMapper;
import com.dy.pipIrrGlobal.daoSe.SeRechargeMapper;
-import com.dy.pipIrrGlobal.pojoSe.VoRecharge;
+import com.dy.pipIrrGlobal.pojoSe.SeRecharge;
+import com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory;
+import com.dy.pipIrrGlobal.voSe.VoRecharge;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -26,22 +27,21 @@
@Autowired
private SeRechargeMapper seRechargeMapper;
+ @Autowired
+ private SeRechargeHistoryMapper seRechargeHistoryMapper;
+
public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) {
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
- LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
+ String rechargeTimeStart = queryVo.rechargeTimeStart;
+ String rechargeTimeStop = queryVo.rechargeTimeStop;
if(rechargeTimeStart != null) {
- rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ rechargeTimeStart = rechargeTimeStart + " 00:00:00";
queryVo.setRechargeTimeStart(rechargeTimeStart);
}
-
if(rechargeTimeStop != null) {
- rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ rechargeTimeStop = rechargeTimeStop + " 23:59:59";
queryVo.setRechargeTimeStop(rechargeTimeStop);
}
-
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
@@ -50,10 +50,51 @@
QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seRechargeMapper.getRecharges(params);
return rsVo ;
}
+ /**
+ * 鏍规嵁姘村崱缂栧彿锛堜富閿級鍒犻櫎鍏呭�艰褰�
+ * @param cardId
+ * @return
+ */
+ //public Integer deleteByPrimaryKey(Long cardId) {
+ // return seRechargeMapper.deleteByPrimaryKey(cardId);
+ //}
+
+ /**
+ * 娣诲姞鍏呭�艰褰�
+ * @param po
+ * @return
+ */
+ public Long add(SeRecharge po) {
+ seRechargeMapper.insert(po);
+ return po.getId();
+ }
+
+ /**
+ * 鏍规嵁姘村崱缂栧彿鍒犻櫎鍏呭�艰褰�
+ * @param cardId
+ * @return
+ */
+ public Integer deleteByCardId(Long cardId) {
+ return seRechargeMapper.deleteByCardId(cardId);
+ }
+ //public Integer deleteByCardNum(String cardNum) {
+ // return seRechargeMapper.deleteByCardNum(cardNum);
+ //}
+
+ /**
+ * 娣诲姞鍏呭�煎巻鍙茶〃
+ * @param po
+ * @return
+ */
+ public Long addHistory(SeRechargeHistory po){
+ seRechargeHistoryMapper.insert(po);
+ return po.getId();
+ }
}
--
Gitblit v1.8.0