|
|
@@ -364,7 +364,8 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
|
order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
|
|
|
- // 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트
|
|
|
+ // 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트
|
|
|
+ order.setChgGb(TscConstants.OrderChangeGb.RETURN.value());
|
|
|
List<Order> cancelRequestTargetList = coreOrderChangeService.getCancelRequestTargetList2(order);
|
|
|
List<Order> orderChangeDetailList = coreOrderChangeService.getOrderChangeDetailList(order);
|
|
|
Collection<Order> orderInfoList = coreOrderService.getOrderInfoList(order);
|
|
|
@@ -694,13 +695,8 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
*/
|
|
|
@GetMapping("/exchange/request/form")
|
|
|
public ModelAndView exchangeRequestFrom(Order order) {
|
|
|
-
|
|
|
- // Order order = new Order();
|
|
|
ModelAndView mav = new ModelAndView();
|
|
|
|
|
|
- // order.setOrdNo(ordNo);
|
|
|
- // order.setOrdChgSq(ordChgSq);
|
|
|
-
|
|
|
// 교환가능 주문상세상탭값 설정
|
|
|
String[] ordDtlStatArr = new String[3];
|
|
|
ordDtlStatArr[0] = TscConstants.OrderDetailStat.SHIPPING.value();
|
|
|
@@ -708,6 +704,7 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
ordDtlStatArr[2] = TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value();
|
|
|
order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
|
|
|
+ order.setChgGb(TscConstants.OrderChangeGb.EXCHANGE.value());
|
|
|
Collection<Order> cancelRequestTargetList = coreOrderChangeService.getCancelRequestTargetList(order);
|
|
|
Collection<Order> orderChangeDetailList = coreOrderChangeService.getOrderChangeDetailList(order);
|
|
|
Collection<Order> orderInfoList = coreOrderService.getOrderInfoList(order);
|