From a40eed2a4d81d27d252823a18529f072af56579c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 26 十二月 2023 18:31:05 +0800
Subject: [PATCH] 2023-12-26 朱宝民 分水房单个查询、单个删除、修改

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 7 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..b790900 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,14 +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,19 +28,34 @@
     @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;
+        //LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
+        //LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
+        //if(rechargeTimeStart != null) {
+        //    rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        //    queryVo.setRechargeTimeStart(rechargeTimeStart);
+        //}
+        //
+        //if(rechargeTimeStop != null) {
+        //    rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        //    queryVo.setRechargeTimeStop(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);
         }
 
@@ -49,11 +66,55 @@
 
         QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
         rsVo.pageSize = queryVo.pageSize ;
-        rsVo.pageCurr = queryVo.pageCurr ;
+        //rsVo.pageCurr = queryVo.pageCurr ;
+        Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+        params.put("pageCurr", pageCurr);
+        rsVo.pageCurr = 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