입점업체 플레임 목록 조회 기능 추가

src/main/java/com/style24/persistence/mybatis/shop/TssOrder.xml

@@ -70,24 +70,24 @@
 		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="multiBrand != null and multiBrand != ''">
-        AND    G.BRAND_CD IN
+		AND    G.BRAND_CD IN
 			<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
-        		#{item}
-            </foreach>
-        </if>
-        <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
-        AND    OD.ORD_DTL_STAT IN
+		       #{item}
+			</foreach>
+		</if>
+		<if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
+		AND    OD.ORD_DTL_STAT IN
 			<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
-        		#{item}
-            </foreach>
-        </if>
-        <if test='search != null and search == "searchOrdNo"'>
-        	<if test="condition != null and condition != ''">
+		       #{item}
+			</foreach>
+		</if>
+		<if test='search != null and search == "searchOrdNo"'>
+			<if test="condition != null and condition != ''">
 		AND    O.ORD_NO = #{condition}
 			</if>
 		</if>
 		<if test='search != null and search == "searchExtmallOrderId"'>
-        	<if test="condition != null and condition != ''">
+			<if test="condition != null and condition != ''">
 		AND    O.ORD_NO = #{condition}
 			</if>
 		</if>
@@ -154,105 +154,105 @@
 		     , SUM(ORD_QTY)                   AS SUM_ORD_QTY
 		     , SUM(ORD_QTY - CNCL_RTN_QTY)    AS SUM_ORD_CNCL_QTY
 		FROM   (
-			SELECT O.ORD_NO
-			     , OD.GOODS_CD
-			     , OD.ORD_AMT
-			     , OD.CNCL_RTN_AMT
-			     , OD.CNCL_RTN_QTY
-			     , OD.ORD_QTY
-			     , OD.REAL_ORD_AMT
-			FROM   TB_ORDER O
-			INNER  JOIN TB_ORDER_DETAIL OD
-			ON     O.ORD_NO = OD.ORD_NO
-			INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
-			ON     OD.ORD_NO = ODI.ORD_NO
-			AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-			INNER  JOIN TB_GOODS G
-			ON     OD.GOODS_CD = G.GOODS_CD
-			INNER  JOIN TB_GOODS_IMG GI
-			ON     OD.GOODS_CD = GI.GOODS_CD
-			AND    ODI.OPT_CD1 = GI.COLOR_CD
-			INNER  JOIN TB_PAYMENT P
-			ON     O.ORD_NO = P.ORD_NO
-			AND    P.PAY_GB = 'O'
-			INNER  JOIN TB_DELIVERY_ADDR DA
-			ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-			WHERE  1=1
+		    SELECT O.ORD_NO
+		         , OD.GOODS_CD
+		         , OD.ORD_AMT
+		         , OD.CNCL_RTN_AMT
+		         , OD.CNCL_RTN_QTY
+		         , OD.ORD_QTY
+		         , OD.REAL_ORD_AMT
+		    FROM   TB_ORDER O
+		    INNER  JOIN TB_ORDER_DETAIL OD
+		    ON     O.ORD_NO = OD.ORD_NO
+		    INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
+		    ON     OD.ORD_NO = ODI.ORD_NO
+		    AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		    INNER  JOIN TB_GOODS G
+		    ON     OD.GOODS_CD = G.GOODS_CD
+		    INNER  JOIN TB_GOODS_IMG GI
+		    ON     OD.GOODS_CD = GI.GOODS_CD
+		    AND    ODI.OPT_CD1 = GI.COLOR_CD
+		    INNER  JOIN TB_PAYMENT P
+		    ON     O.ORD_NO = P.ORD_NO
+		    AND    P.PAY_GB = 'O'
+		    INNER  JOIN TB_DELIVERY_ADDR DA
+		    ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
+		    WHERE  1=1
 			<if test='siteCd != null and siteCd != ""'>
-			AND    O.SITE_CD = #{siteCd}
+		    AND    O.SITE_CD = #{siteCd}
 			</if>
 			<if test='mallCd != null and mallCd != ""'>
-			AND    O.MALL_GB = #{mallCd}
+		    AND    O.MALL_GB = #{mallCd}
 			</if>
 			<if test='supplyCompCd != null and supplyCompCd != ""'>
-			AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
+		    AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 			</if>
 			<if test="multiBrand != null and multiBrand != ''">
-	        AND    G.BRAND_CD IN
+		    AND    G.BRAND_CD IN
 				<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
-	        		#{item}
-	            </foreach>
-	        </if>
-	        <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
-	        AND    OD.ORD_DTL_STAT IN
+		           #{item}
+				</foreach>
+			</if>
+			<if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
+		    AND    OD.ORD_DTL_STAT IN
 				<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
-	        		#{item}
-	            </foreach>
-	        </if>
-	        <if test='search != null and search == "searchOrdNo"'>
-	        	<if test="condition != null and condition != ''">
-			AND    O.ORD_NO = #{condition}
+		           #{item}
+				</foreach>
+			</if>
+			<if test='search != null and search == "searchOrdNo"'>
+				<if test="condition != null and condition != ''">
+		    AND    O.ORD_NO = #{condition}
 				</if>
 			</if>
 			<if test='search != null and search == "searchExtmallOrderId"'>
-	        	<if test="condition != null and condition != ''">
-			AND    O.ORD_NO = #{condition}
+				<if test="condition != null and condition != ''">
+		    AND    O.ORD_NO = #{condition}
 				</if>
 			</if>
 			<if test='payMeans != null and payMeans != ""'>
-			AND    P.PAY_MEANS = #{payMeans}
+		    AND    P.PAY_MEANS = #{payMeans}
 			</if>
 			<if test='orderNm != null and orderNm != ""'>
-			AND    O.ORD_NM = #{orderNm}
+		    AND    O.ORD_NM = #{orderNm}
 			</if>
 			<if test='custId != null and custId != ""'>
-			AND    O.CUST_NO = #{custId}
+		    AND    O.CUST_NO = #{custId}
 			</if>
 			<if test='orderPhnno != null and orderPhnno != ""'>
-			AND    O.ORD_PHNNO = #{orderPhnno}
+		    AND    O.ORD_PHNNO = #{orderPhnno}
 			</if>
 			<if test='goodsCd != null and goodsCd != ""'>
-			AND    G.GOODS_CD = #{goodsCd}
+		    AND    G.GOODS_CD = #{goodsCd}
 			</if>
 			<if test='sizeCd != null and sizeCd != ""'>
-			AND    ODI.OPT_CD2 = #{sizeCd}
+		    AND    ODI.OPT_CD2 = #{sizeCd}
 			</if>
 			<if test='goodsNm != null and goodsNm != ""'>
-			AND    G.GOODS_NM = #{goodsNm}
+		    AND    G.GOODS_NM = #{goodsNm}
 			</if>
 			<if test='recipNm != null and recipNm != ""'>
-			AND    DA.RECIP_NM = #{recipNm}
+		    AND    DA.RECIP_NM = #{recipNm}
 			</if>
 			<if test='invoiceNo != null and invoiceNo != ""'>
-			AND    OD.INVOICE_NO = #{invoiceNo}
+		    AND    OD.INVOICE_NO = #{invoiceNo}
 			</if>
 			<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "Y"'>
-			AND    OD.INVOICE_SEND_YN = 'Y'
+		    AND    OD.INVOICE_SEND_YN = 'Y'
 			</if>
 			<if test='wdInvoiceSendYn != null and wdInvoiceSendYn == "N"'>
-			AND    OD.INVOICE_SEND_YN = 'N'
+		    AND    OD.INVOICE_SEND_YN = 'N'
 			</if>
 			<if test='searchDateGb != null and searchDateGb == "ordDt"'>
-			AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-			AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		    AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		    AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 			</if>
 			<if test='searchDateGb != null and searchDateGb == "delvStdt"'>
-			AND    OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-			AND    OD.DELV_STDT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		    AND    OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		    AND    OD.DELV_STDT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 			</if>
 			<if test='searchDateGb != null and searchDateGb == "soldoutDt"'>
-			AND    OD.SOLDOUT_REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
-			AND    OD.SOLDOUT_REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		    AND    OD.SOLDOUT_REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+		    AND    OD.SOLDOUT_REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
 			</if>
 		) X
 	</select>

src/main/java/com/style24/scm/biz/web/TssOrderController.java

@@ -298,7 +298,7 @@ public class TssOrderController extends TssBaseController {
 			selfYn = "N";
 		}
 		// 촬영업체
-		else if ("G001_E000".equals(TssSession.getInfo().getRoleCd())) {	
+		else if ("G001_E000".equals(TssSession.getInfo().getRoleCd())) {
 			supplyCompCd = TssSession.getInfo().getSupplyCompCd();
 			selfYn = "Y";
 		}
@@ -310,6 +310,34 @@ public class TssOrderController extends TssBaseController {
 		return mav;
 	}
 	
+	/**
+	 * 입점클레임목록조회(교환,반품접수)
+	 *
+	 * @param order - 주문정보
+	 * @return Collection<Order>
+	 * @author jsh77b
+	 * @since 2021. 05. 17
+	 */
+	@PostMapping("/seller/claim/list")
+	@ResponseBody
+	public Collection<Order> getOrderSellerClaimList(@RequestBody Order order) throws Exception {
+		
+		// 값이없으면 반품접수, 교환접수
+		/*
+		String [] multiChgStat = new String[2];
+		if (order.getChgStat() == null || "".equals(order.getChgStat())) {
+			multiChgStat[0] = TscConstants.OrderChangeStat.EXCHANGE.value();
+			multiChgStat[1] = TscConstants.OrderChangeStat.RETURN.value();
+		} else {
+			multiChgStat[0] = order.getChgStat();
+		}
+		order.setMultiChgStat(multiChgStat);
+		 */
+		
+		Collection<Order> OrderSellerClaimList = coreOrderService.getOrderSellerClaimList(order);
+		return OrderSellerClaimList;
+	}
+	
 	/**
 	 * 입점입고대상목록(교환,반품접수)
 	 *
@@ -331,7 +359,7 @@ public class TssOrderController extends TssBaseController {
 			selfYn = "N";
 		}
 		// 촬영업체
-		else if ("G001_E000".equals(TssSession.getInfo().getRoleCd())) {	
+		else if ("G001_E000".equals(TssSession.getInfo().getRoleCd())) {
 			supplyCompCd = TssSession.getInfo().getSupplyCompCd();
 			selfYn = "Y";
 		}
@@ -351,9 +379,9 @@ public class TssOrderController extends TssBaseController {
 	 * @author jsh77b
 	 * @since 2021. 05. 17
 	 */
-	@PostMapping("/seller/claim/list")
+	@PostMapping("/seller/claim/target/list")
 	@ResponseBody
-	public Collection<Order> getOrderSellerClaimList(@RequestBody Order order) throws Exception {
+	public Collection<Order> getOrderSellerClaimTargetList(@RequestBody Order order) throws Exception {
 		
 		// 값이없으면 반품접수, 교환접수
 		String [] multiChgStat = new String[2];

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

@@ -65,7 +65,7 @@
 						<td>
 							<input type="text" name="ordNo" placeholder="" maxlength="20"/>
 						</td>
-						<th>주문자명</th>
+						<th>변경요청자명</th>
 						<td>
 							<input type="text" name="chgerNm" placeholder="" maxlength="20"/>
 						</td>
@@ -73,13 +73,13 @@
 						<td>
 							<input type="text" name="goodsCd" placeholder="" maxlength="20"/>
 						</td>
-						<th>클레임상태</th>
+						<th>변경구분</th>
 						<td>
 							<select name="chgGb" id="chgGb">
 								<option value="">전체</option>
-								<option value="G685_20">취소</option>
-								<option value="G685_50">반품</option>
-								<option value="G685_50">교환</option>
+								<option value="G680_20">취소</option>
+								<option value="G680_30">반품</option>
+								<option value="G680_40">교환</option>
 							</select>
 						</td>
 					</tr>
@@ -133,6 +133,7 @@ var columnDefs = [
 	{headerName: "주문번호",			field:"ordNo",				width:100, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
 	{headerName: "주문변경번호",		field:"ordChgSq",			width:100, cellClass: 'text-center', hide: true},
+	{headerName: "변경구분",			field:"chgGbNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "클레임상태",			field:"chgStatNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "요청일시",			field:"regDt", 				width:150, cellClass: 'text-center'},
 	{headerName: "요청자명",			field:"chgerNm",			width:100, cellClass: 'text-center'},

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

@@ -23,7 +23,7 @@
 	<div class="infoBox menu-desc"></div>
 	<!-- //메뉴 설명 -->
 	
-	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/seller/claim/list'}">
+	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/seller/claim/target/list'}">
 		<input type="hidden" id="searchGb" name="searchGb" />
 		
 		<!-- 패널 영역1 -->
@@ -130,6 +130,7 @@ var columnDefs = [
 	{headerName: "주문번호",			field:"ordNo",				width:100, cellClass: 'text-center'},
 	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
 	{headerName: "주문변경번호",		field:"ordChgSq",			width:100, cellClass: 'text-center', hide: true},
+	{headerName: "변경구분",			field:"chgGbNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "클레임상태",			field:"chgStatNm", 			width:100, cellClass: 'text-center'},
 	{headerName: "요청일시",			field:"regDt", 				width:150, cellClass: 'text-center'},
 	{headerName: "요청자명",			field:"chgerNm",			width:100, cellClass: 'text-center'},