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

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

@@ -350,18 +350,37 @@ public class TsaShoplinkerService {
 				htmlDesc = descStr;
 
 			}else {
-
-				// 1) 상세내용 - 상품설명
-				htmlDesc = "<div class=\"st_descrp_box\" style=\"max-height:1100px; overflow:hidden; text-align: left; color:#222;\">";
-				if( null != goodsMap.getDetailDescNew20()) {
+				// 1) 상세내용 - 모델 착용컷
+				String modelDesc = "";
+				if( 0 < dImgModelList.size()) {
+					modelDesc += "<div class=\"st_view_outfit_box\" style=\"margin-top: 100px;text-align: center;\">";
+					modelDesc += "<span class=\"st_tit_view\" style=\"display: block;color: #222;font-size: 32px;font-weight: 300;text-align: center;\">OUTFIT VIEW</span>";
+					if(!StringUtils.isBlank(goodsMap.getModelInfo())) {
+						modelDesc += "<span class=\"st_model_info\" style=\"display: block;margin-top: 20px;color: #666;font-size: 16px;font-weight: 200;text-align: center;\">"+goodsMap.getModelInfo()+"</span>";
+					}
+					modelDesc += "<div class=\"st_view\" style=\"margin-top: 40px;\">";
+					for(String img : dImgModelList) {
+						modelDesc += "<img src=\""+ img +"\" alt=\"\" style=\"display: block;margin: 10px auto 0; max-width:720px;width:auto;\">";
+					}
+					modelDesc += "</div>";
+					modelDesc += "</div>";
+					modelDesc += "<div style=\"height:100px;\"></div>";
+					htmlDesc = modelDesc;
+				}
+				
+				// 2) 상세내용 - 상품설명
+				htmlDesc += "<div class=\"st_descrp_box\" style=\"max-height:1100px; overflow:hidden; text-align: left; color:#222;\">";
+				if(!StringUtils.isBlank(goodsMap.getDetailDescNew20())) {
 					htmlDesc += "<div class=\"st_desc_simple\" style=\"position:relative; margin-top:0px; margin-left:auto; margin-right:auto;\">";
-					htmlDesc += "<span class=\"st_tit_desc\" style=\"display:block; margin-bottom:10px; font-size:18px; font-weight:500; letter-spacing:-0.025em;\">"+goodsMap.getDetailDescNew10()+"</span>";
+					if(!StringUtils.isBlank(goodsMap.getDetailDescNew10())) {
+						htmlDesc += "<span class=\"st_tit_desc\" style=\"display:block; margin-bottom:10px; font-size:18px; font-weight:500; letter-spacing:-0.025em;\">"+goodsMap.getDetailDescNew10()+"</span>";
+					}
 					htmlDesc += "<span class=\"st_ptxt01\" style=\"font-size:16px;font-weight:200;line-height:1.5;word-break:keep-all;color:#666666;\">";
 					htmlDesc += goodsMap.getDetailDescNew20();
 					htmlDesc += "</span>";
 					htmlDesc += "</div>";
 				}
-				if( null != goodsMap.getDetailDescNew30()) {
+				if(!StringUtils.isBlank(goodsMap.getDetailDescNew30())) {
 					htmlDesc += "<div class=\"st_desc_character\" style=\"position:relative; margin-top:40px; margin-left:auto; margin-right:auto;\">";
 					htmlDesc += "<span class=\"st_tit_desc\" style=\"display:block; margin-bottom:10px; font-size:18px; font-weight:500; letter-spacing:-0.025em;\">상품특징</span>";
 					htmlDesc += "<span class=\"st_ptxt01\" style=\"font-size:16px;font-weight:200;line-height:1.5;word-break:keep-all;color:#666666;\">";
@@ -371,7 +390,7 @@ public class TsaShoplinkerService {
 				}
 				htmlDesc += "</div>";
 
-				// 2) 상세내용 - 상품옵션별 색상
+				// 3) 상세내용 - 상품옵션별 색상
 				String colorDesc = "";
 				imgParam.setExtmallDescImgYn("N");
 				imgParam.setColorListYn("Y"); // 색상별 이미지 정보만 가져옴
@@ -390,7 +409,7 @@ public class TsaShoplinkerService {
 						// 동일색상끼리 이미지 세팅
 						for(ShoplinkerGoods ic2 : imgColorList ) {
 							if( tmpColor.equals(ic2.getColorCd())) {
-								colorDesc += "<img src=\""+ imgPath+"/"+ic2.getSysImgNm()+"\" alt=\"\" style=\"max-width:100%;margin: 10px auto 0;display: block;\">";
+								colorDesc += "<img src=\""+ imgPath+"/"+ic2.getSysImgNm()+"\" alt=\"\" style=\"max-width:720px;width:auto;margin: 10px auto 0;display: block;\">";
 							}
 						}
 
@@ -401,27 +420,14 @@ public class TsaShoplinkerService {
 				colorDesc += "</div>";
 				htmlDesc += colorDesc;
 
-				// 3) 상세내용 - 모델 착용컷
-				String dtlDesc = "";
-				if( 0 < dImgModelList.size()) {
-					dtlDesc += "<div class=\"st_view_outfit_box\" style=\"margin-top: 100px;text-align: center;\">";
-					dtlDesc += "<span class=\"st_tit_view\" style=\"display: block;color: #222;font-size: 32px;font-weight: 300;text-align: center;\">OUTFIT VIEW</span>";
-					dtlDesc += "<span class=\"st_model_info\" style=\"display: block;margin-top: 20px;color: #666;font-size: 16px;font-weight: 200;text-align: center;\">"+goodsMap.getModelInfo()+"</span>";
-					dtlDesc += "<div class=\"st_view\" style=\"margin-top: 40px;\">";
-					for(String img : dImgModelList) {
-						dtlDesc += "<img src=\""+ img +"\" alt=\"\" style=\"display: block;margin: 10px auto 0; max-width: 100%;\">";
-					}
-					dtlDesc += "</div>";
-					dtlDesc += "</div>";
-				}
-
 				// 4) 상세내용 - 상품컷
+				String dtlDesc = "";
 				if( 0 < dImgDetailList.size()) {
 					dtlDesc += "<div class=\"st_view_detail_box\" style=\"margin-top: 100px;text-align: center;\">";
 					dtlDesc += "<span class=\"st_tit_view\" style=\"display: block;color: #222;font-size: 32px;font-weight: 300;text-align: center;\">PRODUCT VIEW</span>";
 					dtlDesc += "<div class=\"st_view\" style=\"margin-top: 40px;\">";
 					for(String img : dImgDetailList) {
-						dtlDesc += "<img src=\""+ img +"\" alt=\"\" style=\"display: block;margin: 10px auto 0; max-width: 100%;\">";
+						dtlDesc += "<img src=\""+ img +"\" alt=\"\" style=\"display: block;margin: 10px auto 0; max-width:720px;width:auto;\">";
 					}
 	                dtlDesc += "</div>";
 	        		dtlDesc += " </div>";
@@ -432,7 +438,7 @@ public class TsaShoplinkerService {
 	        		dtlDesc += "<div class=\"st_view_fabric_box\" style=\"margin-top: 100px;text-align: center;\">";
 	        		dtlDesc += "<span class=\"st_tit_view\" style=\"display: block;color: #222;font-size: 32px;font-weight: 300;text-align: center;\">FABRIC</span>";
 	        		dtlDesc += "<div class=\"st_view\" style=\"margin-top: 40px;\">";
-	        		dtlDesc += "<img src=\""+dMaterial +"\" alt=\"\" style=\"display: block;margin: 10px auto 0;margin-top: 0; max-width: 100%;\">";
+	        		dtlDesc += "<img src=\""+dMaterial +"\" alt=\"\" style=\"display: block;margin: 10px auto 0;margin-top: 0; max-width:720px;width:auto;\">";
 	                dtlDesc += "</div>";
 	                dtlDesc += "</div>";
 				}
@@ -444,7 +450,7 @@ public class TsaShoplinkerService {
 	                dtlDesc += "<div class=\"st_view\" style=\"margin-top: 40px;\">";
 	                dtlDesc += "<span style=\"display:inline-block;\">";
 	                for(String img : dLabelList) {
-						dtlDesc += "<img src=\""+ img +"\" alt=\"\" style=\"float:left; margin-top:0; margin-left:20px; max-width: 100%;\">";
+						dtlDesc += "<img src=\""+ img +"\" alt=\"\" style=\"float:left; margin-top:0; margin-left:20px; max-width: 250px;width:100%;\">";
 					}
 	                dtlDesc += "</span>";
 	                dtlDesc += "</div>";
@@ -543,40 +549,45 @@ public class TsaShoplinkerService {
 					htmlDesc += "</div>";
 					htmlDesc += " </div>";
                 }
-
+                
+                // https 추가
+                if( -1 < htmlDesc.indexOf("src=\"//image")) {
+    				htmlDesc = htmlDesc.replaceAll("src=\"//image", "src=\"https://image");
+    			}
 
                 // 8) 상세내용 - 상품필수정보
                 ShoplinkerGoods certInfo = admShoplinkerDao.getCert(shoplinkerGoods);
                 if( null != certInfo) {
                 	if( "G083_1".equals(certInfo.getCertTargetGb())) {	// 인증대상
 
-                		if( "".equals(certInfo.getCertNum())) {
-
-                			htmlDesc += "<div class=\"st_required_box\" style=\"margin-bottom:80px;\">";
-                			htmlDesc += "<div class=\"st_area_kcl\" style=\"color:#222;display:block; position:relative; min-height:160px; margin-top:100px; padding:40px 40px 40px 160px; box-sizing:border-box; background:#f5f5f5;\">";
-                			htmlDesc += "<i class=\"st_ico_kcl\" style=\"position:absolute;left:64px;top:50%;transform:translateY(-50%);z-index:2;background-image: url(/images/pc/ico_kcl.png);width: 32px;height: 50px;display: inline-block;vertical-align: middle;background-repeat: no-repeat;background-size: contain;background-position: 0% 0%;\"></i>";
-                			htmlDesc += "<p class=\"st_tit\" style=\"margin-top:0;color:#222;font-size:16px;font-weight:300;line-height:1;letter-spacing:-0.025em;\">";
-                			htmlDesc += certInfo.getCertTargetNm() +"/"+ certInfo.getCertOrganName();
-                            htmlDesc += "</p>";
-                            htmlDesc += "<p style=\"margin-top:20px; color:#222; font-size:13px; font-weight: 300; line-height:1; letter-spacing:-0.025em;\">";
-                        	htmlDesc += certInfo.getCertDiv();
-                        	htmlDesc += "</p>";
-                            htmlDesc += "<p class=\"st_dot_info\" style=\"color: #888888;position:relative;margin-top:20px;font-size:13px;font-weight:300;line-height:1;letter-spacing:-0.025em;\">";
-                            htmlDesc += "<span style=\"color: #888888 !important;background: #888888 !important;display: inline-block;width: 2px;height: 2px;position: relative;top: -4px;left: 0px;margin-right: 4px;\"></span>";
-                            htmlDesc += "해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.";
-                            htmlDesc += "</p>";
-                            htmlDesc += "</div>";
-                            htmlDesc += "</div>";
+                		if( null == certInfo.getCertNum() || "".equals(certInfo.getCertNum())) {
+                			if( null != certInfo.getCertDiv()) {
+	                			htmlDesc += "<div class=\"st_required_box\" style=\"margin-bottom:80px;\">";
+	                			htmlDesc += "<div class=\"st_area_kcl\" style=\"color:#222;display:block; position:relative; min-height:160px; margin-top:100px; padding:40px 40px 40px 160px; box-sizing:border-box; background:#f5f5f5;\">";
+	                			htmlDesc += "<i class=\"st_ico_kcl\" style=\"position:absolute;left:64px;top:50%;transform:translateY(-50%);z-index:2;background-image: url('https://image.istyle24.com/Style24/images/pc/ico_kcl.png');width: 32px;height: 50px;display: inline-block;vertical-align: middle;background-repeat: no-repeat;background-size: contain;background-position: 0% 0%;\"></i>";
+	                			htmlDesc += "<p class=\"st_tit\" style=\"margin-top:0;color:#222;font-size:16px;font-weight:300;line-height:1;letter-spacing:-0.025em;\">";
+	                			htmlDesc += certInfo.getCertTargetNm() +"/"+ certInfo.getCertOrganName();
+	                            htmlDesc += "</p>";
+	                            htmlDesc += "<p style=\"margin-top:20px; color:#222; font-size:13px; font-weight: 300; line-height:1; letter-spacing:-0.025em;\">";
+	                        	htmlDesc += certInfo.getCertDiv();
+	                        	htmlDesc += "</p>";
+	                            htmlDesc += "<p class=\"st_dot_info\" style=\"color: #888888;position:relative;margin-top:20px;font-size:13px;font-weight:300;line-height:1;letter-spacing:-0.025em;\">";
+	                            htmlDesc += "<span style=\"color: #888888 !important;background: #888888 !important;display: inline-block;width: 2px;height: 2px;position: relative;top: -4px;left: 0px;margin-right: 4px;\"></span>";
+	                            htmlDesc += "해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.";
+	                            htmlDesc += "</p>";
+	                            htmlDesc += "</div>";
+	                            htmlDesc += "</div>";
+                			}
                 		}else {
                 			htmlDesc += "<div class=\"st_required_box\" style=\"margin-bottom:80px;\">";
                 			htmlDesc += "<div class=\"st_area_kcl\" style=\"display:block; position:relative; min-height:160px; margin-top:100px; padding:40px 40px 40px 160px; box-sizing:border-box; background:#f5f5f5;\">";
-                			htmlDesc += "<i class=\"st_ico_kcl\" style=\"position:absolute;left:64px;top:50%;transform:translateY(-50%);z-index:2;background-image: url(/images/pc/ico_kcl.png);width: 32px;height: 50px;display: inline-block;vertical-align: middle;background-repeat: no-repeat;background-size: contain;background-position: 0% 0%;\"></i>";
+                			htmlDesc += "<i class=\"st_ico_kcl\" style=\"position:absolute;left:64px;top:50%;transform:translateY(-50%);z-index:2;background-image: url('https://image.istyle24.com/Style24/images/pc/ico_kcl.png');width: 32px;height: 50px;display: inline-block;vertical-align: middle;background-repeat: no-repeat;background-size: contain;background-position: 0% 0%;\"></i>";
                 			htmlDesc += "<p class=\"st_tit\" style=\"margin-top:0;color:#222;font-size:16px;font-weight:300;line-height:1;letter-spacing:-0.025em;\">";
                 			htmlDesc += certInfo.getCertDiv() +"/"+ certInfo.getCertOrganName();
                             htmlDesc += "</p>";
                             htmlDesc += "<p style=\"margin-top:20px; color:#222; font-size:13px; font-weight: 300; line-height:1; letter-spacing:-0.025em;\">";
                             htmlDesc += "인증번호: "+ certInfo.getCertNum();
-                            htmlDesc += "<a href=\"http://www.safetykorea.kr/search/searchPop?certNum=XX00000-0000\" target=\"_blank\" class=\"st_linktxt3\" style=\"margin-left:20px; color:#888; font-weight:200; text-decoration:none !important;\">상세보기</a>";
+                            htmlDesc += "<a href=\"http://www.safetykorea.kr/search/searchPop?certNum="+certInfo.getCertNum()+ "\" target=\"_blank\" class=\"st_linktxt3\" style=\"margin-left:20px; color:#888; font-weight:200; text-decoration:none !important;\">상세보기</a>";
                             htmlDesc += "</p>";
                             htmlDesc += "<p class=\"st_dot_info\" style=\"color: #888888;position:relative;margin-top:20px;font-size:13px;font-weight:300;line-height:1;letter-spacing:-0.025em;\">";
                             htmlDesc += "<span style=\"color: #888888 !important;background: #888888 !important;display: inline-block;width: 2px;height: 2px;position: relative;top: -4px;left: 0px;margin-right: 4px;\"></span>";

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

@@ -223,6 +223,9 @@ public class TsaBusinessController extends TsaBaseController {
 
 		// 송장출력형태
 		mav.addObject("invoicePrintTypeList", rendererService.getAvailCommonCodeList("G025"));
+		
+		// 택배사명 목록
+		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
 
 		mav.setViewName("business/DeliveryLocForm");
 

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

@@ -34,7 +34,9 @@ public class DeliveryLoc extends TscBaseDomain {
 	private String rtnLocNm;			// 반품처명
 	private String invoicePrintType;	// 송장출력형태(공통코드G025)
 	private String useYn;				// 사용여부
-
+	private String shipCompCd;			// 배송업체코드
+	private String shipCompNm;			// 배송업체명
+	
 	// 검색조건
 	private String searchGb;
 	private String searchTxt;

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

@@ -136,6 +136,7 @@ public class Statistics extends TscBaseDomain {
 	private int mallPrice;				// 몰판매가
 	private int sellPrice;				// 판매가(정산판매가적용)
 	private int sellAmt;				// 판매금액(CPN1_DC_AMT가 빠진 금액이 들어가 있음)
+	private int cpnDcAmt;				// 쿠폰금액
 	private int cpn1DcAmt;				// 즉시사용쿠폰금액
 	private int goodsCpnDcAmt;			// 상품쿠폰사용금액
 	private int cartCpnDcAmt;			// 주문서쿠폰사용금액

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

@@ -385,6 +385,7 @@
 		     , RTN_LOC_NM         /*반품처명*/
 		     , INVOICE_PRINT_TYPE /*송장출력형태*/
 		     , USE_YN             /*사용여부*/
+		     , SHIP_COMP_CD		  /*택배사코드*/
 		FROM   TB_DELIVERY_LOC
 		WHERE  1 = 1
 		<if test="supplyCompCd != null and supplyCompCd != ''">
@@ -428,6 +429,7 @@
 		     , RTN_LOC_DTL_ADDR
 		     , RTN_LOC_NM
 		     , INVOICE_PRINT_TYPE
+		     , SHIP_COMP_CD
 		     , USE_YN
 		     , REG_NO
 		     , REG_DT
@@ -470,6 +472,7 @@
 		     , #{rtnLocDtlAddr}
 		     , #{rtnLocNm}
 		     , #{invoicePrintType}
+		     , #{shipCompCd}
 		     , #{useYn}
 		     , #{regNo}
 		     , NOW()
@@ -503,6 +506,7 @@
 		     , RTN_LOC_DTL_ADDR = #{rtnLocDtlAddr}
 		     , RTN_LOC_NM = #{rtnLocNm}
 		     , INVOICE_PRINT_TYPE = #{invoicePrintType}
+		     , SHIP_COMP_CD = #{shipCompCd}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

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

@@ -87,6 +87,7 @@
 				WHEN SUBSTRING(A.ITEMKIND_CD, 1, 2) = '08' || SUBSTRING(A.ITEMKIND_CD, 1, 2) = '09'
 					|| SUBSTRING(A.ITEMKIND_CD, 1, 2) = '10' || SUBSTRING(A.ITEMKIND_CD, 1, 2) = '11'
 					|| SUBSTRING(A.ITEMKIND_CD, 1, 2) = '12' || SUBSTRING(A.ITEMKIND_CD, 1, 2) = '13'
+					|| SUBSTRING(A.ITEMKIND_CD, 1, 4) = '1403'
 			  	THEN 'Y'
 			  	ELSE 'N'
 			  END KIDS_YN

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

@@ -54,6 +54,7 @@
 		     , ODIH.SELL_PRICE                                                            /*판매가*/
 		     , ODIH.SELL_QTY                                                              /*판매수량*/
 		     , ODIH.SELL_AMT                                                              /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
+             , ODIH.CPN_DC_AMT                                                            /*쿠폰금액*/
 		     , ODIH.CPN1_DC_AMT                                                           /*즉시사용쿠폰금액*/
 		     , ODIH.GOODS_CPN_DC_AMT                                                      /*상품쿠폰사용금액*/
 		     , ODIH.CART_CPN_DC_AMT                                                       /*주문서쿠폰사용금액*/
@@ -141,6 +142,8 @@
 		                                                            ODIH.ITEM_PRICE
 		                                                   END))
 		                    END AS SIGNED INT)                                                          AS SELL_AMT                /*판매금액*/
+                     , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CPN1_DC_AMT   
+					+ IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END  AS CPN_DC_AMT             /*쿠폰금액*/		                    
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/

src/main/webapp/WEB-INF/views/business/DeliveryLocForm.html

@@ -199,6 +199,15 @@
 							<input type="text" class="w300" name="rtnLocDtlAddr" maxlength="100" required="required" data-valid-name="반품처 상세주소"/>
 						</td>
 					</tr>
+					<tr>
+						<th>택배사<i class="required" title="필수"></i></th>
+						<td colspan="7">
+							<select name="shipCompCd" required="required" data-valid-name="택배사">
+								<option value="">[선택]</option>
+								<option th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+						</td>
+					</tr>
 				</table>
 			</form>
 			
@@ -304,6 +313,7 @@
 		$('#detailForm input[name=rtnLocBaseAddr]').val(event.data.rtnLocBaseAddr);
 		$('#detailForm input[name=rtnLocDtlAddr]').val(event.data.rtnLocDtlAddr);
 		$('#detailForm input[name=rtnLocNm]').val(event.data.rtnLocNm);
+		$('#detailForm select[name=shipCompCd]').val(event.data.shipCompCd);
 		
 		if (event.data.useYn == 'Y') {
 			$('#detailForm input:radio[name=useYn]').eq(0).attr('checked', true);

src/main/webapp/WEB-INF/views/statistics/DailyTradingForm.html

@@ -136,7 +136,7 @@
 		},
 		{
 			headerName: "쿠폰할인금액", field: "cpnDcAmt", width: 120, cellClass: 'text-right',
-			valueGetter: function (params) { return gagaAgGrid.toAddComma(params.data.cpn1DcAmt + params.data.goodsCpnDcAmt); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{
 			headerName: "즉시사용쿠폰금액", field: "cpn1DcAmt", width: 120, cellClass: 'text-right',
@@ -222,7 +222,7 @@
 			return;
 		}
 		
-		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm', fnCreateTotal);
+		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
 	});
 	
 	// 합계 생성