From b8732848e6343f05c320f47a47627869e9c57176 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 07 六月 2024 16:21:33 +0800
Subject: [PATCH] 修改 开卡(充值)接口 开卡返回开卡ID 充值返回充值ID

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java |   32 +++++++++++---------------------
 1 files changed, 11 insertions(+), 21 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 b790900..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,10 +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.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
@@ -33,32 +33,16 @@
 
     public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) {
         //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
-        //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 = rechargeTimeStart + " 00:00:00";
             queryVo.setRechargeTimeStart(rechargeTimeStart);
         }
-
         if(rechargeTimeStop != null) {
             rechargeTimeStop = rechargeTimeStop + " 23:59:59";
             queryVo.setRechargeTimeStop(rechargeTimeStop);
         }
-
 
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
 
@@ -66,10 +50,7 @@
 
         QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
         rsVo.pageSize = queryVo.pageSize ;
-        //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.pageCurr = queryVo.pageCurr ;
 
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = seRechargeMapper.getRecharges(params);
@@ -117,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