From 6eab5ecc0a1cf8bcf1ee999457104e2281e767d2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:40 +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/ActiveCardCtrl.java | 142 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 103 insertions(+), 39 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index 67fb839..aec2f6d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -5,11 +5,15 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoSe.*;
+import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
+import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+import com.dy.pipIrrGlobal.voBa.VoAreaCode;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
+import com.dy.pipIrrSell.recharge.DtoRecharge;
+import com.dy.pipIrrSell.recharge.RechargeCtrl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -25,11 +29,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -46,6 +46,8 @@
public class ActiveCardCtrl {
private final ActiveCardSv activeCardSv;
private final ClientCardSv clientCardSv;
+
+ private final RechargeCtrl rechargeCtrl;
@Operation(summary = "鑾峰緱涓�椤靛紑鍗¤褰�", description = "杩斿洖涓�椤靛紑鍗℃暟鎹�")
@ApiResponses(value = {
@@ -81,44 +83,85 @@
@Transactional(rollbackFor = Exception.class)
@SsoAop("-1")//@SsoAop(power = "-1")
public BaseResponse<Boolean> add_active(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
+ * 鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode
+ * provinceId 鐪佺骇鍖哄垝浠ｇ爜
+ * cityId 甯傜骇鍖哄垝浠ｇ爜
+ * countryId 鍘跨骇鍖哄垝浠ｇ爜
+ * townId 闀囩骇鍖哄垝浠ｇ爜
+ * villageId 鏉戠骇鍖哄垝浠ｇ爜
+ */
+ VoAreaCode voAreaCode = activeCardSv.getAreaCodeByNum(po.getClientNum());
+ if(voAreaCode == null) {
+ return BaseResponseUtils.buildFail("璇ュ啘鎴疯鏀垮尯鍒掑紓甯革紝璇疯仈绯荤郴缁熺鐞嗗憳");
+ }
+ String provinceId = voAreaCode.getProvinceId();
+ String cityId = voAreaCode.getCityId();
+ String countryId = voAreaCode.getCountryId();
+ String townId = voAreaCode.getTownId();
+ String villageId = voAreaCode.getVillageId();
+ String areaCode = provinceId + cityId + countryId + townId + villageId;
+
+ /**
+ * 鏍规嵁琛屾斂鍖哄垝涓诧紙areaCode锛夊湪姘村崱琛ㄤ腑閽堝姘村崱缂栧彿锛坈ardNum锛夎繘琛屾ā绯婃煡璇�
+ * 濡傛灉4浣嶉『搴忓彿宸茬粡杈惧埌鏈�澶у�硷紝鎻愮ず鐢ㄦ埛鑱旂郴绯荤粺绠＄悊鍛�
+ * 濡傛灉4浣嶉『搴忓彿鏈揪鍒版渶澶у�硷紝鍒欏姞1
+ * cardNum涓烘柊鐨勫崱鍙�
+ */
+ String cardNum = Optional.ofNullable(activeCardSv.getCardNumOfMax(areaCode)).orElse("");
+ if(cardNum != null && cardNum.trim().length() > 0) {
+ Integer number = Integer.parseInt(cardNum.substring(12));
+ number = number + 1;
+ if(number > 9999) {
+ return BaseResponseUtils.buildFail("姘村崱缂栧彿宸叉弧锛岃鑱旂郴绯荤粺绠＄悊鍛�");
+ }
+ cardNum = cardNum.substring(0, 12) + String.format("%04d", number);
+ } else {
+ cardNum = areaCode + "0001";
+ }
+
+
+ /**
* cardId 姘村崱缂栧彿锛堟彃鍏ヨ褰曞悗鐢熸垚锛�
- * cardAddr 姘村崱鍦板潃
- * clientId 鍐滄埛缂栧彿
+ * cardAddr 姘村崱鍦板潃锛堜粎浠呭啓鍏ワ紝鏃犱笟鍔★級
+ * clientNum 鍐滄埛缂栧彿
* cardCost 鍗＄墖璐圭敤
+ * amount 鍏呭�奸噾棰�
* reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
* remarks 澶囨敞
* operator 鎿嶄綔浜虹紪鍙�
* activeTime 寮�鍗℃椂闂�
*/
- Long cardId = 0L;
+ //Long cardId = 0L;
String cardAddr = po.getCardAddr();
- Long clientId = po.getClientId();
+ //Long clientId = po.getClientId();
+ String clientNum = po.getClientNum();
Integer cardCost = po.getCardCost();
+ Float amount = po.getAmount();
Long paymentId = po.getPaymentId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
- Date activeTime = new Date();
- //LocalDateTime activeTime = LocalDateTime.parse(dtf.format(LocalDateTime.now()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ Date createTime = new Date();
/**
* 娣诲姞鍐滄埛鍗¤褰�
*/
- SeClientCard clientCard = new SeClientCard();
- clientCard.setCardaddr(cardAddr);
- clientCard.setClientid(clientId);
- clientCard.setMoney(0.0);
- clientCard.setState(CardStateENUM.NORMAL.getCode());
- clientCard.setCreatedt(activeTime);
- clientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setCardaddr(cardAddr);
+ //seClientCard.setClientid(clientId);
+ seClientCard.setCardnum(cardNum);
+ seClientCard.setClientnum(clientNum);
+ seClientCard.setMoney(0.0);
+ seClientCard.setState(CardStateENUM.NORMAL.getCode());
+ seClientCard.setCreatedt(createTime);
+ seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
- cardId = Optional.ofNullable(clientCardSv.add(clientCard)).orElse(0L) ;
+ Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
if(cardId == 0) {
return BaseResponseUtils.buildFail("寮�鍗″け璐�-鍐滄埛鍗″啓鍏ュ紓甯�");
}
@@ -127,20 +170,37 @@
* 娣诲姞寮�鍗¤褰�
*/
SeActiveCard activeCard = new SeActiveCard();
- activeCard.setCardid(cardId);
- activeCard.setClientid(clientId);
+ activeCard.setCardnum(cardNum);
+ activeCard.setClientnum(clientNum);
+ //activeCard.setCardid(cardId);
+ //activeCard.setClientid(clientId);
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
activeCard.setOperatetype(OperateTypeENUM.ACTIVE.getCode());
activeCard.setRemarks(remarks);
activeCard.setOperator(operator);
- activeCard.setOperatedt(activeTime);
+ activeCard.setOperatedt(createTime);
Long rec = Optional.ofNullable(activeCardSv.add(activeCard)).orElse(0L);
if(rec == 0) {
return BaseResponseUtils.buildFail("寮�鍗″け璐�-寮�鍗¤褰曞啓鍏ュ紓甯�");
}
- return BaseResponseUtils.buildSuccess(true) ;
+ /**
+ * 濡傛灉鎿嶄綔浜哄憳寮�鍗℃椂杈撳叆浜嗗厖鍊奸噾棰濓紝鍒欏紑鍗″悗璋冪敤鍏呭�煎姛鑳�
+ */
+ po.setCardNum(cardNum);
+ if(amount != null && amount > 0) {
+ DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po);
+ dtoRecharge.setMoney(0f);
+ dtoRecharge.setGift(0f);
+ dtoRecharge.setPrice(0f);
+ BaseResponse<Boolean> job = rechargeCtrl.addRecharge(dtoRecharge);
+ if(!job.getCode().equals("0001")) {
+ return BaseResponseUtils.buildFail("寮�鍗℃垚鍔燂紝浣嗗厖鍊煎け璐�");
+ }
+ }
+
+ return BaseResponseUtils.buildSuccess(cardNum) ;
}
@Operation(summary = "琛ュ崱", description = "琛ュ崱")
@@ -156,15 +216,14 @@
@Transactional(rollbackFor = Exception.class)
@SsoAop("-1")//@SsoAop(power = "-1")
public BaseResponse<Boolean> add_reissue(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
- * cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛�
- * cardAddr 姘村崱鍦板潃
- * clientId 鍐滄埛缂栧彿
+ * cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾洿鏂版按鍗¤〃鐢級
+ * cardNum 姘村崱缂栧彿
+ * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犺ˉ鍗′娇鐢級
* cardCost 鍗＄墖璐圭敤
* reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
@@ -173,22 +232,25 @@
* activeTime 琛ュ崱鏃堕棿
*/
Long cardId = 0L;
- String cardAddr = po.getCardAddr();
- Long clientId = po.getClientId();
+ String cardNum = po.getCardNum();
+ //String clientNum = po.getClientNum();
+ String clientNum = "";
Integer cardCost = po.getCardCost();
Double reissueAmount = po.getReissueAmount();
Long paymentId = po.getPaymentId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
- Date activeTime = new Date();
+ Date replaceTime = new Date();
/**
- * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛堜富閿級
+ * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
- cardId = Optional.ofNullable(clientCardSv.getCardIdByAddr(cardAddr)).orElse(0L);
- if(cardId == 0) {
+ Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
+ if(map == null || map.size() <= 0) {
return BaseResponseUtils.buildFail("鍗″彿閿欒锛岃鍗′笉瀛樺湪");
}
+ cardId = Long.parseLong(map.get("cardId").toString());
+ clientNum = map.get("clientNum").toString();
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -197,7 +259,7 @@
*/
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
- seClientCard.setReplacedt(activeTime);
+ seClientCard.setReplacedt(replaceTime);
seClientCard.setLastoper(LastOperateENUM.REPLACE.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
@@ -208,15 +270,17 @@
* 娣诲姞琛ュ崱璁板綍
*/
SeActiveCard activeCard = new SeActiveCard();
- activeCard.setCardid(cardId);
- activeCard.setClientid(clientId);
+ activeCard.setCardnum(cardNum);
+ activeCard.setClientnum(clientNum);
+ //activeCard.setCardid(cardId);
+ //activeCard.setClientid(clientId);
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
activeCard.setReissueamount(reissueAmount);
activeCard.setOperatetype(OperateTypeENUM.REPLACE.getCode());
activeCard.setRemarks(remarks);
activeCard.setOperator(operator);
- activeCard.setOperatedt(activeTime);
+ activeCard.setOperatedt(replaceTime);
Long rec = Optional.ofNullable(activeCardSv.add(activeCard)).orElse(0L);
if(rec == 0) {
return BaseResponseUtils.buildFail("琛ュ崱澶辫触-琛ュ崱璁板綍鍐欏叆寮傚父");
--
Gitblit v1.8.0