From bbe9826b889664d124e2fac69b5b900ad97f8351 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 30 五月 2024 09:16:17 +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/client/ClientSv.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
index cc4f739..77e891b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientSv.java
@@ -4,11 +4,14 @@
import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
+import com.dy.pipIrrGlobal.daoSe.SeCodeVerifyMapper;
+import com.dy.pipIrrGlobal.daoSe.SeOpenIdMapper;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.pipIrrGlobal.pojoSe.SeCodeVerify;
+import com.dy.pipIrrGlobal.pojoSe.SeOpenId;
import com.dy.pipIrrGlobal.voSe.VoClient;
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;
@@ -32,31 +35,35 @@
private BaDistrictMapper baDistrictMapper;
@Autowired
+ private SeCodeVerifyMapper seCodeVerifyMapper;
+
+ @Autowired
+ private SeOpenIdMapper seOpenIdMapper;
+
+ @Autowired
private BaSettingsMapper baSettingsMapper;
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁
- *
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoClient>> getClients(QueryVo queryVo) {
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ public QueryResultVo<List<VoClient>> getClients(QueryVo queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
Long itemTotal = seClientMapper.getRecordCount(params);
- QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize;
- rsVo.pageCurr = queryVo.pageCurr;
+ QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seClientMapper.getClients(params);
- return rsVo;
+ return rsVo ;
}
/**
* 鏍规嵁涓婚敭鑾峰彇鍐滄埛瀵硅薄
- *
* @param id 鍐滄埛涓婚敭
* @return 鍐滄埛瀵硅薄
*/
@@ -65,10 +72,8 @@
VoClient voClient = SeClientToVoClient.INSTANCT.po2vo(seClient);
return voClient;
}
-
/**
* 澧炲紑鍐滄埛
- *
* @param po
* @return
*/
@@ -77,8 +82,24 @@
}
/**
+ * 娣诲姞楠岃瘉鐮佽褰�
+ * @param po
+ * @return
+ */
+ public Integer addCodeVerify(SeCodeVerify po) {
+ return seCodeVerifyMapper.insert(po);
+ }
+
+ /**
+ * 鏍规嵁鎵嬫満鍙疯幏鍙栭獙璇佺爜楠岃瘉瀵硅薄
+ * @param phoneNumber
+ * @return
+ */
+ public SeCodeVerify getCodeVerify(String phoneNumber) {
+ return seCodeVerifyMapper.getCodeVerify(phoneNumber);
+ }
+ /**
* 鏍规嵁6浣嶅尯鍒掍覆妯＄硦鏌ヨ鍐滄埛缂栧彿
- *
* @param district6
* @return
*/
@@ -88,7 +109,6 @@
/**
* 鏍规嵁鏉戠紪鍙疯幏鍙�5绾у尯鍒掍俊鎭�
- *
* @param villageId 鏉戠紪鍙凤紙涓婚敭锛�
* @return 5绾ц鏀垮尯鍒掍俊鎭�
*/
@@ -105,7 +125,6 @@
/**
* 淇敼鍐滄埛瀵硅薄
- *
* @param po 鍐滄埛瀵硅薄
* @return 淇敼璁板綍鏉℃暟
*/
@@ -115,7 +134,6 @@
/**
* 鏍规嵁涓婚敭鑾峰彇鏉慖D
- *
* @param id
* @return
*/
@@ -125,7 +143,6 @@
/**
* 鑾峰彇铏氭嫙鍗″彿鏈�澶у��
- *
* @return
*/
public Long getMa1xVirtualId() {
@@ -134,7 +151,6 @@
/**
* 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
- *
* @return
*/
public List<Map<String, Object>> getWaterTypes() {
@@ -142,6 +158,25 @@
}
/**
+ * 鏍规嵁鐢佃瘽鍙风爜鑾峰彇鍐滄埛ID
+ * @param phoneNumber
+ * @return
+ */
+ public Long getClientIdByPhone(String phoneNumber) {
+ return seClientMapper.getClientIdByPhone(phoneNumber);
+ }
+
+ /**
+ * 娣诲姞寰俊鐢ㄦ埛璐︽埛璁板綍
+ * @param po
+ * @return
+ */
+ public Long addOpenId(SeOpenId po) {
+ seOpenIdMapper.insert(po);
+ return po.getClientId();
+ }
+
+ /**
* 鏍规嵁閰嶇疆椤硅幏鍙栭厤缃」鍊�
* @param itemName
* @return
--
Gitblit v1.8.0