Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update main #257

Merged
merged 143 commits into from
Dec 22, 2024
Merged
Changes from 3 commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
98e10ed
메인페이지 -> 대시보드사용법, 회사소개, 상담하기 연결 완료 .jsp
Dec 13, 2024
da5fc78
변경
Dec 16, 2024
470c635
d
mingming-01 Dec 16, 2024
b7076fb
Category list/regist
mingming-01 Dec 16, 2024
1af0d37
Merge pull request #164 from in27sung/stock_04
mingming-01 Dec 16, 2024
42d0d13
스캔
shoqying Dec 16, 2024
2685409
update dashboard
Dec 16, 2024
98fa57e
Update pom.xml
in27sung Dec 16, 2024
c0bab17
Merge branch 'develop' into receivingscan3
in27sung Dec 16, 2024
e934abe
Merge pull request #165 from in27sung/receivingscan3
shoqying Dec 16, 2024
52bb908
Merge branch 'develop' into dashboard_03
in27sung Dec 16, 2024
86bd1a5
Update stock/register
in27sung Dec 16, 2024
e5f7f1d
Merge pull request #166 from in27sung/dashboard_03
BowWowBow Dec 16, 2024
ab79d96
Merge branch 'develop' into stock_05
in27sung Dec 16, 2024
84f6f8a
Merge pull request #167 from in27sung/stock_05
in27sung Dec 16, 2024
ab4869d
update develop
in27sung Dec 16, 2024
8bc7f7c
Debuging User
in27sung Dec 16, 2024
dbf19bc
Update userMapper
in27sung Dec 16, 2024
fc00541
Update main
in27sung Dec 17, 2024
74b0b2d
order 마무리 밑 admin 작업할려다가 중단
freehyeon Dec 17, 2024
7a0cf0e
Merge branch 'develop' into orderlist
in27sung Dec 17, 2024
d9b89f1
Merge pull request #170 from in27sung/orderlist
freehyeon Dec 17, 2024
8ccfb88
productVo 변경에 따른 order mapper 및 jsp수정
freehyeon Dec 17, 2024
ed65298
Merge pull request #174 from in27sung/order_modify_hyeon
freehyeon Dec 17, 2024
68a40e9
메인페이지 수정
BowWowBow Dec 17, 2024
b9561e6
Update Stock
in27sung Dec 17, 2024
d6c6c68
admin 파트 수정으로 인한 커밋
freehyeon Dec 17, 2024
5a29360
Merge pull request #176 from in27sung/dash-04
in27sung Dec 17, 2024
dce96f5
Merge pull request #178 from in27sung/admin_hyeon
freehyeon Dec 17, 2024
0be35ad
123
shoqying Dec 17, 2024
2c202a6
Merge branch 'develop' into shipment1
shoqying Dec 17, 2024
76cda97
Merge pull request #179 from in27sung/shipment1
shoqying Dec 17, 2024
615b40f
Merge branch 'develop' into stock_02-1
in27sung Dec 17, 2024
5784c41
Merge pull request #177 from in27sung/stock_02-1
in27sung Dec 17, 2024
8643a86
Update QRCode
in27sung Dec 17, 2024
2fb91aa
매퍼 수정
shoqying Dec 17, 2024
fb529ed
Receiving & Shipment Service 제어관련 수정
freehyeon Dec 17, 2024
40b5bfe
Merge pull request #183 from in27sung/shipment3
shoqying Dec 18, 2024
09435db
Merge branch 'develop' into receivinghelp
freehyeon Dec 18, 2024
29c4149
Merge pull request #184 from in27sung/receivinghelp
freehyeon Dec 18, 2024
151697c
Update admin/ Update register.jsp(css 보류)
in27sung Dec 18, 2024
28aedca
Merge branch 'develop' of https://github.com/in27sung/stock-mate.git …
in27sung Dec 18, 2024
949000f
update AdminController
in27sung Dec 18, 2024
50ea49e
수주, 발주 가용재고 관련 코드 수정 및 추가
freehyeon Dec 18, 2024
edb0ccf
update main
yeeezin Dec 18, 2024
e702c50
Merge pull request #195 from in27sung/main_06
yeeezin Dec 18, 2024
ac1b02e
Merge branch 'develop' into ordermodify
freehyeon Dec 18, 2024
0981927
Merge pull request #190 from in27sung/ordermodify
freehyeon Dec 18, 2024
e94d1f1
뭐지
freehyeon Dec 18, 2024
540d602
Merge branch 'develop' into ordermodify2
freehyeon Dec 18, 2024
82ff4dd
Merge pull request #198 from in27sung/ordermodify2
freehyeon Dec 18, 2024
836b02e
대시보드에서 내정보 수정 동작에서 에러가 있어 수정해봤습니다.
mingming-01 Dec 18, 2024
c5dcda0
Merge pull request #201 from in27sung/user_editinfo2
mingming-01 Dec 18, 2024
c2059e1
orderservice 와 Receiving 간의 프로세스를 분기해서 새로 만듬.
freehyeon Dec 18, 2024
23c532d
Merge pull request #203 from in27sung/ordertr_hyeon
freehyeon Dec 18, 2024
dacec94
임시 테스트
shoqying Dec 18, 2024
5427de6
Merge branch 'develop' into shipment4
shoqying Dec 18, 2024
a661853
Merge pull request #205 from in27sung/shipment4
shoqying Dec 18, 2024
c433e52
메인페이지 추가 및 회원가입 변경
BowWowBow Dec 18, 2024
ee7271d
debuging AdminInterceptor
in27sung Dec 18, 2024
b7e9567
Transactional 문제 수정
freehyeon Dec 19, 2024
cce0d0d
Merge branch 'develop' into main_10
in27sung Dec 19, 2024
08b3374
Merge branch 'develop' into transactional_modify
in27sung Dec 19, 2024
a535bf4
Merge pull request #208 from in27sung/transactional_modify
freehyeon Dec 19, 2024
4b718ef
메인변경
BowWowBow Dec 19, 2024
38772b4
1.order JSP totalcount 표기 수정
freehyeon Dec 19, 2024
ed92cb6
Complete adminApprove, processing managerApprove
in27sung Dec 19, 2024
e8deaeb
Merge pull request #213 from in27sung/order_modify_totalcount
freehyeon Dec 19, 2024
8f7e97d
Merge pull request #207 from in27sung/main_10
in27sung Dec 19, 2024
a6a5c53
Merge pull request #211 from in27sung/main_13
in27sung Dec 19, 2024
2ab8cec
임시저장
BowWowBow Dec 19, 2024
88f8c5c
Merge branch 'develop' into admin_02
in27sung Dec 19, 2024
ee2b5ef
Merge pull request #214 from in27sung/admin_02
in27sung Dec 19, 2024
2122561
입고 바코드 완료
shoqying Dec 19, 2024
81ffc86
Merge branch 'develop' into shipment5
shoqying Dec 19, 2024
7a1b99b
update main.jsp
BowWowBow Dec 19, 2024
40aee5c
Merge pull request #215 from in27sung/shipment5
shoqying Dec 19, 2024
1c3074a
Merge branch 'develop' of https://github.com/in27sung/stock-mate.git
BowWowBow Dec 19, 2024
752dad6
갑니다
BowWowBow Dec 19, 2024
beb065b
Merge pull request #217 from in27sung/main_16
in27sung Dec 19, 2024
16bc0a6
합치기 테스트
shoqying Dec 19, 2024
eadbc65
Merge branch 'develop' into shipment8
shoqying Dec 19, 2024
2bbe7e7
order 와 receving 의 테스트 정보전달
freehyeon Dec 19, 2024
8ddd719
Merge pull request #219 from in27sung/shipment8
shoqying Dec 19, 2024
3f99346
Merge branch 'develop' into order_and_receving
freehyeon Dec 19, 2024
5aaf140
Merge pull request #220 from in27sung/order_and_receving
freehyeon Dec 19, 2024
bb990bc
회원가입, 로그인 프론트 변경
BowWowBow Dec 19, 2024
f75bbb7
Update manager
in27sung Dec 19, 2024
9b7aab4
Update manager
in27sung Dec 19, 2024
f146f50
Merge branch 'develop' into main_16
in27sung Dec 19, 2024
0fb080d
Merge pull request #221 from in27sung/main_16
in27sung Dec 19, 2024
7b4d23e
sadf
shoqying Dec 19, 2024
34a9cfc
Merge branch 'develop' into shipment10
shoqying Dec 19, 2024
b1951fa
Merge pull request #222 from in27sung/shipment10
shoqying Dec 19, 2024
f676df2
css
yeeezin Dec 20, 2024
12ba1f3
Merge pull request #227 from in27sung/main_13
yeeezin Dec 20, 2024
d5ad226
css 수정
yeeezin Dec 20, 2024
aaddefb
Merge pull request #229 from in27sung/css
yeeezin Dec 20, 2024
77e673c
수정 및 보완
yeeezin Dec 20, 2024
7db761f
Merge pull request #232 from in27sung/main_14
yeeezin Dec 20, 2024
641061c
order 부분 리팩토링
freehyeon Dec 20, 2024
de9491f
입고 처리 완료
shoqying Dec 20, 2024
ca4ea43
Merge pull request #233 from in27sung/orderandre_hyeon
freehyeon Dec 20, 2024
8429a8b
Merge branch 'develop' into shipment11
shoqying Dec 20, 2024
7e27e1f
Merge pull request #234 from in27sung/shipment11
shoqying Dec 20, 2024
30e21e0
테스트
shoqying Dec 20, 2024
5ecdde9
중간 TEST
freehyeon Dec 20, 2024
a2ebd6a
Merge pull request #237 from in27sung/orderandrecivint_hyeon
freehyeon Dec 20, 2024
d4a1941
Merge branch 'develop' into shipment12
shoqying Dec 20, 2024
f323ab6
Merge pull request #238 from in27sung/shipment12
shoqying Dec 20, 2024
3a8e0ec
Update develop
in27sung Dec 20, 2024
06bbf2b
최종
shoqying Dec 20, 2024
8f682e6
Debuging main
in27sung Dec 20, 2024
feab9fc
Merge pull request #241 from in27sung/shipment13
shoqying Dec 20, 2024
647b86b
Debuging business
in27sung Dec 20, 2024
6947f9d
얼럿창 수정
yeeezin Dec 20, 2024
68ef46e
Merge pull request #244 from in27sung/main_17
yeeezin Dec 20, 2024
3f9d314
Order 수정사항
freehyeon Dec 20, 2024
760efe4
Merge branch 'develop' into ordermodifyfinal_hyeon
in27sung Dec 20, 2024
d80c2b7
Merge pull request #245 from in27sung/ordermodifyfinal_hyeon
freehyeon Dec 20, 2024
7f66246
Debuging
in27sung Dec 20, 2024
4e271e7
Merge branch 'develop' of https://github.com/in27sung/stock-mate.git …
in27sung Dec 20, 2024
dbba043
editinfo 수정
yeeezin Dec 20, 2024
e727e79
Merge pull request #247 from in27sung/main_19
yeeezin Dec 20, 2024
bb914af
테스트
shoqying Dec 20, 2024
14ff820
Merge branch 'develop' into shipment14
shoqying Dec 20, 2024
a4cb324
Merge pull request #249 from in27sung/shipment14
shoqying Dec 20, 2024
58c2661
img 수정
yeeezin Dec 20, 2024
8dfd26a
Merge pull request #250 from in27sung/img
yeeezin Dec 20, 2024
2a73c21
핫픽스
shoqying Dec 20, 2024
eb9ffab
핫픽스
shoqying Dec 20, 2024
9123052
Merge branch 'develop' into shipment16
shoqying Dec 20, 2024
3dcee17
Merge pull request #252 from in27sung/shipment16
in27sung Dec 20, 2024
a0b1aeb
Update history.jsp
shoqying Dec 20, 2024
aedeb45
Merge pull request #253 from in27sung/shoqying-patch-1
shoqying Dec 20, 2024
500b6c0
hotfix
shoqying Dec 20, 2024
2db0b93
최종
shoqying Dec 20, 2024
a36f25f
Merge pull request #256 from in27sung/hotfix
shoqying Dec 20, 2024
5aeedc0
Update QRCode
in27sung Dec 21, 2024
e58373c
Merge branch 'develop' of https://github.com/in27sung/stock-mate.git …
in27sung Dec 22, 2024
15f1e63
Debuging category, Update Barcode
in27sung Dec 22, 2024
582b2bf
Update stock
in27sung Dec 22, 2024
0fe59b7
Fix code scanning alert no. 16: Uncontrolled data used in path expres…
in27sung Dec 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stockMate/src/main/java/com/stockm8/config/WebConfig.java
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ public class WebConfig implements WebMvcConfigurer {
public void addInterceptors(InterceptorRegistry registry) {
// Intercepter 적용
registry.addInterceptor(authorizationInterceptor)
.addPathPatterns("/dashboard", "/business", "/category/**", "/product/**", "/warehouse/**", "/stock/**", "/order/**" ) // 인터셉터를 적용할 경로
.addPathPatterns("/dashboard", "/business", "/category/**", "/product/**", "/warehouse/**", "/stock/**", "/order/**","/admin/**" ) // 인터셉터를 적용할 경로
.excludePathPatterns( // 인터셉터를 제외할 경로
"/", // HomeController 경로
"/favicon.ico", // 브라우저 기본 요청
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package com.stockm8.controller;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import com.stockm8.domain.vo.Criteria;
import com.stockm8.domain.vo.OrderItemVO;
import com.stockm8.domain.vo.OrderVO;
import com.stockm8.domain.vo.PageVO;
import com.stockm8.domain.vo.OrderVO.OrderType;
import com.stockm8.domain.vo.StockVO;
import com.stockm8.domain.vo.UserVO;
import com.stockm8.service.OrderService;
import com.stockm8.service.UserService;

@Controller
@RequestMapping(value = "/admin/*")
public class AdminController {

// 현재 로그인한 사용자 정보 가져오기(인터셉터에서 정의됨)
private UserVO getCurrentUser(HttpServletRequest request) {
return (UserVO) request.getAttribute("currentUser");
}

private static final Logger logger = LoggerFactory.getLogger(AdminController.class);

@Inject
private OrderService orderService;
@Inject
private UserService userService;

/**
* 어드민 메인 페이지 표시(GET)
* http://localhost:8088/admin/adminMain
*
*/
@RequestMapping(value = "/adminMain", method = RequestMethod.GET)
public String adminMainGET(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
logger.info("adminMainGET() 호출");

UserVO currentUser = getCurrentUser(request);
int businessId = currentUser.getBusinessId();

return "admin/adminMain";
}
/**
* 어드민 회원목록표시(GET)
* http://localhost:8088/admin/adminList
*
*/
@RequestMapping(value = "/adminList", method = RequestMethod.GET)
public String adminListGET(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
logger.info("adminListGET() 호출");

UserVO currentUser = getCurrentUser(request);
int businessId = currentUser.getBusinessId();

return "admin/adminList";
}



} //AdminController
90 changes: 53 additions & 37 deletions stockMate/src/main/java/com/stockm8/controller/OrderController.java
Original file line number Diff line number Diff line change
@@ -17,10 +17,13 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import com.stockm8.domain.vo.Criteria;
import com.stockm8.domain.vo.OrderItemVO;
import com.stockm8.domain.vo.OrderVO;
import com.stockm8.domain.vo.PageVO;
import com.stockm8.domain.vo.OrderVO.OrderType;
import com.stockm8.domain.vo.StockVO;
import com.stockm8.domain.vo.UserVO;
@@ -30,6 +33,11 @@
@Controller
@RequestMapping(value = "/order/*")
public class OrderController {

// 현재 로그인한 사용자 정보 가져오기(인터셉터에서 정의됨)
private UserVO getCurrentUser(HttpServletRequest request) {
return (UserVO) request.getAttribute("currentUser");
}

private static final Logger logger = LoggerFactory.getLogger(OrderController.class);

@@ -49,29 +57,8 @@ public class OrderController {
public String orderRegisterGET(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
logger.info("orderRegisterGET() 호출");


// 세션에서 userId 가져오기
HttpSession session = request.getSession(false);
Long userId = (session != null) ? (Long)session.getAttribute("userId") : null;

// userId로 사용자 정보 조회
UserVO user = userService.getUserById(userId);
int businessId = user.getBusinessId();

// HttpSession session = request.getSession(false);
// if (session != null) {
// Long userId = (Long) session.getAttribute("userId");
// if (userId != null) {
// UserVO user = userService.getUserById(userId);
// if (user != null) {
// model.addAttribute("businessId", user.getBusinessId());
// // 추가적인 권한 체크나 비즈니스 로직
// return "order/register";
// }
// }
// }
// // 인증 실패 처리 => 음 메세지 ??? 어떻게 ??
// return "user/main";
UserVO currentUser = getCurrentUser(request);
int businessId = currentUser.getBusinessId();

return "order/register";
}
@@ -81,14 +68,13 @@ public String orderRegisterGET(Model model, HttpServletRequest request, HttpServ
* http://localhost:8088/order/register
* @param order 클라이언트에서 전송된 주문 정보
* @return 처리 결과를 담은 Map 객체
* @throws Exception 주문 처리 중 발생하는 예외
*
*/
@RequestMapping(value = "/register",
method = RequestMethod.POST,
produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public Map<String, String> orderRegisterPOST(@RequestBody OrderVO order) throws Exception {
public Map<String, String> orderRegisterPOST(@RequestBody OrderVO order, HttpServletRequest request) throws Exception {
logger.info("orderRegisterPOST() 호출");
logger.info("주문 정보: " + order);

@@ -97,7 +83,6 @@ public Map<String, String> orderRegisterPOST(@RequestBody OrderVO order) throws
throw new IllegalArgumentException("주문 유형이 누락되었습니다.");
}


// 주문에 orderItems가 있는지 확인(유효성 검사)
if (order.getOrderItems() == null || order.getOrderItems().isEmpty()) {
throw new IllegalArgumentException("주문 항목이 누락되었습니다.");
@@ -146,13 +131,8 @@ public Map<String, String> orderRegisterPOST(@RequestBody OrderVO order) throws
public List<StockVO> findAvailableStocks(HttpServletRequest request) throws Exception {
logger.info("findAvailableStocks() 호출");

// 세션에서 userId 가져오기
HttpSession session = request.getSession(false);
Long userId = (session != null) ? (Long)session.getAttribute("userId") : null;

// userId로 사용자 정보 조회
UserVO user = userService.getUserById(userId);
int businessId = user.getBusinessId();
UserVO currentUser = getCurrentUser(request);
int businessId = currentUser.getBusinessId();

return orderService.findAvailableStocks(businessId);
}
@@ -175,19 +155,55 @@ public String generateOrderNumber() throws Exception {
* http://localhost:8088/order/orderList
*/
@RequestMapping(value = "/orderList" , method = RequestMethod.GET)
public String orderListGET(Model model) {
public String orderListGET(Model model, Criteria cri, HttpServletRequest request) throws Exception {
logger.info("orderListGET() 호출");

// main에서 넘어올떄 정달정보 ?? 로그인???세션 ??
// Criteria가 null인 경우 새로 생성
if (cri == null) {
cri = new Criteria();
}

UserVO currentUser = getCurrentUser(request);
int businessId = currentUser.getBusinessId();

//서비스 -> DAO(주문 목록)
List<OrderVO> orderList = orderService.getOrderList();
List<OrderVO> orderList = orderService.getOrderList(cri, businessId);

//뷰 페이지 정보 전달(model)
// 전체 데이터 개수 조회
int totalCount = orderService.getTotalOrderCount(businessId);

// 페이징 정보 계산
PageVO pageVO = new PageVO();
pageVO.setCri(cri);
pageVO.setTotalCount(totalCount);

//뷰 페이지 정보 전달(model)
model.addAttribute("orderList",orderList);
model.addAttribute("pageVO", pageVO);

return "/order/orderList";
}

/**
* 주문 상세 정보 조회
* http://localhost:8088/order/detail?orderId=1
*/
@RequestMapping(value = "/detail", method = RequestMethod.GET)
public String orderDetailGET(@RequestParam("orderId") int orderId, Model model, HttpServletRequest request) throws Exception {
logger.info("orderDetailGET() 호출 - orderId: " + orderId);

UserVO currentUser = getCurrentUser(request);

// 주문 기본 정보 조회
OrderVO order = orderService.getOrderById(orderId);
// 주문 상세 항목 목록 조회
List<OrderItemVO> orderItems = orderService.getOrderItemsByOrderId(orderId);

// 모델에 데이터 추가
model.addAttribute("order", order);
model.addAttribute("orderItems", orderItems);

return "order/orderDetail";
}

} //OrderController
Original file line number Diff line number Diff line change
@@ -17,8 +17,14 @@ public class OrderItemVO {
private Timestamp createdAt; // 생성 시간
private Timestamp updatedAt; // 수정 시간


//JOIN을 통해 가져올 연관 정보
private int stockId; // 가용 재고 구분위해 필요
private ProductVO product; // 상품 정보
private String productName; // 상품명
private String productBarcode; // 상품 바코드
private String warehouseName; // 창고명
private String baseUnit; // 기본 단위



} //OrderItemVO
2 changes: 1 addition & 1 deletion stockMate/src/main/java/com/stockm8/domain/vo/PageVO.java
Original file line number Diff line number Diff line change
@@ -109,4 +109,4 @@ public String toString() {



}
} // PageVO
5 changes: 2 additions & 3 deletions stockMate/src/main/java/com/stockm8/domain/vo/StockVO.java
Original file line number Diff line number Diff line change
@@ -19,9 +19,8 @@ public class StockVO {
private Boolean isDeleted; // 논리 삭제 여부 (true: 삭제됨, false: 활성)

// 연관 VO 필드
private ProductVO product; // 상품 정보
private ProductVO product; // 상품 정보(JOIN)
private CategoryVO category; // 카테고리 정보
private WarehouseVO warehouse; // 창고 정보
private String warehouseName; // 창고명

private String warehouseName; // (JOIN)
}
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons

// 2. DB에서 사용자 정보 조회
UserVO user = userService.getUserById(userId);
request.setAttribute("currentUser", user); //검증 된 사용자 정보를 저장

if (user == null) {
logger.warn("해당 유저({}) 정보를 찾을 수 없습니다. 회원가입 페이지로 이동합니다.", userId);
19 changes: 12 additions & 7 deletions stockMate/src/main/java/com/stockm8/persistence/OrderDAO.java
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;

import com.stockm8.domain.vo.Criteria;
import com.stockm8.domain.vo.OrderItemVO;
import com.stockm8.domain.vo.OrderVO;
import com.stockm8.domain.vo.ProductVO;
@@ -25,16 +26,20 @@ public interface OrderDAO {
// 재고 수량 업데이트
public int updateStockQuantity(Map<String, Object> params) throws Exception;

// 주문 목록
public List<OrderVO> getOrderList();
// 주문 목록( 페이징 추가로 수정)
public List<OrderVO> getOrderList(Criteria cri, int businessId);

// 재고 정보 조회 @@@@@@@@@@@@@@@@@@@@@@@@@@@@ 미사용
public StockVO getStockById(int stockId) throws Exception;

// 재고 이력 등록 @@@@@@@@@@@@@@@@@@@@@@@@@@@@ 미사용
public void insertStockHistory(Map<String, Object> params) throws Exception;
// 주문 단건 조회
public OrderVO getOrderById(int orderId) throws Exception;

// 주문 상세 항목 목록 조회
public List<OrderItemVO> getOrderItemsByOrderId(int orderId) throws Exception;

// 가용재고 정보 조회
public StockVO getStockById(int stockId) throws Exception;

// 전체 주문 개수 조회 (페이징 계산)
public int getTotalOrderCount(int businessId);



34 changes: 22 additions & 12 deletions stockMate/src/main/java/com/stockm8/persistence/OrderDAOImpl.java
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;

import com.stockm8.domain.vo.Criteria;
import com.stockm8.domain.vo.OrderItemVO;
import com.stockm8.domain.vo.OrderVO;
import com.stockm8.domain.vo.ProductVO;
@@ -109,27 +110,36 @@ public int updateStockQuantity(Map<String, Object> params) throws Exception {
}


// 재고 정보 조회 ==== > 미사용
// 가용재고 정보 조회
@Override
public StockVO getStockById(int stockId) throws Exception {
return sqlSession.selectOne(NAMESPACE + "getStockById", stockId);
}


// 재고 이력 등록 =====> 미사용
//오더 목록
@Override
public void insertStockHistory(Map<String, Object> params) throws Exception {
sqlSession.insert(NAMESPACE + "insertStockHistory", params);

public List<OrderVO> getOrderList(Criteria cri, int businessId) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("cri", cri);
paramMap.put("businessId", businessId);
return sqlSession.selectList(NAMESPACE+ "orderList", paramMap);
}

//오더 목록
// 주문 단건 조회
@Override
public List<OrderVO> getOrderList() {
return sqlSession.selectList(NAMESPACE+ "orderList");
public OrderVO getOrderById(int orderId) throws Exception {
return sqlSession.selectOne(NAMESPACE + "getOrderById", orderId);
}


// 주문 상세항목 조회
@Override
public List<OrderItemVO> getOrderItemsByOrderId(int orderId) throws Exception {
return sqlSession.selectList(NAMESPACE + "getOrderItemsByOrderId", orderId);
}
// 전체 주문 개수 조회 (페이징 계산)
@Override
public int getTotalOrderCount(int businessId) {
return sqlSession.selectOne(NAMESPACE + "getTotalOrderCount", businessId); }




} // OrderImpl
Loading