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

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

@@ -463,20 +463,20 @@ public class TsaShoplinkerService {
 
                 	String brandSizeImg = env.getProperty("domain.image").replace("/Upload", "") + "/Upload/brandSizeImg/";
                 	if( "Y".equals(goodsMap.getKidsYn())){
-                		brandSizeImg += "kids/"+goodsMap.getBrandEnm() +".jpg";
-
                 		// 나이키 조던/나이키 에스비/나이키 와이에이/컨버스/헐리 는 플레이키즈 사이즈표
         	    		if( "S0003".equals(goodsMap.getBrandCd()) || "S0004".equals(goodsMap.getBrandCd()) || "S0007".equals(goodsMap.getBrandCd())
         	    			|| "S0001".equals(goodsMap.getBrandCd()) || "S0006".equals(goodsMap.getBrandCd())){
 
         	    			brandSizeImg += "kids/PLAYKIZ.jpg";
+        	    		}else {
+        	    			brandSizeImg += "kids/"+goodsMap.getBrandEnm() +".jpg";
         	    		}
 
-        	    		htmlDesc += "<img src=\""+ brandSizeImg +"\" alt=\"ANDEW 표준 사이즈\" style=\"display: block;margin: 10px auto 0;\">";
+        	    		htmlDesc += "<img src=\""+ brandSizeImg +"\" alt=\"표준 사이즈\" style=\"display: block;margin: 10px auto 0;\">";
 
                 	}else {
                 		brandSizeImg += "casuals/"+goodsMap.getBrandEnm() +".jpg";
-                		htmlDesc += "<img src=\""+ brandSizeImg +"\" alt=\"ANDEW 표준 사이즈\" style=\"display: block;margin: 10px auto 0;\">";
+                		htmlDesc += "<img src=\""+ brandSizeImg +"\" alt=\"표준 사이즈\" style=\"display: block;margin: 10px auto 0;\">";
                 	}
                     htmlDesc += "</div>";
                     htmlDesc += "</div>";

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

@@ -543,16 +543,19 @@
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterDuplicateList */
 		SELECT 	REG_NO
-				, GOODS_CD
-				, GOODS_NM
+		      , GOODS_CD
+		      , GOODS_NM
 		 FROM	TB_TMTB_APPLY_GOODS_TEMP
 		WHERE	1=1
 		  AND	REG_NO = #{regNo}
 		  AND	GOODS_CD NOT IN (
-							SELECT	GOODS_CD
-							FROM	TB_TMTB_APPLY_GOODS
-							WHERE	TMTB_SQ = #{tmtbSq}
-							)
+		                SELECT	B.GOODS_CD
+		                FROM	TB_TMTB A, TB_TMTB_APPLY_GOODS B
+		                WHERE	1=1
+		                AND		A.TMTB_SQ = B.TMTB_SQ
+		                AND		NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
+		                AND		B.TMTB_SQ = #{tmtbSq}
+		              )
 	</select>
 
 	<update id="updateMorebetterStat" parameterType="MoreBetter">

src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -54,7 +54,7 @@
 						</td>
 						<th>공지제목</th>
 						<td>
-							<input name="noteicTitle" type="text" maxlength="200"/>
+							<input name="noticeTitle" type="text" maxlength="200"/>
 						</td>
 						<th>사용여부</th>
 						<td>

src/main/webapp/WEB-INF/views/envset/AnswerPhaseForm.html

@@ -221,7 +221,7 @@
 			$("#detailForm input:checkbox[name=chkUseYn]").parent().removeClass('checked');
 		}
 		
-		$('#detailForm input[name=ansTitle]').val(event.data.ansTitle.replaceAll('>','>')); // 답변제목
+		$('#detailForm input[name=ansTitle]').val(event.data.ansTitle); // 답변제목
 		$('#detailForm textarea[name=ansContent]').val(event.data.ansContent); // 답변내용
 		$('#detailForm input[name=kakaoCd]').val(event.data.kakaoCd); // 카카오템플릿코드
 		$('#detailForm input[name=buttonNm]').val(event.data.buttonNm); // 카카오버튼명

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

@@ -815,7 +815,7 @@
 		};
 
 		var jsonData = JSON.stringify(data);
-console.log(jsonData);
+// console.log(jsonData);
 		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
 	});
 
@@ -1174,6 +1174,7 @@ console.log(jsonData);
 		// 각 ag-grid list 수량
 		let allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
 		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+		let allDefaultGoodsData = gagaAgGrid.getAllRowData(gridOptionsDefaultGoodsList);
 		let allApplyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
 		let allExceptGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
 		let allApplyBurdenData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
@@ -1200,9 +1201,18 @@ console.log(jsonData);
 			multiBrand.push(item.brandCd);
 		});
 
+		var multiDefaultGoods = [];
+		$.each(allDefaultGoodsData, function(idx, item) {
+			multiDefaultGoods.push(item.goodsCd);
+		});
+
 		var multiApplyGoods = [];
-		$.each(allApplyGoodsData, function(idx, item) {
-			multiApplyGoods.push(item.goodsCd);
+		$.each(allApplyGoodsData, function(agIdx, agItem) {
+			$.each(allDefaultGoodsData, function(idx, item) {
+				if(agItem.goodsCd != item.goodsCd){
+					multiApplyGoods.push(agItem.goodsCd);
+				}
+			});
 		});
 
 		var multiExceptGoods = [];
@@ -1260,9 +1270,10 @@ console.log(jsonData);
 						, multiBrand : multiBrand
 						, multiApplyGoods : multiApplyGoods
 						, multiExceptGoods : multiExceptGoods
+						, multiDefaultGoods : multiDefaultGoods
 					}
 					var jsonData = JSON.stringify(data);
-					console.log('jsonData::'+jsonData);
+					// console.log('jsonData::'+jsonData);
 					gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterChangeStatCollback);
 				}
 			}