|
|
@@ -89,7 +89,7 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
@GetMapping("/cncl/req/form")
|
|
|
public ModelAndView cnclReqForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordDtlNo") int ordDtlNo
|
|
|
, @RequestParam(value = "delvFeeCd") String delvFeeCd, @RequestParam(value = "delvFeeCdGrp") String delvFeeCdGrp
|
|
|
- , @RequestParam(value = "ordChgSq") int ordChgSq) {
|
|
|
+ , @RequestParam(value = "chgStat") String chgStat, @RequestParam(value = "ordChgSq") int ordChgSq) {
|
|
|
|
|
|
Order order = new Order();
|
|
|
order.setOrdNo(ordNo);
|
|
|
@@ -101,13 +101,25 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
String userId = TsaSession.getInfo().getUserId();
|
|
|
|
|
|
// 1. 취소가능 주문상세상탭값 설정
|
|
|
- String[] ordDtlStatArr = new String[4];
|
|
|
- ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
|
- ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
|
- ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
|
- ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
|
- order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
-
|
|
|
+ if (TscConstants.OrderChangeStat.CANCEL.value().equals(chgStat)) {
|
|
|
+ String[] ordDtlStatArr = new String[5];
|
|
|
+ ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
|
+ ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
|
+ ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
|
+ ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
|
+ ordDtlStatArr[4] = TscConstants.OrderDetailStat.SHIPPING.value();
|
|
|
+
|
|
|
+ order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
+ } else {
|
|
|
+ String[] ordDtlStatArr = new String[4];
|
|
|
+ ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
|
+ ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
|
+ ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
|
+ ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
|
+
|
|
|
+ order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
+ }
|
|
|
+
|
|
|
// 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트
|
|
|
List<Order> cancelRequestTargetList = coreOrderChangeService.getCancelRequestTargetList2(order);
|
|
|
List<Order> orderChangeDetailList = coreOrderChangeService.getOrderChangeDetailList(order);
|
|
|
@@ -671,6 +683,7 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
if (isValid) {
|
|
|
// 2021.06.09 비회원이 아닌경우만 고객 계좌에 등록
|
|
|
if (order.getCustNo() > 0) {
|
|
|
+ // 환불계좌등록
|
|
|
coreOrderChangeService.saveRefundAccount(order);
|
|
|
}
|
|
|
} else {
|