From 222c8c6e1826b476163fbdd670fad6b7f577665b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 15 十二月 2023 18:03:22 +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 | 80 ++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 43 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 f7d841d..440e774 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,9 +5,14 @@
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.pipIrrSell.activeCardHistory.ActiveCardHistorySv;
+import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
+import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+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;
@@ -44,7 +49,8 @@
public class ActiveCardCtrl {
private final ActiveCardSv activeCardSv;
private final ClientCardSv clientCardSv;
- private final ActiveCardHistorySv activeCardHistorySv;
+
+ private final RechargeCtrl rechargeCtrl;
@Operation(summary = "鑾峰緱涓�椤靛紑鍗¤褰�", description = "杩斿洖涓�椤靛紑鍗℃暟鎹�")
@ApiResponses(value = {
@@ -79,7 +85,7 @@
@PostMapping(path = "add_active", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> add_active(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PO_ActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
+ 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());
@@ -90,8 +96,10 @@
* cardAddr 姘村崱鍦板潃
* clientId 鍐滄埛缂栧彿
* cardCost 鍗＄墖璐圭敤
+ * amount 鍏呭�奸噾棰�
* reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
+ * remarks 澶囨敞
* operator 鎿嶄綔浜虹紪鍙�
* activeTime 寮�鍗℃椂闂�
*/
@@ -99,7 +107,9 @@
String cardAddr = po.getCardAddr();
Long clientId = po.getClientId();
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"));
@@ -111,9 +121,9 @@
clientCard.setCardaddr(cardAddr);
clientCard.setClientid(clientId);
clientCard.setMoney(0.0);
- clientCard.setState((byte) 1);
+ clientCard.setState(CardStateENUM.NORMAL.getCode());
clientCard.setCreatedt(activeTime);
- clientCard.setLastoper((byte) 1);
+ clientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
cardId = Optional.ofNullable(clientCardSv.add(clientCard)).orElse(0L) ;
if(cardId == 0) {
@@ -125,9 +135,11 @@
*/
SeActiveCard activeCard = new SeActiveCard();
activeCard.setCardid(cardId);
+ activeCard.setClientid(clientId);
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
- activeCard.setOperatetype((byte)1);
+ activeCard.setOperatetype(OperateTypeENUM.ACTIVE.getCode());
+ activeCard.setRemarks(remarks);
activeCard.setOperator(operator);
activeCard.setOperatedt(activeTime);
Long rec = Optional.ofNullable(activeCardSv.add(activeCard)).orElse(0L);
@@ -135,19 +147,15 @@
return BaseResponseUtils.buildFail("寮�鍗″け璐�-寮�鍗¤褰曞啓鍏ュ紓甯�");
}
- /**
- * 娣诲姞寮�鍗″巻鍙茶褰�
- */
- SeActiveCardHistory activeCardHistory = new SeActiveCardHistory();
- activeCardHistory.setCardid(cardId);
- activeCardHistory.setCardcost(cardCost);
- activeCardHistory.setPaymentid(paymentId);
- activeCardHistory.setOperatetype((byte)1);
- activeCardHistory.setOperator(operator);
- activeCardHistory.setOperatedt(activeTime);
- Long rec_history = Optional.ofNullable(activeCardHistorySv.add(activeCardHistory)).orElse(0L);
- if(rec_history == 0) {
- return BaseResponseUtils.buildFail("寮�鍗″け璐�-寮�鍗″巻鍙茶褰曞啓鍏ュ紓甯�");
+
+ if(amount != null && amount > 0) {
+ DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po);
+ dtoRecharge.setMoney(0f);
+ dtoRecharge.setGift(0f);
+ BaseResponse<Boolean> job = rechargeCtrl.addRecharge(dtoRecharge);
+ if(!job.getCode().equals("0001")) {
+ return BaseResponseUtils.buildFail("寮�鍗℃垚鍔燂紝浣嗗厖鍊煎け璐�");
+ }
}
return BaseResponseUtils.buildSuccess(true) ;
@@ -165,7 +173,7 @@
@PostMapping(path = "add_reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> add_reissue(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PO_ActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
+ 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());
@@ -174,17 +182,21 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardAddr鍙嶆煡锛�
* cardAddr 姘村崱鍦板潃
+ * clientId 鍐滄埛缂栧彿
* cardCost 鍗＄墖璐圭敤
* reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
+ * remarks 澶囨敞
* operator 鎿嶄綔浜虹紪鍙�
* activeTime 琛ュ崱鏃堕棿
*/
Long cardId = 0L;
String cardAddr = po.getCardAddr();
+ Long clientId = po.getClientId();
Integer cardCost = po.getCardCost();
Double reissueAmount = po.getReissueAmount();
Long paymentId = po.getPaymentId();
+ String remarks = po.getRemarks();
Long operator = po.getOperator();
Date activeTime = new Date();
@@ -204,46 +216,28 @@
SeClientCard seClientCard = new SeClientCard();
seClientCard.setId(cardId);
seClientCard.setReplacedt(activeTime);
- seClientCard.setLastoper((byte)2);
+ seClientCard.setLastoper(LastOperateENUM.REPLACE.getCode());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
return BaseResponseUtils.buildFail("琛ュ崱澶辫触-鍐滄埛鍗′慨鏀瑰紓甯�");
}
/**
- * 鍒犻櫎寮�鍗�/琛ュ崱琛ㄨ鍗＄殑琛ュ崱璁板綍
- */
- Integer rec_deleteActiveCard = Optional.ofNullable(activeCardSv.deleteByIdAndOperateType(cardId, (byte)2)).orElse(0);
- /**
* 娣诲姞琛ュ崱璁板綍
*/
SeActiveCard activeCard = new SeActiveCard();
activeCard.setCardid(cardId);
+ activeCard.setClientid(clientId);
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
activeCard.setReissueamount(reissueAmount);
- activeCard.setOperatetype((byte)2);
+ activeCard.setOperatetype(OperateTypeENUM.REPLACE.getCode());
+ activeCard.setRemarks(remarks);
activeCard.setOperator(operator);
activeCard.setOperatedt(activeTime);
Long rec = Optional.ofNullable(activeCardSv.add(activeCard)).orElse(0L);
if(rec == 0) {
return BaseResponseUtils.buildFail("琛ュ崱澶辫触-琛ュ崱璁板綍鍐欏叆寮傚父");
- }
-
- /**
- * 娣诲姞琛ュ崱鍘嗗彶璁板綍
- */
- SeActiveCardHistory activeCardHistory = new SeActiveCardHistory();
- activeCardHistory.setCardid(cardId);
- activeCardHistory.setCardcost(cardCost);
- activeCardHistory.setPaymentid(paymentId);
- activeCard.setReissueamount(reissueAmount);
- activeCardHistory.setOperatetype((byte)2);
- activeCardHistory.setOperator(operator);
- activeCardHistory.setOperatedt(activeTime);
- Long rec_history = Optional.ofNullable(activeCardHistorySv.add(activeCardHistory)).orElse(0L);
- if(rec_history == 0) {
- return BaseResponseUtils.buildFail("琛ュ崱澶辫触-琛ュ崱鍘嗗彶璁板綍鍐欏叆寮傚父");
}
return BaseResponseUtils.buildSuccess(true) ;
--
Gitblit v1.8.0