Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -4807,7 +4807,7 @@ public class TscOrderChangeService {
 			sb.append("																									<img src=\"");
 			sb.append(imgUrl);
 			sb.append(orderChange.getSysImgNm());
-			sb.append("?RS=100\" alt=\"이미지\" style=\"width: 100px;height: 150px;margin:0;padding:0\">\n");
+			sb.append("?RS=100\" alt=\"이미지\" style=\"width: 100px;height: auto;margin:0;padding:0\">\n");
 			sb.append("																								</span>\n");
 			sb.append("																							</a>\n");
 			sb.append("																						</td>\n");

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -327,7 +327,8 @@ public class TscOrderService {
 			, "할인금액"
 			, "실결제금액"
 			, "배송비"
-			, "송장"
+			, "배송업체코드"
+			, "송장번호"
 			, "배송메모"
 		};
 
@@ -359,6 +360,7 @@ public class TscOrderService {
 			, "totDcAmt"
 			, "realOrdAmt"
 			, "realDelvAmt"
+			, "shipCompCd"
 			, "invoiceNo"
 			, "delvMemo"
 		};
@@ -392,6 +394,7 @@ public class TscOrderService {
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
+			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 		};
 
 		GagaExcelResultHandler<Order> handler = new GagaExcelResultHandler<>(excelFilenameWithPath, "출고배송목록(입점)", listTitles, cellNames, cellTypes);

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

@@ -27,7 +27,7 @@
 		<choose>
 			<when test='bizTime != null and bizTime == "Y"'>
 		       CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		        END
 			</when>
@@ -67,7 +67,7 @@
 		<choose>
 			<when test='bizTime != null and bizTime == "Y"'>
 		       CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		        END
 			</when>
@@ -115,7 +115,7 @@
 		<choose>
 			<when test='bizTime != null and bizTime == "Y"'>
 		       CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		        END
 			</when>
@@ -155,7 +155,7 @@
 		<choose>
 			<when test='bizTime != null and bizTime == "Y"'>
 		       CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		        END
 			</when>
@@ -195,7 +195,7 @@
 		<choose>
 			<when test='bizTime != null and bizTime == "Y"'>
 		       CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		        END
 			</when>
@@ -243,7 +243,7 @@
 		<choose>
 			<when test='bizTime != null and bizTime == "Y"'>
 		       CASE WHEN DATE_FORMAT(NOW(), '%H') <![CDATA[<=]]> 8 THEN STR_TO_DATE(CONCAT(DATE_FORMAT(NOW(), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
-		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 20 THEN NOW()
+		            WHEN DATE_FORMAT(NOW(), '%H') BETWEEN 9 AND 19 THEN NOW()
 		            ELSE STR_TO_DATE(CONCAT(DATE_FORMAT(ADDDATE(NOW(), INTERVAL 1 DAY), '%Y-%M-%D'), ' 9'), '%Y-%M-%D %H')
 		        END
 			</when>

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

@@ -299,13 +299,13 @@
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
 		     , CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
-		     , DF.REAL_DELV_AMT
 		     , OD.ORD_QTY
 		     , OD.CNCL_RTN_QTY
 		     , OD.ORD_AMT
 		     , OD.CNCL_RTN_AMT
 		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
 		     , OD.REAL_ORD_AMT
+		     , OD.SHIP_COMP_CD
 		     , OD.INVOICE_NO
 		     , DA.DELV_MEMO
 		FROM   TB_ORDER O

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

@@ -523,6 +523,7 @@
 	 	and B.AGENT_ORDER_ID IS NOT NULL
 	 	and B.ORD_DTL_STAT = 'G013_50' -- 배송중
 		and B.DELV_STDT IS NOT NULL
+		and b.EXTMALL_ID != 'TIMON' /* 티몬제외 */
 		AND NOT EXISTS(SELECT 1 FROM SHOPLINKER_SYNC_HST S
 			WHERE S.API_TYPE = 'INVOICE' AND S.ORD_DTL_NO = B.ORD_DTL_NO
 			AND API_RESULT != 'error'