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/client/ClientSv.java | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 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 bb288c0..057c467 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
@@ -2,11 +2,10 @@
import com.dy.common.webUtil.QueryResultVo;
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;
@@ -34,7 +33,7 @@
private BaDistrictMapper baDistrictMapper;
@Autowired
- private SeCodeVerifyMapper seCodeVerifyMapper;
+ private BaSettingsMapper baSettingsMapper;
@Autowired
private SeOpenIdMapper seOpenIdMapper;
@@ -46,8 +45,8 @@
*/
public QueryResultVo<List<VoClient>> getClients(QueryVo queryVo){
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
- Long itemTotal = seClientMapper.getRecordCount(params);
+ Long itemTotal = (long)seClientMapper.getRecordCount(params).size();
QueryResultVo<List<VoClient>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
@@ -74,26 +73,9 @@
* @return
*/
public Integer addClient(SeClient po) {
- return seClientMapper.insert(po);
+ return seClientMapper.insertSelective(po);
}
- /**
- * 娣诲姞楠岃瘉鐮佽褰�
- * @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
@@ -154,6 +136,15 @@
}
/**
+ * 鏍规嵁閰嶇疆椤硅幏鍙栭厤缃」鍊�
+ * @param itemName
+ * @return
+ */
+ public String getItemValue(String itemName) {
+ return baSettingsMapper.getItemValue(itemName);
+ }
+
+ /**
* 鏍规嵁鐢佃瘽鍙风爜鑾峰彇鍐滄埛ID
* @param phoneNumber
* @return
@@ -169,6 +160,7 @@
*/
public Long addOpenId(SeOpenId po) {
seOpenIdMapper.insert(po);
- return po.getClientId();
+ //return po.getClientId();
+ return po.getId();
}
}
--
Gitblit v1.8.0