CTI 접속을 통해 들어온 경우 주문목록 페이지 노출되게 처리

src/main/java/com/style24/admin/biz/web/TsaCustomerController.java

@@ -1246,6 +1246,54 @@ public class TsaCustomerController extends TsaBaseController {
 		return result;
 	}
 
+//	/**
+//	 * CTI에서 접속한 회원목록 화면
+//	 * @param hphoneNo - 휴대전화번호
+//	 * @return
+//	 * @author gagamel
+//	 * @since 2021. 8. 31
+//	 */
+//	@GetMapping("/cti/form/{cellPhnno}")
+//	public ModelAndView customerCtiForm(@PathVariable String cellPhnno) {
+//		ModelAndView mav = new ModelAndView();
+//
+//		// 사이트 목록
+//		mav.addObject("siteList", rendererService.getCommonCodeList("G000", "Y"));
+//
+//		// 성별
+//		mav.addObject("genderGbList", rendererService.getCommonCodeList("G007", "Y"));
+//
+//		// 회원 구분
+//		mav.addObject("custGbList", rendererService.getCommonCodeList("G100", "Y"));
+//
+//		// 회원 등급
+//		mav.addObject("custGradeList", rendererService.getCommonCodeList("G110", "Y"));
+//
+//		// 관리대상
+//		mav.addObject("managedRsnList", rendererService.getCommonCodeList("G103", "Y"));
+//
+//		// 간편가입유형
+//		mav.addObject("snsTypeList", rendererService.getCommonCodeList("G105", "Y"));
+//
+//		// 전화번호 형식 체크 및 변환
+//		String[] hp = cellPhnno.split("-");
+//		if (hp.length < 2) {
+//			String tempNo = String.format("%-11s", cellPhnno);
+//			String no1 = tempNo.substring(0, 3);
+//			String no2 = tempNo.substring(3, 7);
+//			String no3 = tempNo.substring(7);
+//			tempNo = no1 + "-" + no2 + "-" + no3;
+//			String[] arrTemp = tempNo.split(" ");
+//			cellPhnno = arrTemp[0];
+//		}
+//
+//		mav.addObject("cellPhnno", cellPhnno);
+//
+//		mav.setViewName("customer/CustomerCtiListForm");
+//
+//		return mav;
+//	}
+
 	/**
 	 * CTI에서 접속한 회원목록 화면
 	 * @param hphoneNo - 휴대전화번호
@@ -1255,25 +1303,7 @@ public class TsaCustomerController extends TsaBaseController {
 	 */
 	@GetMapping("/cti/form/{cellPhnno}")
 	public ModelAndView customerCtiForm(@PathVariable String cellPhnno) {
-		ModelAndView mav = new ModelAndView();
-
-		// 사이트 목록
-		mav.addObject("siteList", rendererService.getCommonCodeList("G000", "Y"));
-
-		// 성별
-		mav.addObject("genderGbList", rendererService.getCommonCodeList("G007", "Y"));
-
-		// 회원 구분
-		mav.addObject("custGbList", rendererService.getCommonCodeList("G100", "Y"));
-
-		// 회원 등급
-		mav.addObject("custGradeList", rendererService.getCommonCodeList("G110", "Y"));
-
-		// 관리대상
-		mav.addObject("managedRsnList", rendererService.getCommonCodeList("G103", "Y"));
-
-		// 간편가입유형
-		mav.addObject("snsTypeList", rendererService.getCommonCodeList("G105", "Y"));
+		ModelAndView mav = new ModelAndView("dashboard");
 
 		// 전화번호 형식 체크 및 변환
 		String[] hp = cellPhnno.split("-");
@@ -1289,8 +1319,6 @@ public class TsaCustomerController extends TsaBaseController {
 
 		mav.addObject("cellPhnno", cellPhnno);
 
-		mav.setViewName("customer/CustomerCtiListForm");
-
 		return mav;
 	}
 

src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -16,11 +16,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gagaframework.excel.GagaExcelUtil;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.admin.biz.service.TsaPgService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
@@ -35,6 +30,12 @@ import com.style24.persistence.domain.OrderSample;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.excel.GagaExcelUtil;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaFileUtil;
+
 /**
  * 주문관리 Controller
  *
@@ -57,10 +58,10 @@ public class TsaOrderController extends TsaBaseController {
 
 	@Autowired
 	private TscOrderService orderService;
-	
+
 	@Autowired
 	private TsaPgService pgService;
-	
+
 	@Autowired
 	private ObjectMapper mapper;
 
@@ -72,23 +73,26 @@ public class TsaOrderController extends TsaBaseController {
 	 * @since 2020. 11. 16
 	 */
 	@GetMapping("/list/form")
-	public ModelAndView orderListForm() {
+	public ModelAndView orderListForm(@RequestParam(value = "cellPhnno", required = false) String cellPhnno) {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("siteCdList"		, rendererService.getAvailCommonCodeList("G012"));		// 사이트구분
-		mav.addObject("mallGbList"		, rendererService.getAvailCommonCodeList("G011"));		// 몰구분
-		mav.addObject("supplyCompList"	, rendererService.getSupplyCompanyList());				// 공급업제목록
-		
+		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G012"));		// 사이트구분
+		mav.addObject("mallGbList", rendererService.getAvailCommonCodeList("G011"));		// 몰구분
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());				// 공급업제목록
+
 		// 2021.05.11 프론트기준으로 상태값 정리
-		mav.addObject("ordDtlStatList"	, rendererService.getCommonCodeList("G013", "Y", new String[] {"G013_10", "G013_11", "G013_25", "G013_35", "G013_55", "G013_97", "G013_98", "G013_99"}));
-		mav.addObject("chgStatList"		, rendererService.getAvailCommonCodeList("G685"));		// 주문변경요청상태코드
-		mav.addObject("chgGbList"		, rendererService.getAvailCommonCodeList("G680"));		// 주문변경구분코드
-		mav.addObject("pgGbList"		, rendererService.getAvailCommonCodeList("G015"));		// 결제타입
-		mav.addObject("payMeansList"	, rendererService.getAvailCommonCodeList("G014"));		// 결제수단
-		mav.addObject("siteCdList"		, rendererService.getAvailCommonCodeList("G000"));		// 사이트구분
-		mav.addObject("formalGbList"	, rendererService.getAvailCommonCodeList("G009"));		// 정상/이월
+		mav.addObject("ordDtlStatList", rendererService.getCommonCodeList("G013", "Y", new String[] {"G013_10", "G013_11", "G013_25", "G013_35", "G013_55", "G013_97", "G013_98", "G013_99"}));
+		mav.addObject("chgStatList", rendererService.getAvailCommonCodeList("G685"));		// 주문변경요청상태코드
+		mav.addObject("chgGbList", rendererService.getAvailCommonCodeList("G680"));		// 주문변경구분코드
+		mav.addObject("pgGbList", rendererService.getAvailCommonCodeList("G015"));		// 결제타입
+		mav.addObject("payMeansList", rendererService.getAvailCommonCodeList("G014"));		// 결제수단
+		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));		// 사이트구분
+		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));		// 정상/이월
+
+		mav.addObject("userNo", TsaSession.getInfo().getUserNo());
 
-		mav.addObject("userNo"			, TsaSession.getInfo().getUserNo());
+		// CTI 접속을 통해 접근 시
+		mav.addObject("cellPhnno", cellPhnno);
 
 		mav.setViewName("order/OrderListForm");
 
@@ -113,12 +117,12 @@ public class TsaOrderController extends TsaBaseController {
 
 		// 주문상태 CD_GB 변경
 		if (order.getMultiOrdStat() != null) {
-			for (int i=0 ; i<order.getMultiOrdStat().length ; i++) {
+			for (int i = 0; i < order.getMultiOrdStat().length; i++) {
 				String ordStat = order.getMultiOrdStat()[i].replace("G012", "G013");
 				order.getMultiOrdStat()[i] = ordStat;
 			}
 		}
-		
+
 		// 2021.07.13 업체,브랜드 검색방법 변경
 		if (!StringUtils.isBlank(order.getBrandList())) {
 			try {
@@ -151,8 +155,8 @@ public class TsaOrderController extends TsaBaseController {
 		// 주문목록 페이지 조회
 		Collection<Order> orderList = orderService.getOrderList(order);
 
-		result.set("pageing"	, order);
-		result.set("orderList"	, orderList);
+		result.set("pageing", order);
+		result.set("orderList", orderList);
 
 		return result;
 	}
@@ -213,10 +217,10 @@ public class TsaOrderController extends TsaBaseController {
 		Order order = new Order();
 		order.setOrdNo(ordNo);
 		order.setDelYn("N");
-		
+
 		// 2021.05.11 배송비수정여부추가
 		Collection<Order> orderDetailList = orderService.getOrderDetailList(order);
-		
+
 		/*
 		// 2021.07.29 결제금액관련정보
 		int listSumAmt 			= 0; // 상품금액합계(정상가)
@@ -252,7 +256,7 @@ public class TsaOrderController extends TsaBaseController {
 		int gfcdUseAmtSum		= 0;	// 상품권결제액
 		int savePntAmtSum		= 0;	// 적립금액
 		*/
-		
+
 		String allCanYn = "Y";
 		for (Order orderDetail : orderDetailList) {
 			if ("Y".equals(allCanYn)
@@ -265,24 +269,24 @@ public class TsaOrderController extends TsaBaseController {
 		}
 
 		// 1. 주문기본정보
-		mav.addObject("ordNo"					, ordNo);												// 주문번호
-		mav.addObject("userNo"					, TsaSession.getInfo().getUserNo());					// 관리자번호
+		mav.addObject("ordNo", ordNo);												// 주문번호
+		mav.addObject("userNo", TsaSession.getInfo().getUserNo());					// 관리자번호
 
-		mav.addObject("orderInfo"				, orderService.getOrderInfoList(order));				// 주문기본정보
-		mav.addObject("orderGoodsInfo"			, orderDetailList);										// 주문상품정보
-		mav.addObject("orderFreeGiftInfo"		, orderService.getOrderFreeGiftList(order));			// 주문사은품정보 2020.12.16 추가
-		mav.addObject("orderDeliveryAddrInfo"	, orderService.getDeliveryAddrList(order));				// 배송정보
-		mav.addObject("orderPaymentInfo"		, orderService.getOrderPaymentBasicInfoList(order));	// 결제정보
-		mav.addObject("orderDeliveryFeeInfo"	, orderService.getDeliveryFeeList(order));				// 배송비정보
+		mav.addObject("orderInfo", orderService.getOrderInfoList(order));				// 주문기본정보
+		mav.addObject("orderGoodsInfo", orderDetailList);										// 주문상품정보
+		mav.addObject("orderFreeGiftInfo", orderService.getOrderFreeGiftList(order));			// 주문사은품정보 2020.12.16 추가
+		mav.addObject("orderDeliveryAddrInfo", orderService.getDeliveryAddrList(order));				// 배송정보
+		mav.addObject("orderPaymentInfo", orderService.getOrderPaymentBasicInfoList(order));	// 결제정보
+		mav.addObject("orderDeliveryFeeInfo", orderService.getDeliveryFeeList(order));				// 배송비정보
 
 		// 2. 클레임정보
-		mav.addObject("orderChangeInfo"			, orderService.getOrderChangeList(order));				// 취소/반품/교환 요청 정보
-		mav.addObject("orderRefundInfo"			, orderService.getOrderRefundInfo(order));				// 환불정보
+		mav.addObject("orderChangeInfo", orderService.getOrderChangeList(order));				// 취소/반품/교환 요청 정보
+		mav.addObject("orderRefundInfo", orderService.getOrderRefundInfo(order));				// 환불정보
 
 		// 3. 주문메모정보
-		mav.addObject("orderCounselInfo"		, orderService.getOrderCounselInfo(order));				// 상담내역
-		mav.addObject("orderAdminMemoInfo"		, orderService.getOrderMemoList(order));				// 관리자메모목록
-		mav.addObject("allCanYn"				, allCanYn);											// 배송지수정가능여부
+		mav.addObject("orderCounselInfo", orderService.getOrderCounselInfo(order));				// 상담내역
+		mav.addObject("orderAdminMemoInfo", orderService.getOrderMemoList(order));				// 관리자메모목록
+		mav.addObject("allCanYn", allCanYn);											// 배송지수정가능여부
 
 		mav.setViewName("order/OrderDetailForm");
 
@@ -303,8 +307,8 @@ public class TsaOrderController extends TsaBaseController {
 	@ResponseBody
 	public ModelAndView orderMemoCreateFrom(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "seq") int seq, @RequestParam(value = "mode") String mode) {
 		ModelAndView mav = new ModelAndView();
-		int userNo 		= TsaSession.getInfo().getUserNo();
-		String userNm 	= TsaSession.getInfo().getUserNm();
+		int userNo = TsaSession.getInfo().getUserNo();
+		String userNm = TsaSession.getInfo().getUserNm();
 
 		if ("U".equals(mode)) {
 			Order order = new Order();
@@ -317,11 +321,11 @@ public class TsaOrderController extends TsaBaseController {
 			mav.addObject("orderMemo", orderMemo);
 		}
 
-		mav.addObject("userNo"	, userNo);
-		mav.addObject("userNm"	, userNm);
-		mav.addObject("ordNo"	, ordNo);
-		mav.addObject("seq"		, seq);
-		mav.addObject("mode"	, mode);
+		mav.addObject("userNo", userNo);
+		mav.addObject("userNm", userNm);
+		mav.addObject("ordNo", ordNo);
+		mav.addObject("seq", seq);
+		mav.addObject("mode", mode);
 
 		mav.setViewName("order/OrderMemoRegistForm");
 		return mav;
@@ -524,7 +528,7 @@ public class TsaOrderController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
-	
+
 	/**
 	 * 배송 > 배송지 정보 수정
 	 *
@@ -540,7 +544,7 @@ public class TsaOrderController extends TsaBaseController {
 		orderService.updateOrderAddr(order);
 		return super.ok(message.getMessage("SUCC_0002"));
 	}
-	
+
 	/**
 	 * 반품/교환 > 회수지 정보 수정
 	 *
@@ -557,7 +561,6 @@ public class TsaOrderController extends TsaBaseController {
 		return super.ok(message.getMessage("SUCC_0002"));
 	}
 
-
 	/* 주문 샘플 데이터 (추후 삭제 예정) */
 	@GetMapping("/sample/create/form")
 	@ResponseBody
@@ -571,12 +574,12 @@ public class TsaOrderController extends TsaBaseController {
 		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
 		// 시즌
 		mav.addObject("seasonList", rendererService.getAvailCommonCodeList("G006"));
-		
+
 		mav.setViewName("order/OrderSamplePopupForm");
-		
+
 		return mav;
 	}
-	
+
 	@PostMapping("/sample/create")
 	@ResponseBody
 	public GagaMap createOrderSample(@RequestBody OrderSample orderSample) {
@@ -584,9 +587,9 @@ public class TsaOrderController extends TsaBaseController {
 		result.set("status", GagaResponseStatus.FAIL.getCode());
 
 		log.info("orderSample >>> {}", orderSample);
-		
+
 		result = pgService.createOrderSample(orderSample);
-		
+
 		// 처리 결과 코드에 따른 메세지 설정
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
 			result.set("message", message.getMessage("SUCC_0004"));
@@ -602,7 +605,7 @@ public class TsaOrderController extends TsaBaseController {
 	public Collection<Goods> getOrderSampleGoodsInfo(@RequestBody String[] arrGoodsCd) {
 		Goods goods = new Goods();
 		goods.setArrGoodsCd(arrGoodsCd);
-		
+
 		return pgService.getOrderSampleGoodsInfo(goods);
 	}
 
@@ -611,9 +614,9 @@ public class TsaOrderController extends TsaBaseController {
 	public Goods getOrderSampleGoodsStock(@RequestBody Goods goods) {
 		return pgService.getOrderSampleGoodsStock(goods);
 	}
-	
+
 	/* //주문 샘플 데이터 (추후 삭제 예정) */
-	
+
 	/**
 	 * 스윗트래커 정보 조회
 	 *
@@ -626,13 +629,13 @@ public class TsaOrderController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		Collection<Order> sweetTrackerDeliveryList = orderService.getSweetTrackerDeliveryInfo(order);
-		mav.addObject("sweetTrackerDeliveryList"	, sweetTrackerDeliveryList); // 택배사 목록
-		
+		mav.addObject("sweetTrackerDeliveryList", sweetTrackerDeliveryList); // 택배사 목록
+
 		mav.setViewName("order/SweetTrackerDeliveryList");
 
 		return mav;
 	}
-	
+
 	/**
 	 * 자동품절취소실패목록
 	 *
@@ -648,7 +651,7 @@ public class TsaOrderController extends TsaBaseController {
 
 		return mav;
 	}
-	
+
 	/**
 	 * 자동품절취소실패목록
 	 *
@@ -669,13 +672,3 @@ public class TsaOrderController extends TsaBaseController {
 	}
 
 }
-
-
-
-
-
-
-
-
-
-

src/main/webapp/WEB-INF/views/common/fragments/lnb.html

@@ -24,7 +24,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// LNB 메뉴 클릭 시
-	let fnClickLnb = function(menuId) {
+	let fnClickLnb = function(menuId, ctiCellPhnno) {
 		let menu = cfnGetMenuInfo(menuId);
 
 		// Menu 정보가 없으면 skip
@@ -32,7 +32,15 @@
 			return;
 		}
 		
-		$('#content').load(menu.menuUrl, function() {
+		let menuUrl = menu.menuUrl;
+		if (!gagajf.isNull(ctiCellPhnno)) {
+			if (!gagajf.isNull(menuUrl)) {
+				(menuUrl.indexOf('?') > -1) ? menuUrl += '&' : menuUrl += '?';
+			}
+			menuUrl += 'cellPhnno=' + ctiCellPhnno;
+		}
+		
+		$('#content').load(menuUrl, function() {
 			// Content Main Title
 			let arrNavigation = menu.navigation.split(' > ');
 			let contentTitle = '';

src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -182,7 +182,7 @@
 						</td>
 						<th>주문자휴대폰번호</th>
 						<td>
-							<input type="text" name="orderPhnno" placeholder="" maxlength="20"/>
+							<input type="text" name="orderPhnno" placeholder="" maxlength="20" th:value="${cellPhnno}"/>
 						</td>
 					</tr>
 					<tr>
@@ -512,12 +512,12 @@ var fnSearchList = function () {
 	var edDate 	= $('#edDate').val();
 
 	if (gagajf.isNull(ordNo)) {
-		if (gagajf.isNull(stDate)) {
+		if (gagajf.isNull($('#searchForm input[name=orderPhnno]').val()) && gagajf.isNull(stDate)) {
 			mcxDialog.alert('시작 기간을 입력하세요.');
 			return;
 		}
 
-		if (gagajf.isNull(edDate)) {
+		if (gagajf.isNull($('#searchForm input[name=orderPhnno]').val()) && gagajf.isNull(edDate)) {
 			mcxDialog.alert('종료 기간을 입력하세요.');
 			return;
 		}
@@ -529,7 +529,7 @@ var fnSearchList = function () {
 	var brandText 				= $("#searchForm #brandText").val();
 	var brandList 				= $('#searchForm input[name=brandList]').val();
 	
-	if (gagajf.isNull(stDate) && gagajf.isNull(edDate)) {
+	if (gagajf.isNull($('#searchForm input[name=orderPhnno]').val()) && gagajf.isNull(stDate) && gagajf.isNull(edDate)) {
 		var temp = false;
 		
 		if (!gagajf.isNull(ordNo)) {
@@ -646,9 +646,16 @@ $('#searchForm select[name=pageSize]').on('change', function() {
 $(document).ready(function() {
 	// 달력기능 활성화
 	cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '주문', 'X');
-	$('.btnRecentWeek').trigger('click');
+	if (gagajf.isNull($('#searchForm input[name=orderPhnno]').val())) {
+		$('.btnRecentWeek').trigger('click');
+	}
+	
 	gagaAgGrid.createGrid('gridOrderList', gridOptionsOrderList);
 	gridOptionsOrderList.api.hideOverlay();
+	
+	if (!gagajf.isNull($('#searchForm input[name=orderPhnno]').val())) {
+		$('#btnOrderSearch').trigger('click');
+	}
 });
 
 var fnCreateSampleOrder = function() {