From cf25cda454a645ea47ce6135184c3df6afd09ddc Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 20 一月 2024 10:40:41 +0800
Subject: [PATCH] 2024-01-20 朱宝民 删除不存在用户提示信息，用户名字段改名，Long型字段转字符串
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 270 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 226 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
index 592df3a..94f9336 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java
@@ -193,75 +193,79 @@
@PostMapping(path = "reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_reissue(@RequestBody @Valid com.dy.pipIrrSell.activeCard.DtoActiveCard po, BindingResult bindingResult){
+ public BaseResponse<Boolean> add_reissue(@RequestBody @Valid DtoReissue po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
/**
- * cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾洿鏂版按鍗¤〃鐢級
- * cardNum 姘村崱缂栧彿
- * clientId 鍐滄埛ID锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犺ˉ鍗′娇鐢級
+ * cardAddr 鏂扮殑姘村崱鍦板潃锛堜粎浠呭啓鍏ワ紝鏃犱笟鍔★級
+ * clientNum 鍐滄埛缂栧彿锛屽紑鏂板崱浣跨敤锛岄�氳繃鑰佸崱鍙疯幏鍙�
+ * cardNum 姘村崱缂栧彿锛屼紶鍏ョ殑鏄�佸崱鍙凤紝杩斿洖鐨勬槸鏂板崱鍙�
+ * moeny 浣欓锛屾寕澶辨椂浣跨敤
* cardCost 鍗＄墖璐圭敤
- * reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
* remarks 澶囨敞
* operator 鎿嶄綔浜虹紪鍙�
- * activeTime 琛ュ崱鏃堕棿
*/
- Long cardId = 0L;
- Long clientId = 0L;
+
+ String cardAddr = po.getCardAddr();
+ String clientNum = "";
String cardNum = po.getCardNum();
+ Float money = po.getMoney();
Integer cardCost = po.getCardCost();
- Float reissueAmount = po.getReissueAmount();
Long paymentId = po.getPaymentId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
- Date reissueTime = new Date();
/**
* 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
if(map == null || map.size() <= 0) {
- return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_ERROR.getMessage());
+ return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
- cardId = Long.parseLong(map.get("cardId").toString());
- clientId = Long.parseLong(map.get("clientId").toString());
+ clientNum = map.get("clientNum").toString();
/**
- * 淇敼鍐滄埛鍗′俊鎭細
- * 琛ュ崱鏃堕棿
- * 鏈�鍚庢搷浣滅被鍨�-2
+ * 娣诲姞鎸傚け璁板綍
*/
- SeClientCard seClientCard = new SeClientCard();
- seClientCard.setId(cardId);
- seClientCard.setReplacedt(reissueTime);
- seClientCard.setLastoper(LastOperateENUM.REPLACE.getCode());
- Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
- if(rec_updateClientCard == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
- }
+ DtoLoss dtoLoss = new DtoLoss();
+ dtoLoss.setCardNum(cardNum);
+ dtoLoss.setMoney(money);
+ dtoLoss.setRefund(0f);
+ dtoLoss.setRemarks(remarks);
+ dtoLoss.setOperator(operator);
+ BaseResponse<java.lang.Boolean> baseResponse_addLoss = this.add_loss(dtoLoss, null);
- /**
- * 娣诲姞琛ュ崱璁板綍
- */
- SeCardOperate seCardOperate = new SeCardOperate();
- seCardOperate.setCardId(cardId);
- seCardOperate.setClientId(clientId);
- seCardOperate.setCardCost(cardCost);
- seCardOperate.setPaymentId(paymentId);
- seCardOperate.setNoTradeAmount(reissueAmount);
- seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
- seCardOperate.setRemarks(remarks);
- seCardOperate.setOperator(operator);
- seCardOperate.setOperateDt(reissueTime);
- Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
- if(rec == 0) {
+ if(!baseResponse_addLoss.getCode().equals("0001")) {
return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ /**
+ * 娣诲姞寮�鍗¤褰�
+ */
+ DtoActiveCard dtoActiveCard = new DtoActiveCard();
+ dtoActiveCard.setCardAddr(cardAddr);
+ dtoActiveCard.setClientNum(clientNum);
+ dtoActiveCard.setCardCost(cardCost);
+ dtoActiveCard.setAmount(0f);
+ dtoActiveCard.setPaymentId(paymentId);
+ dtoActiveCard.setRemarks(remarks);
+ dtoActiveCard.setOperator(operator);
+ BaseResponse<java.lang.Boolean> baseResponse_addActive = add_active(dtoActiveCard, null);
+
+ if(!baseResponse_addActive.getCode().equals("0001")) {
+ return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
+ }
+
+ String theContent = String.valueOf(baseResponse_addActive.getContent());
+ cardNum = theContent.substring(theContent.indexOf("=") + 1, theContent.indexOf(","));
+
+ Map map_response = new HashMap();
+ map_response.put("projectCode", Constant.projectCode_ym);
+ map_response.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map_response) ;
}
/**
@@ -282,7 +286,7 @@
@PostMapping(path = "recharge", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
+ public BaseResponse<Boolean> add_recharge(@RequestBody @Valid DtoRecharge po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -307,7 +311,7 @@
@PostMapping(path = "cancel", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid DtoCancel po, BindingResult bindingResult){
+ public BaseResponse<Boolean> add_cancel(@RequestBody @Valid DtoCancel po, 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());
@@ -396,7 +400,7 @@
@PostMapping(path = "loss", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
+ public BaseResponse<Boolean> add_loss(@RequestBody @Valid DtoLoss po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -466,6 +470,12 @@
return BaseResponseUtils.buildSuccess(true) ;
}
+ /**
+ * 鍐叉
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "娣诲姞鍐叉璁板綍", description = "娣诲姞鍐叉璁板綍")
@ApiResponses(value = {
@ApiResponse(
@@ -478,7 +488,7 @@
@PostMapping(path = "reversal", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid DtoReversal po, BindingResult bindingResult){
+ public BaseResponse<Boolean> add_reversal(@RequestBody @Valid DtoReversal po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -547,4 +557,176 @@
return BaseResponseUtils.buildSuccess(true) ;
}
+ /**
+ * 琛ユ墸
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @Operation(summary = "琛ユ墸", description = "琛ユ墸")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "refund", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> add_refund(@RequestBody @Valid DtoRefund po, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ /**
+ * cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
+ * cardNum 姘村崱缂栧彿
+ * money 鍗＄墖浣欓
+ * refund 琛ユ墸浣欓
+ * remarks 澶囨敞
+ * operator 鎿嶄綔浜虹紪鍙�
+ * refundTime 琛ユ墸鏃堕棿
+ */
+ Long cardId = 0L;
+ Long clientId = 0L;
+ String cardNum = po.getCardNum();
+ Float money = po.getMoney();
+ Float refund = po.getRefund();
+ String remarks = po.getRemarks();
+ Long operator = po.getOperator();
+ Date refundTime = new Date();
+
+ /**
+ * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
+ */
+ Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
+ if(map == null || map.size() <= 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
+ }
+ cardId = Long.parseLong(map.get("cardId").toString());
+ clientId = Long.parseLong(map.get("clientId").toString());
+
+ /**
+ * 淇敼鍐滄埛鍗′俊鎭細
+ * 鎸傚け鏃堕棿
+ * 鏈�鍚庢搷浣滅被鍨�-4
+ */
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setId(cardId);
+ seClientCard.setRefunddt(refundTime);
+ seClientCard.setMoney(money + refund);
+ seClientCard.setLastoper(LastOperateENUM.REFUND.getCode());
+ Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
+ if(rec_updateClientCard == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
+ }
+
+ /**
+ * 娣诲姞琛ユ墸璁板綍
+ */
+ SeCardOperate seCardOperate = new SeCardOperate();
+ seCardOperate.setCardId(cardId);
+ seCardOperate.setClientId(clientId);
+ seCardOperate.setMoney(money);
+ seCardOperate.setNoTradeAmount(refund);
+ seCardOperate.setOperateType(OperateTypeENUM.REFUND.getCode());
+ seCardOperate.setRemarks(remarks);
+ seCardOperate.setOperator(operator);
+ seCardOperate.setOperateDt(refundTime);
+ Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.REFUND_FAIL_WRITE_REFUND_ERROR.getMessage());
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 瑙ｉ攣
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @Operation(summary = "娣诲姞瑙ｉ攣璁板綍", description = "娣诲姞瑙ｉ攣璁板綍")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "unlock", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> add_unlock(@RequestBody @Valid DtoUnlock po, 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鍙嶆煡锛屼慨鏀瑰啘鎴峰崱浣跨敤锛�
+ * clientId 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛�
+ * cardNum 姘村崱鍦板潃
+ * money 浣欓
+ * remarks 澶囨敞
+ * operator 鎿嶄綔浜虹紪鍙�
+ * unlockTime 瑙ｉ攣鏃堕棿
+ */
+ Long cardId = 0L;
+ Long clientId = 0L;
+ String cardNum = po.getCardNum();
+ Float money = po.getMoney();
+ String remarks = po.getRemarks();
+ Long operator = po.getOperator();
+ Date unlockTime = new Date();
+
+ /**
+ * 渚濇嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
+ */
+ Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
+ if(map == null || map.size() <= 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
+ }
+ cardId = Long.parseLong(map.get("cardId").toString());
+ clientId = Long.parseLong(map.get("clientId").toString());
+
+ /**
+ * 淇敼鍐滄埛鍗′俊鎭細
+ * 鎸傚け鏃堕棿
+ * 鏈�鍚庢搷浣滅被鍨�-4
+ */
+ SeClientCard seClientCard = new SeClientCard();
+ seClientCard.setId(cardId);
+ seClientCard.setUnlockdt(unlockTime);
+ seClientCard.setMoney(money);
+ seClientCard.setState(CardStateENUM.NORMAL.getCode());
+ seClientCard.setLastoper(LastOperateENUM.UNLOCK.getCode());
+ Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
+ if(rec_updateClientCard == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.UNLOCK_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
+ }
+
+ /**
+ * 娣诲姞瑙ｉ攣璁板綍
+ */
+ SeCardOperate seCardOperate = new SeCardOperate();
+ seCardOperate.setCardId(cardId);
+ seCardOperate.setClientId(clientId);
+ seCardOperate.setMoney(money);
+ seCardOperate.setOperateType(OperateTypeENUM.UNLOCK.getCode());
+ seCardOperate.setRemarks(remarks);
+ seCardOperate.setOperator(operator);
+ seCardOperate.setOperateDt(unlockTime);
+ Long rec = Optional.ofNullable(cardOperateSv.add(seCardOperate)).orElse(0L);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.UNLOCK_FAIL_WRITE_UNLOCK_ERROR.getMessage());
+ }
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
}
--
Gitblit v1.8.0