From 4fe39e9df868a8fdd40549f169adbea2e8bd622a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 27 十一月 2024 15:34:09 +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/activeCard/ActiveCardSv.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
index c653047..86c9cf7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
@@ -2,6 +2,8 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeActiveCardMapper;
+import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
+import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import lombok.extern.slf4j.Slf4j;
@@ -9,8 +11,6 @@
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;
@@ -27,19 +27,25 @@
@Autowired
private SeActiveCardMapper seActiveCardMapper;
+ @Autowired
+ private SeClientCardMapper seClientCardMapper;
+
+ //@Autowired
+ //private BaClientMapper baClientMapper;
+
+ @Autowired
+ private SeClientMapper seClientMapper;
+
public QueryResultVo<List<VoActiveCard>> getActiveCards(QueryVo queryVo) {
//瀹屽杽鏌ヨ寮�鍗¤褰曠殑璧锋鏃堕棿
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- LocalDateTime activeTimeStart = queryVo.activeTimeStart;
- LocalDateTime activeTimeStop = queryVo.activeTimeStop;
+ String activeTimeStart = queryVo.activeTimeStart;
+ String activeTimeStop = queryVo.activeTimeStop;
if(activeTimeStart != null) {
- activeTimeStart = LocalDateTime.parse(df.format(activeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ activeTimeStart = activeTimeStart + " 00:00:00";
queryVo.setActiveTimeStart(activeTimeStart);
}
-
if(activeTimeStop != null) {
- activeTimeStop = LocalDateTime.parse(df.format(activeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ activeTimeStop = activeTimeStop + " 23:59:59";
queryVo.setActiveTimeStop(activeTimeStop);
}
@@ -50,6 +56,7 @@
QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seActiveCardMapper.getActiveCards(params);
return rsVo ;
@@ -59,4 +66,31 @@
seActiveCardMapper.insert(po);
return po.getId();
}
+
+ /**
+ * 鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍唬鐮�
+ * @param clientNum 鍐滄埛缂栧彿
+ * @return 5绾ц鏀垮尯鍒掍唬鐮�
+ */
+ public Long getAreaCodeByNum(String clientNum) {
+ return seClientMapper.getAreaCodeByNum(clientNum);
+ }
+
+ /**
+ * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID
+ * @param clientNum
+ * @return
+ */
+ public Long getClientIdByNum(String clientNum) {
+ return seClientMapper.getClientIdByNum(clientNum);
+ }
+
+ /**
+ * 鏍规嵁琛屾斂鍖哄垝涓叉ā鍧楁煡璇㈡按鍗＄紪鍙�
+ * @param areaCode
+ * @return
+ */
+ String getCardNumOfMax(String areaCode) {
+ return seClientCardMapper.getCardNumOfMax(areaCode);
+ }
}
--
Gitblit v1.8.0