From a28d7698632c77a3895efcf7a9fd71cfc99a0f2d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 28 六月 2024 14:12:19 +0800
Subject: [PATCH] 修改地区管理中获取三级行政区划接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 49ddfe9..d9f02e0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -6,6 +6,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
@@ -52,6 +53,9 @@
@Autowired
private SeGeneralMapper seGeneralMapper;
+ @Autowired
+ private BaSettingsMapper baSettingsMapper;
+
/**
* 娣诲姞寮�鍗¤褰�
@@ -68,8 +72,12 @@
* @param clientNum 鍐滄埛缂栧彿
* @return 5绾ц鏀垮尯鍒掍唬鐮�
*/
- public Long getAreaCodeByNum(String clientNum) {
- return seClientMapper.getAreaCodeByNum(clientNum);
+ public String getAreaCodeByNum(String clientNum) {
+ Long areaCode = seClientMapper.getAreaCodeByNum(clientNum);
+ if (areaCode == null) {
+ return "";
+ }
+ return String.valueOf(areaCode);
}
/**
@@ -131,7 +139,7 @@
*/
Long cardId = 0L;
Long clientId = 0L;
- String cardNum = po.getCardNum();
+ Long cardNum = po.getCardNum();
Float money = po.getMoney();
Float amount = po.getAmount();
Float gift = po.getGift();
@@ -144,7 +152,7 @@
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
- String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse("");
+ String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
@@ -198,7 +206,6 @@
return BaseResponseUtils.buildSuccess(true) ;
}
-
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�
@@ -416,4 +423,34 @@
return map_result;
}
+
+ /**
+ * 鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰�
+ * @param cardNum 姘村崱缂栧彿
+ * @return 鏄惁宸叉寕澶辨湭琛ュ崱
+ */
+ public Boolean isLostAndUnreplaced(Long cardNum) {
+ Integer rec = seClientCardMapper.isLostAndUnreplaced(cardNum);
+ if(rec != null && rec > 0) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 淇敼鍐滄埛姘村崱
+ * @param po
+ * @return
+ */
+ public Integer updateClientCard(SeClientCard po) {
+ return seClientCardMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 鑾峰彇椤圭洰缂栧彿
+ * @return
+ */
+ public String getProjectNo() {
+ return baSettingsMapper.getItemValue("projectNo");
+ }
}
--
Gitblit v1.8.0