Merge remote-tracking branch '112.172.147.34/style' into 제휴몰검색기능

src/main/java/com/style24/admin/biz/service/TsaShoplinkerService.java

@@ -724,12 +724,14 @@ public class TsaShoplinkerService {
 				//cert_item 의 경우 인증코드 값이 있으면 'C011', 없으면 'C010'
 				if("".equals(map.getCertNo())){
 					sbRequest.append("				<cert_item>").append("C010").append("</cert_item>\n");
+					sbRequest.append("				<cert_organ><![CDATA[.]]></cert_organ>\n");
+					sbRequest.append("				<cert_no><![CDATA[.]]></cert_no>\n");
 				}else {
 					sbRequest.append("				<cert_item>").append("C011").append("</cert_item>\n");
+					sbRequest.append("				<cert_organ><![CDATA[").append(map.getCertOrgan()).append("]]></cert_organ>\n");
+					sbRequest.append("				<cert_no><![CDATA[").append(map.getCertNo()).append("]]></cert_no>\n");
 				}
 
-				sbRequest.append("				<cert_organ><![CDATA[").append(map.getCertOrgan()).append("]]></cert_organ>\n");
-				sbRequest.append("				<cert_no><![CDATA[").append(map.getCertNo()).append("]]></cert_no>\n");
 				sbRequest.append("			</cert>\n");
 				sbRequest.append("		</certinfo>\n");
 				sbRequest.append("	</product>\n");

src/main/java/com/style24/admin/biz/service/TsaWithdrawService.java

@@ -562,7 +562,7 @@ public class TsaWithdrawService {
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new IllegalStateException("실패");
+			throw new IllegalStateException(e.getMessage());
 		}
 	}
 

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

@@ -635,6 +635,7 @@
 		INNER JOIN TB_CUSTOMER C ON CS.CUST_NO = C.CUST_NO
 		WHERE CS.COUNSEL_TYPE = 'C'
 		AND   CS.CUST_NO = #{custNo}
+		AND   CS.DEL_YN = 'N'
 		ORDER BY CS.REG_DT DESC
 	</select>
 

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

@@ -174,9 +174,9 @@
 		/* TsaShoplinker.getCert */
 		SELECT
 			B.GOODS_CD AS PARTNER_PRODUCT_ID
-			, CASE B.CERT_ORGAN_NAME
-				WHEN NULL THEN '.' WHEN '' THEN '.'
-				ELSE B.CERT_ORGAN_NAME
+			, CASE 
+				WHEN B.CERT_ORGAN_NAME = '' THEN '.' 
+				ELSE IFNULL(B.CERT_ORGAN_NAME, '.')
 			 END AS CERT_ORGAN
 			, IFNULL(B.CERT_NUM, '') AS CERT_NO
 			, A.SELF_GOODS_YN

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

@@ -37,7 +37,7 @@
 
 				<div id="delvCdList">
 					<h4>배송정보</h4>
-					<div id="gridDelvCdList" style="width:100%; height: 140px;" class="ag-theme-balham"></div>
+					<div id="gridDelvCdList" style="width:100%; height: 66px;" class="ag-theme-balham"></div>
 				</div>
 
 				<h4 id="h4DelvInfoList">배송비정보</h4>
@@ -1834,11 +1834,17 @@ $(document).ready(function() {
 	gagaAgGrid.hideStatusBar('gridDelvCdList');
 	
 	// 2. 회수구분처리
-	if (wdGb == 'D') {
-		$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
-	} else {
+	// 2021.11.22 입점업체인 경우에는 회수요청만 해당
+	if (selfGoodsYn == "N") {
 		$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
-		$('#delvCdList').css('display', 'none');
+		$('input:radio[name=wdGb]').attr('disabled', true);
+	} else {
+		if (wdGb == 'D') {
+			$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
+		} else {
+			$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+			$('#delvCdList').css('display', 'none');
+		}
 	}
 	
 	// 3. 무통장입금아닐때 환불계좌 목록 숨김처리