From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +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 | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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 9c574cb..f3138c9 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
@@ -8,11 +8,10 @@
import com.dy.pipIrrGlobal.voSe.VoRecharge;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.apache.ibatis.annotations.Param;
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;
@@ -34,20 +33,16 @@
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);
@@ -56,6 +51,7 @@
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 ;
@@ -66,9 +62,9 @@
* @param cardId
* @return
*/
- public Integer deleteByPrimaryKey(Long cardId) {
- return seRechargeMapper.deleteByPrimaryKey(cardId);
- }
+ //public Integer deleteByPrimaryKey(Long cardId) {
+ // return seRechargeMapper.deleteByPrimaryKey(cardId);
+ //}
/**
* 娣诲姞鍏呭�艰褰�
@@ -88,6 +84,9 @@
public Integer deleteByCardId(Long cardId) {
return seRechargeMapper.deleteByCardId(cardId);
}
+ //public Integer deleteByCardNum(String cardNum) {
+ // return seRechargeMapper.deleteByCardNum(cardNum);
+ //}
/**
* 娣诲姞鍏呭�煎巻鍙茶〃
@@ -99,4 +98,13 @@
return po.getId();
}
+ /**
+ * 鏍规嵁姘村崱id鑾峰彇鏈�杩戜竴鏉″厖鍊艰褰昳d
+ * @param cardId
+ * @return
+ */
+ public Long selectIdByCardId(Long cardId){
+ SeRecharge seRecharge = seRechargeMapper.selectByCardId(cardId);
+ return seRecharge.getId();
+ }
}
--
Gitblit v1.8.0