From c09ec15d95eda912a38b8f22a71aadd3b7fb52fa Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 15 一月 2024 15:28:47 +0800
Subject: [PATCH] 2024-01-15 朱宝民 优化获取角色列表接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 9fc0d4f..99e7eae 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
@@ -15,7 +15,6 @@
import com.dy.pipIrrSell.recharge.RechargeCtrl;
import com.dy.pipIrrSell.result.SellResultCode;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -24,6 +23,7 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -48,6 +48,14 @@
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
+ @Value("${projectCode.ym}")
+ private Integer projectCode;
+
+ /**
+ * 鑾峰彇寮�鍗¤褰�
+ * @param vo
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�椤靛紑鍗¤褰�", description = "杩斿洖涓�椤靛紑鍗℃暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -57,7 +65,6 @@
schema = @Schema(implementation = VoActiveCard.class))}
)
})
- //@GetMapping(path = "/getActiveCards", consumes = MediaType.APPLICATION_JSON_VALUE)
@GetMapping(path = "/getActiveCards")
@SsoAop()
public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QueryVo vo){
@@ -70,6 +77,12 @@
}
}
+ /**
+ * 寮�鍗℃搷浣�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "寮�鍗�", description = "鏂板紑鍐滄埛鍗�")
@ApiResponses(value = {
@ApiResponse(
@@ -82,7 +95,7 @@
@PostMapping(path = "add_active", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_active(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add_active(@RequestBody @Valid DtoActiveCard po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -162,7 +175,7 @@
seClientCard.setCardnum(cardNum);
//seClientCard.setClientnum(clientNum);
seClientCard.setClientid(clientId);
- seClientCard.setMoney(0.0);
+ seClientCard.setMoney(0f);
seClientCard.setState(CardStateENUM.NORMAL.getCode());
seClientCard.setCreatedt(createTime);
seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
@@ -208,7 +221,10 @@
}
}
- return BaseResponseUtils.buildSuccess(cardNum) ;
+ Map map = new HashMap();
+ map.put("projectCode", projectCode);
+ map.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map) ;
}
@Operation(summary = "琛ュ崱", description = "琛ュ崱")
@@ -223,7 +239,7 @@
@PostMapping(path = "add_reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add_reissue(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add_reissue(@RequestBody @Valid DtoActiveCard po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
--
Gitblit v1.8.0