Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

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

@@ -1390,6 +1390,7 @@ public class TsaGoodsService {
 		regGoods.setBrandCd(goods.getBrandCd());
 		regGoods.setItemkindCd(goods.getItemkindCd());
 //		regGoods.setGoodsNm(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsNm(), "&lt;", "<"), "&gt;", ">"));
+		regGoods.setGoodsNm(goods.getGoodsNm());
 		regGoods.setStyleYear(goods.getStyleYear());
 		regGoods.setSeasonCd(goods.getSeasonCd());
 		regGoods.setSexGb(goods.getSexGb());
@@ -1471,6 +1472,7 @@ public class TsaGoodsService {
 		regGoods.setBrandCd(goods.getBrandCd());
 		regGoods.setItemkindCd(goods.getItemkindCd());
 //		regGoods.setGoodsNm(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsNm(), "&lt;", "<"), "&gt;", ">"));
+		regGoods.setGoodsNm(goods.getGoodsNm());
 		regGoods.setStyleYear(goods.getStyleYear());
 		regGoods.setSeasonCd(goods.getSeasonCd());
 		regGoods.setSexGb(goods.getSexGb());

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

@@ -65,7 +65,8 @@ public class TsaOrderChangeService {
 		orderChange.setWdTargetYn(this.getWdTargetYnInfo(orderChange));
 
 		// 3. WMS 반품 정보 삭제 처리
-		coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
+		// 2021.07.14 card007 반품 철회 시 WMS 정보 삭제 처리
+		// coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
 
 		// 4. 회수송장정보 설정
 		orderChange = this.setWdInvoiceInfo(orderChange);
@@ -90,7 +91,8 @@ public class TsaOrderChangeService {
 		orderChange.setWdTargetYn("N");
 
 		// 3. WMS 반품 정보 삭제 처리
-		coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
+		// 2021.07.14 card007 반품 철회 시 WMS 정보 삭제 처리
+		// coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
 
 		// 4. 회수송장정보 설정
 		orderChange = this.setWdInvoiceInfo(orderChange);
@@ -126,7 +128,8 @@ public class TsaOrderChangeService {
 		orderChange.setWdTargetYn("N");
 
 		// 3. WMS 교환 정보 삭제 처리
-		coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
+		// 2021.07.14 card007 교환 철회 시 WMS 정보 삭제 처리
+		// coreWmsService.updateWmsRecallCancel(orderChange.getOrdNo(), orderChange.getOrdChgSq());
 
 		// 4. 회수송장정보 설정
 		orderChange = this.setWdInvoiceInfo(orderChange);

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

@@ -240,15 +240,19 @@ public class TsaShoplinkerService {
 				sbRequest.append("	</productInfo>\n");
 				sbRequest.append("</shoplinker>\n");
 
-				if( null != goodsMap.getShoplinkerItemkindNm()) {
+				if( null != goodsMap.getShoplinkerItemkindNm() && !"".equals(detailDesc)){
 					// api 호출 및 결과 history 저장
 					callGoodsRegApi(regMap , sbRequest, "product");
 
 				}else {
-					// 품목매핑정보 없음. 전송 안함
+					// 품목매핑정보 또는 상세내용 없음. 전송 안함
 					regMap.setXmlTxt(sbRequest.toString());
 					regMap.setApiResult(TscConstants.ShoplinkerApiStat.S_ERROR.value());
-					regMap.setApiMessage("API 전송안함 : 샵링커 품목매핑정보가 없습니다. (자사품목코드: "+goodsMap.getItemkindCd()+")");
+					if( "".equals(detailDesc)) {
+						regMap.setApiMessage("API 전송안함 : 상세설명 관련정보가 없습니다.");
+					}else {
+						regMap.setApiMessage("API 전송안함 : 샵링커 품목매핑정보가 없습니다. (자사품목코드: "+goodsMap.getItemkindCd()+")");
+					}
 					tscShoplinkerDao.insertShoplinerApiHst(regMap);
 				}
 			}else {
@@ -280,11 +284,13 @@ public class TsaShoplinkerService {
 		// 상세폼신규사용여부 N: 기존 정보 / Y : html 형식
 		if( "N".equals(goodsMap.getTobeFormYn())){
 			String descStr = goodsMap.getDetailDesc();
-			descStr = descStr.replace("http://www.istyle24.com/Upload/", "http://image.istyle24.com/Local/")
-					.replace("/Upload", "http://image.istyle24.com/Local")
-					.replace("http://www.istyle24.com/Images", "http://image.istyle24.com/Statics/design/Images");
+			if( null != descStr) {
+				descStr = descStr.replace("http://www.istyle24.com/Upload/", "http://image.istyle24.com/Local/")
+						.replace("/Upload", "http://image.istyle24.com/Local")
+						.replace("http://www.istyle24.com/Images", "http://image.istyle24.com/Statics/design/Images");
 
-			htmlDesc = descStr;
+				htmlDesc = descStr;
+			}
 
 		}else {
 
@@ -331,13 +337,15 @@ public class TsaShoplinkerService {
 			}
 
 			// 제대로된 정보 없을 경우, 기존 상세내용으로 보냄
-			if( "".equals(dImgFront) || "".equals(dImgBack)) {
+			if( "".equals(dImgFront)) {
 				String descStr = goodsMap.getDetailDesc();
-				descStr = descStr.replace("http://www.istyle24.com/Upload/", "http://image.istyle24.com/Local/")
-						.replace("/Upload", "http://image.istyle24.com/Local")
-						.replace("http://www.istyle24.com/Images", "http://image.istyle24.com/Statics/design/Images");
+				if( null != descStr) {
+					descStr = descStr.replace("http://www.istyle24.com/Upload/", "http://image.istyle24.com/Local/")
+							.replace("/Upload", "http://image.istyle24.com/Local")
+							.replace("http://www.istyle24.com/Images", "http://image.istyle24.com/Statics/design/Images");
 
-				htmlDesc = descStr;
+					htmlDesc = descStr;
+				}
 
 			}else {
 

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

@@ -1674,9 +1674,15 @@
 		  , #{pntMrate}
 		  , #{sellFeeRate}
 		  , #{formalGb}
-		  , IFNULL(#{minOrdQty},1)
-		  , IFNULL(#{maxOrdQty},20)
-		  , IFNULL(#{dayMaxOrdQty},20)
+		  , CASE WHEN NULLIF(#{minOrdQty},'') IS NULL THEN 1
+		         WHEN #{minOrdQty} = 0 THEN 1
+		         ELSE #{minOrdQty} END
+		  , CASE WHEN NULLIF(#{maxOrdQty},'') IS NULL THEN 20
+		         WHEN #{maxOrdQty} = 0 THEN 20
+		         ELSE #{maxOrdQty} END
+		  , CASE WHEN NULLIF(#{dayMaxOrdQty},'') IS NULL THEN 20
+		         WHEN #{dayMaxOrdQty} = 0 THEN 20
+		         ELSE #{dayMaxOrdQty} END
 		  , IFNULL(#{giftPackYn},'N')
 		  , #{originCd}
 		  , #{makeYmd}

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

@@ -34,7 +34,7 @@
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" th:unless="${ordChgSq > 0}" id="fnExchangeRequestSubmit" onclick="fnExchange()">교환요청</button>
-					<button type="button" class="btn btn-success" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
+					<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (recallExceptionInfo != null and (chgStat == 'G685_30' or chgStat == 'G685_31'))}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
 					<button type="button" class="btn btn-success" th:if="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}" id="fnReturnToExchangeSubmit" onclick="fnExchange()">교환변경</button>
 				</div>
 				
@@ -623,12 +623,6 @@ var fnChangeChgReason = function(reasonCd){
 			$('#wdBfSendYn').attr('disabled', false);
 		}
 	}
-	
-	// 2021.05.25 반품접수, 반품대기 상태에서만 철회가능
-	// 2021.07.13 회수예외정보가 있고 회수요청, 상품검수중 상태에서 철회 가능 처리
-	if (chgStat != "G685_20" && chgStat != "G685_21" && (recallExceptionInfo == null || (chgStat != "G685_30" && chgStat != "G685_31"))) {
-		$("#fnExchangeCancelRequestSubmit").css("display", "none");
-	}
 
 	$('#exchangeRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
 	$('#exchangeRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);
@@ -642,6 +636,10 @@ var fnExchange = function () {
 	var qty		= true;
 	var opt		= true;
 	var wdGb	= $('#wdGb:checked').val();
+	
+	if (ordChgGb == 'G681_50') {
+		wdGb = 'D';
+	}
 
 	// 1. 교환수량 체크
 	//$.each(cancelRequestTargetList, function(idx, item) {
@@ -1207,13 +1205,19 @@ $(document).ready(function() {
 	fnSetExchangeAddr();
 	
 	// 5. 회수방법 라디오 체크 처리
-	if (wdGb == 'D') {
+	if (ordChgGb != 'G681_50') {
 		$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
 		$('.chger').css('display', 'none');
+		$('input:radio[name=wdGb]').attr('disabled', true);
 	} else {
-		$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+		if (wdGb == 'D') {
+			$('input:radio[name="wdGb"]:radio[value="D"]').prop('checked', true);
+			$('.chger').css('display', 'none');
+		} else {
+			$('input:radio[name="wdGb"]:radio[value="W"]').prop('checked', true);
+		}
 	}
-	
+
 	// 교환철회 처리
 	if (ordChgSq > 0) {
 		// 5. 교환사유설정