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

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

@@ -193,24 +193,23 @@ public class TsaShoplinkerService {
 				sbRequest.append("			<attribute_partner_product_id>").append(goodsMap.getAttributePartnerProductId()).append("</attribute_partner_product_id>\n");
 				sbRequest.append("			<product_name>").append(goodsMap.getProductName()).append("</product_name>\n");
 				sbRequest.append("			<detail_desc>").append(detailDesc).append("</detail_desc>\n");
+				//sbRequest.append("			<new_desc_top>").append(goodsMap.getNewDescTop()).append("</new_desc_top>\n");
 
 				// 가격연계
 				if( "Y".equals(goodsMap.getSyncYn())) {
-					//sbRequest.append("			<new_desc_top>").append(goodsMap.getNewDescTop()).append("</new_desc_top>\n");
-					//sbRequest.append("			<market_price>").append(goodsMap.getMarketPrice()).append("</market_price>\n");
+					sbRequest.append("			<market_price>").append(goodsMap.getSupplyPrice()).append("</market_price>\n");
 					sbRequest.append("			<sale_price>").append(goodsMap.getSalePrice()).append("</sale_price>\n");
 					sbRequest.append("			<supply_price>").append(goodsMap.getSupplyPrice()).append("</supply_price>\n");
-					//sbRequest.append("			<market_price_p>").append(goodsMap.getMarketPriceP()).append("</market_price_p>\n");
-					//sbRequest.append("			<sale_price_p>").append(goodsMap.getSalePriceP()).append("</sale_price_p>\n");
-					//sbRequest.append("			<supply_price_p>").append(goodsMap.getSupplyPriceP()).append("</supply_price_p>\n");
+					sbRequest.append("			<market_price_p>").append(goodsMap.getSupplyPrice()).append("</market_price_p>\n");
+					sbRequest.append("			<sale_price_p>").append(goodsMap.getSalePrice()).append("</sale_price_p>\n");
+					sbRequest.append("			<supply_price_p>").append(goodsMap.getSupplyPrice()).append("</supply_price_p>\n");
 				}else{
-					//sbRequest.append("			<new_desc_top>").append(goodsMap.getNewDescTop()).append("</new_desc_top>\n");
-					//sbRequest.append("			<market_price>").append(goodsMap.getMarketPrice()).append("</market_price>\n");
+					sbRequest.append("			<market_price>").append(0).append("</market_price>\n");
 					sbRequest.append("			<sale_price>").append(0).append("</sale_price>\n");
 					sbRequest.append("			<supply_price>").append(0).append("</supply_price>\n");
-					//sbRequest.append("			<market_price_p>").append(goodsMap.getMarketPriceP()).append("</market_price_p>\n");
-					//sbRequest.append("			<sale_price_p>").append(goodsMap.getSalePriceP()).append("</sale_price_p>\n");
-					//sbRequest.append("			<supply_price_p>").append(goodsMap.getSupplyPriceP()).append("</supply_price_p>\n");
+					sbRequest.append("			<market_price_p>").append(0).append("</market_price_p>\n");
+					sbRequest.append("			<sale_price_p>").append(0).append("</sale_price_p>\n");
+					sbRequest.append("			<supply_price_p>").append(0).append("</supply_price_p>\n");
 				}
 
 				sbRequest.append("			<sale_status>").append("001").append("</sale_status>\n"); // 판매중

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

@@ -108,6 +108,7 @@ public class TsaWithdrawController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		withdraw.setPageable(new TscPageRequest(withdraw.getPageNo() - 1, withdraw.getPageSize()));
 		withdraw.getPageable().setTotalCount(withdrawService.getRefundListCount(withdraw));
+		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
 		if ("N".equals(withdraw.getPageingYn())) {
 			withdraw.setPageable(null);
 		}
@@ -226,6 +227,7 @@ public class TsaWithdrawController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		withdrawExc.setPageable(new TscPageRequest(withdrawExc.getPageNo() - 1, withdrawExc.getPageSize()));
 		withdrawExc.getPageable().setTotalCount(withdrawService.getWithdrawExceptionListCount(withdrawExc));
+		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
 		if ("N".equals(withdrawExc.getPageingYn())) {
 			withdrawExc.setPageable(null);
 		}

src/main/java/com/style24/persistence/domain/Withdraw.java

@@ -90,6 +90,8 @@ public class Withdraw extends TscBaseDomain {
 	private String delvFeeCd;
 	private String delvFeeCdGrp;
 	private String refundConfirm;
+	private String shipCompCd;
+	
 	
 	private Integer ordNo;
 	private Integer ordDtlNo; 
@@ -145,6 +147,12 @@ public class Withdraw extends TscBaseDomain {
 		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.email(this.ordEmail) : this.ordEmail;
 	}
 
-
+	public String getMaskingSenderNm() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.senderNm) : this.senderNm;
+	}
+	
+	public String getMaskingSenderPhnno() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.phoneNo(this.senderPhnno) : this.senderPhnno;
+	}	
 
 }

src/main/java/com/style24/persistence/domain/WithdrawExc.java

@@ -4,6 +4,9 @@ import lombok.Data;
 
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
+import com.style24.core.support.session.TscSession;
+import com.style24.core.support.util.CryptoUtils;
+import com.style24.core.support.util.MaskingUtils;
 
 /**
  * 회수예외 Domain
@@ -65,7 +68,8 @@ public class WithdrawExc extends TscBaseDomain {
 	private String chgReq;
 	private String ordPhnno;
 	private String payGb;
-	
+	private String recallStatNm;
+	private String statNm;
 	
 	
 	private int chargeAmount;          // 요금총액
@@ -127,5 +131,15 @@ public class WithdrawExc extends TscBaseDomain {
 	private String goodsInfo;				// 상품정보(상품코드+사이즈코드)
 	
 	
+	// Masking
+
+	public String getMaskingCustomerName() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.customerName) : this.customerName;
+	}
+		
+	public String getMaskingOrdPhnno() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.phoneNo(this.ordPhnno) : this.ordPhnno;
+	}
+
 
 }

src/main/java/com/style24/persistence/domain/WmsWithdraw.java

@@ -61,6 +61,7 @@ public class WmsWithdraw extends TscBaseDomain {
 	private String invoiceno;			// 원운송장번호
 	private Integer orderdtlno;			// 주문상세번호
 	private String goodsCd;             // 상품코드
+	private String LogisticsCode;
 
 	private int rnum;
 	// 검색

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

@@ -33,8 +33,7 @@
 						<if test="searchTxt == '' or promotionGubun != 'freegiftSq'">
 							<if test="stDate != null and stDate != ''">
 								<if test="edDate != null and edDate != ''">
-							   AND FREEGIFT_STDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
-							   AND FREEGIFT_EDDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
+							   AND FG.REG_DT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
 								</if>
 							</if>
 						</if>
@@ -65,8 +64,7 @@
 		<if test="searchTxt == '' or promotionGubun != 'freegiftSq'">
 			<if test="stDate != null and stDate != ''">
 				<if test="edDate != null and edDate != ''">
-					AND FREEGIFT_STDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
-					AND FREEGIFT_EDDT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
+					AND FG.REG_DT BETWEEN STR_TO_DATE(#{stDate},'%Y-%m-%d%H%i%S') AND STR_TO_DATE(CONCAT(#{edDate}, '235959'),'%Y-%m-%d%H%i%S')
 				</if>
 			</if>
 		</if>

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

@@ -186,6 +186,9 @@
 			, CASE WHEN Z.CHG_GB = 'EXC' THEN '출고예외'  ELSE IFNULL(FN_GET_CODE_NM('G680', Z.CHG_GB),'회수예외') END  AS CHG_GB_NM
 			, (SELECT CHG_STAT FROM TB_ORDER_CHANGE_DETAIL C WHERE C.ORD_DTL_NO = Z.ORDER_DTL_NO AND C.DEL_YN = 'N' AND C.ORD_CHG_SQ = Z.ORD_CHG_SQ) AS CHG_STAT
 			, (SELECT D.DELV_FEE_CD FROM TB_ORDER_DETAIL D WHERE D.ORD_DTL_NO = Z.ORDER_DTL_NO ) AS DELV_FEE_CD
+			, CASE WHEN Z.RECALL_STAT = 'P' THEN '대기' ELSE '완료' END AS RECALL_STAT_NM
+			, CASE WHEN Z.RECALL_STAT = 'P' AND (SELECT CHG_STAT FROM TB_ORDER_CHANGE_DETAIL C WHERE C.ORD_DTL_NO = Z.ORDER_DTL_NO AND C.DEL_YN = 'N' AND C.ORD_CHG_SQ = Z.ORD_CHG_SQ) IN ('G685_21','G685_51') THEN '추가결제대기'
+			       WHEN Z.RECALL_STAT = 'P' THEN '대기' ELSE '완료' END AS STAT_NM
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORDER_NO, A.RECALL_EXCEPTION_NO, A.RECALL_EXCEPTION_ITEM_NO)  RNUM 
 		          , CASE WHEN A.MALL_GB = 'G011_20' THEN (SELECT MAX(BB.EXTMALL_ID) FROM TB_ORDER_DETAIL BB WHERE BB.ORD_NO = A.ORDER_NO) ELSE 'APISHOP_0054' END AS EXTMALL_ID
@@ -408,6 +411,7 @@
 						     , OC.CHG_REASON                            -- 변경사유 반품G688 교환G689
 						     , OC.WD_GB                                 -- 직접배송여부
 						     , DATE_FORMAT(OC.REG_DT, '%Y-%m-%d') AS REG_DT  -- 회수요청일
+						     , (SELECT SC.SWT_SHIP_COMP_CD FROM TB_SHIP_COMPANY SC WHERE SC.SHIP_COMP_CD = OC.SHIP_COMP_CD  ) AS SHIP_COMP_CD 
 						     , OC.WD_INVOICE_NO                         -- 회수송장번호
 						     , OC.WD_SHIP_STATE                         -- 배송업체회수상태 G320
 						     , OC.WD_STATE_DT                           -- 회수상태 수신일시 

src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionForm.html

@@ -46,7 +46,7 @@
 						</colgroup>
 
 						<tr>
-							<th>기간<em class="required" title="필수"></em></th>
+							<th>등록기간<em class="required" title="필수"></em></th>
 							<td id="sellTerms"></td>
 						</tr>
 

src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -101,6 +101,7 @@
 					<ul class="panelBar">
 						<li class="center">
 						<button type="button" class="btn btn-base btn-lg btn-lg" id="btnSearch">조회</button>
+						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset(); fnInitCalendar();">초기화</button>
 						</li>
 					</ul>
 			</div>
@@ -152,10 +153,10 @@
 			}
 		},
 		{headerName: "회수송장번호", field: "wdInvoiceNo", 	width: 100, cellClass: 'text-center'},
-		{headerName: "보내는사람", 	field: "senderNm", 		width: 100, cellClass: 'text-center'},
-		{headerName: "보낸연락처", 	field: "senderPhnno", 	width: 120, cellClass: 'text-center'},
-		{headerName: "주문자명", 	field: "ordNm",			width: 100, cellClass: 'text-center'},
-		{headerName: "주문자연락처", field: "ordPhnno",		width: 120, cellClass: 'text-center'},
+		{headerName: "보내는사람", 	field: "maskingSenderNm", 		width: 100, cellClass: 'text-center'},
+		{headerName: "보낸연락처", 	field: "maskingSenderPhnno", 	width: 120, cellClass: 'text-center'},
+		{headerName: "주문자명", 	field: "maskingOrdNm",			width: 100, cellClass: 'text-center'},
+		{headerName: "주문자연락처", field: "maskingOrdPhnno",		width: 120, cellClass: 'text-center'},
 		{headerName: "도착일", 		field: "arrivalDt", 	width: 100,  cellClass: 'text-center'},
 		{headerName: "환불확정일", 	field: "completeDt",	width: 100,  cellClass: 'text-center'},
 		{headerName: "WMS회수메모", 	field: "wdMemo", 		width: 200,  cellClass: 'text-left'},
@@ -246,7 +247,13 @@
 		} 
 	}
 
-
+	/*************************************************************************
+	*  달력 초기화 
+	**************************************************************************/		
+	var fnInitCalendar = function() {
+		gagajf.setDate('#terms', 'stDate', 'edDate', '7d');
+	}
+	
 	/*************************************************************************
 	*  회수 상세 화면
 	**************************************************************************/		

src/main/webapp/WEB-INF/views/withdraw/WithdrawDirectiveListForm.html

@@ -201,7 +201,15 @@
 		{headerName: "수량", 			field: "chgQty", 		width: 80, cellClass: "text-center"},
 		{headerName: "반품방식", 		field: "wdGbNm", 			width: 80, cellClass: "text-center"},
 		{headerName: "택배사전송", 		field: "sendYn", 		width: 80, cellClass: "text-center"},
-		{headerName: "회수송장번호", 	field: "wdInvoiceNo", 	width: 100, cellClass: "text-center"},
+		{headerName: "회수송장번호", 	field: "wdInvoiceNo", 	width: 100, cellClass: "text-center"
+			, cellRenderer	: function (params) {
+				var retStr = '';
+				if (!gagajf.isNull(params.value) && !gagajf.isNull(params.data.shipCompCd)) {
+					retStr = '<a href="javascript:void(0);" onclick="fnSweetTracker(\'' + params.data.shipCompCd + '\',\'' + params.data.wdInvoiceNo + '\');">' + params.value + '</a>';
+				}
+				return retStr;
+			}			
+		},
 		{headerName: "회수상태", 		field: "wdShipStateNm", width: 120, cellClass: "text-center"},
 		{headerName: "회수상태수신일시", field: "wdStateDt", 	width: 120, cellClass: "text-center"},
 		{headerName: "미회수사유", 		field: "wdReasonCdNm", 	width: 100, cellClass: "text-center"},
@@ -432,7 +440,14 @@
 		gridOptions.api.exportDataAsExcel(params);
 		
 	});
-
+	
+	// 2021.06.17스윗트래커 송장조회
+	var fnSweetTracker = function (shipCompCd, invoiceNo) {
+		var actionUrl = "/order/delivery/sweetTrackerDeliveryInfo?shipCompCd=" + shipCompCd + "&invoiceNo=" + invoiceNo;
+		cfnOpenModalPopup(actionUrl, 'popupSweetTrackerDeliveryInfo');
+		
+	};
+	
 	$(document).ready(function() {
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -55,7 +55,7 @@
 							</td>
 							<th class="dashR">주문번호</th>
 							<td class="dashR">
-								<input type="text" class="w40p" name="orderNo" placeholder="" maxlength="20" data-valid-type="numeric"/>
+								<input type="text" class="w40p" name="orderNo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="9" />
 							</td>
 							<th class="dashR">처리상태</th>
 							<td class="dashR">
@@ -152,7 +152,7 @@
 	var columnDefs = [
 		{headerName: "반품예외처리번호",		field: "recallExceptionNo", width: 50,	cellClass: 'text-center', hide: true},
 		//{headerName: "No.",				field: "rnum",				width: 50,	cellClass: 'text-center'},
-		{headerName: "",			field: "recallStat",		width: 100,	cellClass: 'text-center',
+		{headerName: "",			field: "recallStatNm",		width: 100,	cellClass: 'text-center',
 			/*
 			rowSpan: params => params.data.rowspanRank === 1 ? params.data.rowspanCnt : 1,  
 		    cellClassRules: {
@@ -170,12 +170,12 @@
 				return btnText;
 			}			
 		},
-		{headerName: "처리상태",			field: "recallStat",		width: 80,	cellClass: 'text-center',
+		{headerName: "처리상태",			field: "statNm",		width: 80,	cellClass: 'text-center'
 			/*
 			rowSpan: params => params.data.rowspanRank === 1 ? params.data.rowspanCnt : 1,  
 			    cellClassRules: {
 			        'cell-span': "data.rowspanRank == 1"
-			      }, */
+			      }, 
 				cellRenderer: function(params) {
 					var btnText = '';
 					if(params.data.recallStat == 'P') {
@@ -186,7 +186,8 @@
 						}
 					} else { btnText = '완료' }
 					return btnText;
-				}			
+				}	
+			      */
 			},		
 		{headerName: "주문번호",			field: "orderNo",			width: 100,	cellClass: 'text-center', 
 			/*
@@ -238,9 +239,9 @@
 				}		
 		},
 			
-		{headerName: "주문자명",			field: "customerName",		width: 100,	cellClass: 'text-center'},
-		{headerName: "휴대번호",			field: "ordPhnno",			width: 100,	cellClass: 'text-center'},
-		{headerName: "LMS", 			field: "ordPhnno",			width: 80, cellClass: "text-center",
+		{headerName: "주문자명",			field: "maskingCustomerName",		width: 100,	cellClass: 'text-center'},
+		{headerName: "휴대번호",			field: "maskingOrdPhnno",			width: 100,	cellClass: 'text-center'},
+		{headerName: "LMS", 			field: "maskingOrdPhnno",			width: 80, cellClass: "text-center",
 			cellRenderer: function(params) {
 				return '<button type="button" class="btn btn-base btn-sm" onclick="fnLms(\'' + params.data.ordPhnno + '\',\'' + params.data.custNo + '\');">&nbsp;LMS&nbsp;</button>';
 			}			
@@ -340,7 +341,7 @@
 		{headerName: "주문수량",			field: "qty",				width: 80,	cellClass: 'text-right'},
 		{headerName: "입고수량",			field: "exceptionQty",		width: 80,	cellClass: 'text-right'},
 		{headerName: "택배사명",			field: "logisticsName",		width: 100,	cellClass: 'text-center'},
-		{headerName: "반송장번호",			field: "invoiceNo",			width: 120,	cellClass: 'text-center'},
+		{headerName: "반송장번호",		field: "invoiceNo",			width: 120,	cellClass: 'text-center'},
 		{headerName: "주문경로",			field: "siteCd",			width: 100,	cellClass: 'text-left'},
 		{headerName: "등록일시",			field: "dateCreated",		width: 150,	cellClass: 'text-center'}
 		

src/main/webapp/WEB-INF/views/withdraw/WmsWithdrawListForm.html

@@ -55,7 +55,7 @@
 							</td>
 							<th class="dashR">주문번호</th>
 							<td class="dashR">
-								<input type="text" class="w40p" name="orderno" placeholder="" maxlength="20" data-valid-type="numeric"/>
+								<input type="text" class="w40p" name="orderno" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="9" />
 							</td>
 							<th class="dashR">입고상태</th>
 							<td class="dashR">
@@ -281,7 +281,13 @@
 		
 	}
 
-
+	// 2021.06.17스윗트래커 송장조회
+	var fnSweetTracker = function (shipCompCd, invoiceNo) {
+		var actionUrl = "/order/delivery/sweetTrackerDeliveryInfo?shipCompCd=" + shipCompCd + "&invoiceNo=" + invoiceNo;
+		cfnOpenModalPopup(actionUrl, 'popupSweetTrackerDeliveryInfo');
+		
+	};
+	
 	/*************************************************************************
 	*  엑셀다운로드
 	**************************************************************************/