From b65cbfb8452a95575f0dc637b55ed49f058597fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 20 八月 2024 21:02:21 +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/cardOperate/CardOperateSv.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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 84cc589..3a4ac3c 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
@@ -7,12 +7,10 @@
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;
-import com.dy.pipIrrGlobal.daoSe.SeGeneralMapper;
+import com.dy.pipIrrGlobal.daoSe.*;
import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+import com.dy.pipIrrGlobal.pojoSe.SeManagerCard;
import com.dy.pipIrrGlobal.voSe.*;
import com.dy.pipIrrSell.cardOperate.dto.DtoRecharge;
import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
@@ -23,6 +21,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
@@ -56,6 +55,11 @@
@Autowired
private BaSettingsMapper baSettingsMapper;
+ @Autowired
+ private SeManagerCardMapper seManagerCardMapper;
+
+ @Value("${project.projectNo}")
+ private Integer projectNo;
/**
* 娣诲姞寮�鍗¤褰�
@@ -88,13 +92,33 @@
public Long getAreaCodeById(Long clientId) {
return seClientMapper.getAreaCodeById(clientId);
}
+
/**
* 鏍规嵁琛屾斂鍖哄垝涓叉ā鍧楁煡璇㈡按鍗＄紪鍙凤紝寮�鍗′娇鐢�
* @param areaCode
* @return
*/
- String getCardNumOfMax(String areaCode) {
+ public String getCardNumOfMax(String areaCode) {
return seClientCardMapper.getCardNumOfMax(areaCode);
+ }
+
+ /**
+ * 鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈢鐞嗗崱缂栧彿锛屽垱寤虹鐞嗗崱浣跨敤
+ * @param areaCode
+ * @return
+ */
+ public String getManagerCardNumOfMax(String areaCode) {
+ return seManagerCardMapper.getManagerCardNumOfMax(areaCode);
+ }
+
+ /**
+ * 鍒涘缓绠＄悊鍗�
+ * @param po
+ * @return
+ */
+ public Long addManagerCard(SeManagerCard po) {
+ seManagerCardMapper.insert(po);
+ return po.getId();
}
/**
@@ -204,7 +228,8 @@
}
Map map_response = new HashMap();
- map_response.put("projectNo", String.format("%02x", Integer.parseInt(getProjectNo())));
+// map_response.put("projectNo", String.format("%02x", Integer.parseInt(getProjectNo())));
+ map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map_response) ;
--
Gitblit v1.8.0