From 2a9830a14c30bbddc9d8de727b8c0b31b760ebc4 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 27 十二月 2023 11:36:41 +0800 Subject: [PATCH] 2023-12-27 朱宝民 项目编号记录在配置文件中,开卡成功一并返回 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 20 +++++++++++++++++++- pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 6 +++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml index 7e13709..ba0fd4c 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml @@ -110,4 +110,8 @@ project: webPort: 8085 actutorPort: 9085 - idSuffix: 7 \ No newline at end of file + idSuffix: 7 + +projectCode: + ym: 1000 + pj: 1001 \ No newline at end of file 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..1325eac 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 @@ -24,6 +24,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 +49,14 @@ private final ClientCardSv clientCardSv; private final RechargeCtrl rechargeCtrl; + @Value("${projectCode.ym}") + private Integer projectCode; + + /** + * 鑾峰彇寮�鍗¤褰� + * @param vo + * @return + */ @Operation(summary = "鑾峰緱涓�椤靛紑鍗¤褰�", description = "杩斿洖涓�椤靛紑鍗℃暟鎹�") @ApiResponses(value = { @ApiResponse( @@ -70,6 +79,12 @@ } } + /** + * 寮�鍗℃搷浣� + * @param po + * @param bindingResult + * @return + */ @Operation(summary = "寮�鍗�", description = "鏂板紑鍐滄埛鍗�") @ApiResponses(value = { @ApiResponse( @@ -208,7 +223,10 @@ } } - return BaseResponseUtils.buildSuccess(cardNum) ; + Map map = new HashMap(); + map.put("projectCode", projectCode); + map.put("cardNum", cardNum); + return BaseResponseUtils.buildSuccess(map) ; } @Operation(summary = "琛ュ崱", description = "琛ュ崱") -- Gitblit v1.8.0