Skip to content

Commit ee95aa9

Browse files
authored
Fix/order total coast (#102)
* feat: swagger ๊ธฐ๋Šฅ ์ถ”๊ฐ€ * feat: application-dev h2 -> mysql ๋ณ€๊ฒฝ * feat: Category Enum Add * feat: StoreStatus Enum Add * feat: BaseEntity ์‚ฌ์šฉ์„ ์œ„ํ•ด JpaAuditing ์ถ”๊ฐ€ * feat: Store ์‚ญ์ œ * feat: Store Entity ๊ตฌํ˜„ * feat: Store ํŒจํ‚ค์ง€ ์ด๋™ * feat: application ๊ตฌ๋ถ„ * feat: S3 Presigned URL ๊ธฐ๋Šฅ ์ถ”๊ฐ€ * feat: S3 Config ์ถ”๊ฐ€ * feat: kakao, s3, springdoc ์ถ”๊ฐ€ * feat: kakao ์ถ”๊ฐ€ * feat: h2 -> mysql ๋ณ€๊ฒฝ * feat: kakao api ์‚ฌ์šฉ์„ ์œ„ํ•œ webflux, querydsl, s3 ์˜์กด์„ฑ ์ถ”๊ฐ€ * feat: enum๊ฐ’ ์„ค๋ช… ์ถ”๊ฐ€ * feat: ํŒŒ์ผ ๊ตฌ์กฐ ๋ณ€๊ฒฝ์— ๋”ฐ๋ฅธ ํŒŒ์ผ ์‚ญ์ œ * feat: ์ƒ์ˆ˜ ํด๋ž˜์Šค ๋ถ„๋ฆฌ - ํŽ˜์ด์ง• limit ๊ณ ์ •๊ฐ’ ์ถ”๊ฐ€ * feat: ๊ฒŒ์‹œ๋ฌผ exceptionmessage ์ถ”๊ฐ€ * feat: kakao ์œ„/๊ฒฝ๋„ ๊ฐ’ ๋ฐ›์•„์˜ค๊ธฐ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: menu entity ๋ผˆ๋Œ€ ์ƒ์„ฑ * feat: Querydsl config ์ƒ์„ฑ * feat: StoreImage Entity ์ƒ์„ฑ * feat: Enum ํƒ€์ž… ๊ฒ€์ฆ, member, storeImage Entity ์—ฐ๊ด€ ๋งคํ•‘ * feat: ์ƒ์  ์ƒ์„ฑ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: ์ƒ์  ์ƒ์„ฑ Request Dto ์ƒ์„ฑ * feat: StoreImage Repository ์ƒ์„ฑ * feat: StoreList Query Result Mapper ์ƒ์„ฑ * feat: ๊ฐ€๊ฒŒ ๋ชฉ๋ก Response Dto ์ƒ์„ฑ * feat: ๊ฐ€๊ฒŒ ๋ชฉ๋ก ์ถœ๋ ฅ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: Getter ์ถ”๊ฐ€ * feat: Update ๊ธฐ๋Šฅ ์ถ”๊ฐ€ * feat: s3, kakao api ์ถ”๊ฐ€ * feat: ์˜์†์„ฑ Update ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: ์‚ญ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: ์‚ญ์ œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: ๊ฐ€๊ฒŒ ID์— ํŠน์ • ๊ฐ€๊ฒŒ ๋ฐ์ดํ„ฐ ํ˜ธ์ถœ * feat: Menu Entity ์ƒ์„ฑ * feat: Menu CUD ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: Menu ์ƒ์„ฑ request ์ƒ์„ฑ * feat: Menu ์ˆ˜์ • Request ์ƒ์„ฑ * feat: Menu Query ๊ฒฐ๊ณผ Dto ์ƒ์„ฑ * feat: Menu ๋ฆฌ์ŠคํŠธ Response Dto ์ƒ์„ฑ * feat: Menu Read ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat: Menu Repository ์ƒ์„ฑ * feat: Menu Detail Response Dto ์ƒ์„ฑ * feat: ๊ธฐ์กด QueryDslConfig ์‚ญ์ œ * feat: ๋ฉ”๋‰ด ๋งคํ•‘ * feat: Transactional ์ถ”๊ฐ€ * feat: ๊ฒ€์ฆ ์ฝ”๋“œ ๋ถ„๋ฆฌ * feat: ๊ฐ€๊ฒŒ Detail Response Dto ์ƒ์„ฑ * feat: store ์—ฐ๊ด€๋งคํ•‘ * feat: Transactional ์œ„์น˜ ๋ณ€๊ฒฝ * feat: /src/main/generated/ ignore ์ถ”๊ฐ€ * feat: RedisConfig ์ถ”๊ฐ€ * feat: Redis, Json ํƒ€์ž… ์˜์กด์„ฑ ์ถ”๊ฐ€ * refactor: ์ƒ์  ์ƒ์„ธ ๋‚ด์šฉ Redis Cache ๊ตฌํ˜„ (100ms -> 10ms ์†๋„ ๊ฐœ์„ ) * feat : Cart Entity ์ถ”๊ฐ€ * refactor: ํ• ์ธ ๊ฐ€๊ฒฉ ๊ณ ์ • ๊ฐ’ DB ์ €์žฅ ๋กœ์ง ๋ณ€๊ฒฝ * feat: ์žฅ๋ฐ”๊ตฌ๋‹ˆ Redis ํ™œ์šฉ CRUD ๊ตฌํ˜„ * refactor: ๊ฐ€๊ฒŒ ๋ฉ”๋‰ด ์ตœ๊ณ  ํ• ์ธ์œจ ์ถ”๊ฐ€ * refactor: ๊ฐ€๊ฒŒ ๋ฉ”๋‰ด ์ตœ๊ณ  ํ• ์ธ์œจ ์ถ”๊ฐ€ * refactor: ๊ฐ€๊ฒŒ / ๋ฉ”๋‰ด ์ •๋ ฌ ๊ธฐ์ค€ ์ถ”๊ฐ€ 1. ์˜คํ”ˆํ•œ ๊ฐ€๊ฒŒ ์ƒ๋‹จ ๋…ธ์ถœ 2. ์žฌ๊ณ  ์žˆ๋Š” ๋ฉ”๋‰ด ์ƒ๋‹จ ๋…ธ์ถœ * feat : ๊ธฐ์กด ์žฅ๋ฐ”๊ตฌ๋‹ˆ ํ™•์ธ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat : ๊ธฐ์กด ์žฅ๋ฐ”๊ตฌ๋‹ˆ ํ™•์ธ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feat : ์žฅ๋ฐ”๊ตฌ๋‹ˆ์— ์ด๋ฏธ ์กด์žฌํ•˜๋Š” ๋ฉ”๋‰ด์— ๋Œ€ํ•ด์„œ ์ˆ˜๋Ÿ‰๋งŒ ์ฆ๊ฐ€์‹œํ‚ค๋Š” ๋กœ์ง ๊ตฌํ˜„ * feat : ๋กœ๊ทธ์ธ ์œ ์ € ์ •๋ณด ์—ฐ๋™ * feat : ์œ ์ € ์—ฐ๋™ ์ฃผ์„ ์ œ๊ฑฐ * feat : Cart / CartMenu DB ์ €์žฅ ๋กœ์ง ๊ตฌํ˜„ * feat : Redis Cache ์ž„์‹œ ์ œ๊ฑฐ * refactor : ์žฅ๋ฐ”๊ตฌ๋‹ˆ ํ™•์ธ ๋ฐ˜ํ™˜๊ฐ’ ๋ถ„๋ฆฌ * refactor : ์žฅ๋ฐ”๊ตฌ๋‹ˆ ํ™•์ธ ๋ฐ˜ํ™˜๊ฐ’ ๋ถ„๋ฆฌ * refactor : ๊ฐ€๊ฒŒ ํŒ๋งค์ƒํ’ˆ ์—†์Œ, ์˜์—…์ „ ์ƒํƒœ ํ•ฉ์นจ * refactor : ๊ฐ€๊ฒŒ ๋ฆฌ์ŠคํŠธ ์ถœ๋ ฅ ๋ฌดํ•œ ์Šคํฌ๋กค ์–‘๋ฐฉํ–ฅ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * refactor : ์‹œ์ž‘, ๋งˆ์ง€๋ง‰ Store Id ๋ฐ˜ํ™˜ ์ถ”๊ฐ€ * refactor : ์žฅ๋ฐ”๊ตฌ๋‹ˆ ๋น„์–ด์žˆ์„ ๊ฒฝ์šฐ ๋นˆ ๊ป๋ฐ๊ธฐ ๋ฐ˜ํ™˜ ์ถ”๊ฐ€ * feature : Toss ์ฃผ๋ฌธ / ๊ฒฐ์ œ * fix : Toss sdk ์˜์กด์„ฑ ๋ฌธ์ œ ํ•ด๊ฒฐ * fix : Redis์— ์ €์žฅ๋œ ์žฅ๋ฐ”๊ตฌ๋‹ˆ NUll ์˜ˆ์™ธ์ฒ˜๋ฆฌ * feature : Cart DB ์กฐํšŒ * feature : ์—๋Ÿฌ ๋ฉ”์„ธ์ง€ ์ถ”๊ฐ€ * feature : Controller -> RestController ๊ตฌ์กฐ ๋ณ€๊ฒฝ * feature : ํ•„์š”์—†๋Š” ๊ฐ’ ์‚ญ์ œ * feature : ๊ฒฐ์ œ ์„ฑ๊ณต์‹œ ๋ฐ˜ํ™˜๊ฐ’ DB ์ €์žฅ * refactor : ์žฅ๋ฐ”๊ตฌ๋‹ˆ ๊ฐœ์ˆ˜ ๋ฐ˜ํ™˜ ๋กœ์ง ๋ณ€๊ฒฝ * refactor : ์žฅ๋ฐ”๊ตฌ๋‹ˆ ๊ฐœ์ˆ˜ ๋ฐ˜ํ™˜ ๋กœ์ง ๋ณ€๊ฒฝ * refactor : ์žฅ๋ฐ”๊ตฌ๋‹ˆ ๊ฐœ์ˆ˜ ๋ฐ˜ํ™˜ ๋กœ์ง ๋ณ€๊ฒฝ * feature : ์ฃผ๋ฌธ ๋ฆฌ์ŠคํŠธ ๊ตฌํ˜„์ค‘ * fix : cart.id -> store.id ๋ณ€๊ฒฝ * refactor : ์ฃผ์„ ์ œ๊ฑฐ * refactor : ์ฃผ๋ฌธ ๊ด€๋ จ ๋ถˆํ•„์š”ํ•œ ์ฝ”๋“œ ์‚ญ์ œ ๋ฐ ์ˆ˜์ • * feature : ์ฃผ๋ฌธ ๋‚ด์—ญ ๋ฆฌ์ŠคํŠธ, ์ƒ์„ธ ๋‚ด์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feature : ์ฃผ๋ฌธ ๋‚ด์—ญ ๋ฆฌ์ŠคํŠธ, ์ƒ์„ธ ๋‚ด์šฉ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * fix : ์ฃผ๋ฌธ confirm Rest Api Method ๋ณ€๊ฒฝ, Response ๋ณ€๊ฒฝ * feature : ๊ฐ€๊ฒŒ ์‚ฌ์žฅ ์ฃผ๋ฌธ ๋ชฉ๋ก ๋ฐ ์ฃผ๋ฌธ ์ˆ˜๋ฝ / ์ทจ์†Œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feature : ๊ฐ€๊ฒŒ ์‚ฌ์žฅ ์ฃผ๋ฌธ ๋ชฉ๋ก ๋ฐ ์ฃผ๋ฌธ ์ˆ˜๋ฝ / ์ทจ์†Œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ * feature : ๊ฐ€๊ฒŒ ์ธ์‚ฌ์ดํŠธ ๊ธฐ๋Šฅ ๊ตฌํ˜„ 1. ๋‹น์ผ ์ด ๋งค์ถœ๊ธˆ์•ก 2. ์ตœ๊ทผ 30์ผ ๊ฐ€์žฅ ์ธ๊ธฐ ๋ฉ”๋‰ด ํƒ‘ 3 3. ์ตœ๊ทผ 4๊ฐœ์›” ์›” ๋ณ„ ๋งค์ถœ๊ธˆ์•ก * fix : ๊ฐ€๊ฒŒ ์ธ์‚ฌ์ดํŠธ ๋งค๊ฐœ๋ณ€์ˆ˜ ๊ฐ’ ๋ณ€๊ฒฝ memberId -> storeId ๋ณ€๊ฒฝ * fix : ๊ฐ€๊ฒŒ ์ธ์‚ฌ์ดํŠธ ๋งค๊ฐœ๋ณ€์ˆ˜ ๊ฐ’ ๋ณ€๊ฒฝ memberId -> storeId ๋ณ€๊ฒฝ * fix : ๊ฐ€๊ฒŒ ์˜ค๋” ์ด ๊ฐ€๊ฒฉ ์ˆ˜์ •
1 parent c462819 commit ee95aa9

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

โ€Žsrc/main/java/com/iitp/domains/payment/controller/PaymentController.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public ApiResponse<PaymentResponse> checkout(@PathVariable String sessionId) {
5151
throw new NotFoundException(ExceptionMessage.SESSION_EXPIRED);
5252
}
5353

54-
PaymentResponse response = new PaymentResponse(sessionId, pendingOrder.storeName(), pendingOrder.totalAmount());
54+
PaymentResponse response = new PaymentResponse(sessionId, pendingOrder.storeName(), (int)(pendingOrder.totalAmount() * 0.95));
5555

5656
return ApiResponse.ok(200, response,"๊ฒฐ์ œ ์ •๋ณด ์บ์‹œ ์กฐํšŒ ์„ฑ๊ณต");
5757
}

โ€Žsrc/main/java/com/iitp/domains/payment/controller/PaymentHtmlController.javaโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//
44
//import com.iitp.domains.payment.dto.PendingOrderDto;
55
//import com.iitp.domains.payment.dto.response.PaymentConfirmResponse;
6+
//import com.iitp.domains.payment.dto.response.PaymentResponse;
67
//import com.iitp.domains.payment.service.PaymentService;
78
//import jakarta.servlet.http.HttpServletRequest;
89
//import org.json.simple.JSONObject;
@@ -51,8 +52,7 @@
5152
// // HTML๋กœ ์ „๋‹ฌํ•  ๋ฐ์ดํ„ฐ ์„ค์ •
5253
// model.addAttribute("sessionId", sessionId);
5354
// model.addAttribute("storeName", pendingOrder.storeName());
54-
// model.addAttribute("totalAmount", pendingOrder.totalAmount());
55-
//
55+
// model.addAttribute("totalAmount", (int)(pendingOrder.totalAmount() * 0.95));
5656
// return "/checkout";
5757
// }
5858
//

0 commit comments

Comments
ย (0)