From bf1754e5968778f906ddbced18b1e26c56a3bdec Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 22 May 2023 12:47:26 +0900 Subject: [PATCH] Merge branch 'master' of http://tolag3@vcs.iten.co.kr:9999/hylee/mjon_api --- .../mjon/api/inqry/mapper/PriceMapper.java | 17 ++++++++-- .../mapper/domain/PriceResponse.java | 2 +- .../mjon/api/inqry/mapper/domain/PriceVO.java | 32 +++++++++++++++++++ .../mjon/api/inqry/service/PriceService.java | 4 ++- .../inqry/service/impl/PriceServiceImpl.java | 10 ++++++ .../inqry/service/mapper/domain/PriceVO.java | 24 -------------- .../api/inqry/web/PriceRestController.java | 26 +++++++++++---- .../mapper/api/inqry/PriceMapper.xml | 13 +++++++- 8 files changed, 91 insertions(+), 37 deletions(-) rename src/main/java/com/itn/mjonApi/mjon/api/inqry/{service => }/mapper/domain/PriceResponse.java (95%) create mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceVO.java delete mode 100644 src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/PriceMapper.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/PriceMapper.java index 0b9f488..0ed2435 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/PriceMapper.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/PriceMapper.java @@ -2,8 +2,10 @@ package com.itn.mjonApi.mjon.api.inqry.mapper; import org.apache.ibatis.annotations.Mapper; +import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO; + /** -* @packageName : com.itn.mjonApi.mjon.api.inqry.service +* @packageName : com.itn.mjonApi.mjon.api.inqry.service.mapper * @fileName : PriceMapper.java * @author : JunHo Lee * @date : 2023.05.15 @@ -15,6 +17,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PriceMapper { - - + + /** + * @methodName : selectUserMoney + * @author : JunHo Lee + * @date : 2023.05.22 + * @description : + * @param priceVO + * @return + */ + double selectUserMoney(PriceVO priceVO); + } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceResponse.java similarity index 95% rename from src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java rename to src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceResponse.java index e86abcb..8424985 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceResponse.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceResponse.java @@ -1,4 +1,4 @@ -package com.itn.mjonApi.mjon.api.inqry.service.mapper.domain; +package com.itn.mjonApi.mjon.api.inqry.mapper.domain; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceVO.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceVO.java new file mode 100644 index 0000000..8fce0a5 --- /dev/null +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/mapper/domain/PriceVO.java @@ -0,0 +1,32 @@ +package com.itn.mjonApi.mjon.api.inqry.mapper.domain; + +import java.io.Serializable; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PriceVO implements Serializable{ + + private static final long serialVersionUID = -7865729705175845268L; + + private String mberId; // 사용자 ID + + private double shortPrice; // 단문 이용단가 + private double longPrice; // 장문 이용단가 + private double picturePrice; // 그림 이용단가 + + private double userMoney; // 잔액 + + private int shortSendPsbltEa; // 단문 발송 가능건 수 + private int longSendPsbltEa; // 장문 발송 가능건 수 + private int pictureSendPsbltEa; // 그림 발송 가능건 수 + +} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java index 5393094..81b6a61 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/PriceService.java @@ -1,5 +1,7 @@ package com.itn.mjonApi.mjon.api.inqry.service; +import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO; + /** * @packageName : com.itn.mjonApi.mjon.api.inqry.service * @fileName : PriceService.java @@ -13,6 +15,6 @@ package com.itn.mjonApi.mjon.api.inqry.service; */ public interface PriceService { - + double selectUserMoney(PriceVO priceVO) throws Exception; } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java index 423af99..ea3b6c9 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/impl/PriceServiceImpl.java @@ -1,7 +1,10 @@ package com.itn.mjonApi.mjon.api.inqry.service.impl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.itn.mjonApi.mjon.api.inqry.mapper.PriceMapper; +import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO; import com.itn.mjonApi.mjon.api.inqry.service.PriceService; /** @@ -17,5 +20,12 @@ import com.itn.mjonApi.mjon.api.inqry.service.PriceService; */ @Service public class PriceServiceImpl implements PriceService { + + @Autowired + PriceMapper priceMapper; + @Override + public double selectUserMoney(PriceVO priceVO) throws Exception { + return priceMapper.selectUserMoney(priceVO); + } } diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java deleted file mode 100644 index a250862..0000000 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/service/mapper/domain/PriceVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.itn.mjonApi.mjon.api.inqry.service.mapper.domain; - -import java.io.Serializable; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class PriceVO implements Serializable{ - - private static final long serialVersionUID = -7865729705175845268L; - - private String mberId; // 사용자 ID - -// private double shortPrice; // 단문 이용단가 -// private double longPrice; // 장문 이용단가 -// private double picturePrice; // 그림 이용단가 - -// private double userMoney; // 잔액 - -// private int sendPsbltEa; //발송 가능건 수 - -} diff --git a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java index e8ddb01..f6006ff 100644 --- a/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java +++ b/src/main/java/com/itn/mjonApi/mjon/api/inqry/web/PriceRestController.java @@ -2,13 +2,15 @@ package com.itn.mjonApi.mjon.api.inqry.web; import java.time.LocalDateTime; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; -import com.itn.mjonApi.cmn.msg.PlainResponse; -import com.itn.mjonApi.mjon.api.inqry.service.mapper.domain.PriceVO; +import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceResponse; +import com.itn.mjonApi.mjon.api.inqry.mapper.domain.PriceVO; +import com.itn.mjonApi.mjon.api.inqry.service.PriceService; import lombok.extern.slf4j.Slf4j; @@ -27,6 +29,9 @@ import lombok.extern.slf4j.Slf4j; @RestController public class PriceRestController { + @Autowired + private PriceService priceService; + /** * @methodName : selectPrice * @author : JunHo Lee @@ -34,19 +39,26 @@ public class PriceRestController { * @return */ @PostMapping("/api/inqry/selectPrice") - public ResponseEntity selectPrice(PriceVO priceVO){ + public ResponseEntity selectPrice(PriceVO priceVO){ + PriceVO resultVO = new PriceVO(); System.out.println(priceVO.getMberId()); //1. 잔액 - - - System.out.println("mac commit test."); + try { +// resultVO.builder() +// .userMoney(priceService.selectUserMoney(priceVO)).b; + resultVO = PriceVO.builder() + .userMoney(priceService.selectUserMoney(priceVO)) + .build(); //2. 이용단가 //3. 발송가능건수 - return ResponseEntity.ok(new PlainResponse(HttpStatus.OK, "test" , LocalDateTime.now(), "")); + } catch (Exception e) { + log.info("selectPrice Error [{}]", e.getMessage()); + } + return ResponseEntity.ok(new PriceResponse(HttpStatus.OK, "test" , LocalDateTime.now(), resultVO.getUserMoney())); } } diff --git a/src/main/resources/mapper/api/inqry/PriceMapper.xml b/src/main/resources/mapper/api/inqry/PriceMapper.xml index b70a728..d358f72 100644 --- a/src/main/resources/mapper/api/inqry/PriceMapper.xml +++ b/src/main/resources/mapper/api/inqry/PriceMapper.xml @@ -3,6 +3,17 @@ - + + + \ No newline at end of file