Merge branch 'develop' into bin2107

pom.xml

@@ -283,13 +283,6 @@
 			<scope>system</scope>
 			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xalan.jar</systemPath>
 		</dependency>
-		<dependency>
-			<groupId>xbean</groupId>
-			<artifactId>xbean</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xbean.jar</systemPath>
-		</dependency>
 	</dependencies>
 	
 	<build>

src/main/java/com/style24/front/biz/dao/TsfPlanningDao.java

@@ -282,6 +282,16 @@ public interface TsfPlanningDao {
 	 */
 	void savePollCustAnswer(Poll poll);
 	
+	/**
+	 * 설문조사 중복 인덱스
+	 *
+	 * @param poll
+	 * @return 
+	 * @author sowon
+	 * @date 2021. 6. 18
+	 */
+	int getPollCustAnswerIndex();
+	
 	/**
 	 * 설문조사 중복카운트
 	 *

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -394,6 +394,7 @@ public class TsfPlanningService {
 		poll.setCustNo(TsfSession.getInfo().getCustNo());
 		// 단수형
 		if(poll.getPollQsq_10()!=null && poll.getPollQsq_10()!="") {
+			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_10 =poll.getPollQsq_10().split("/");
 			for (int i = 0; i < pollQsq_10.length; i++) {
 				String[] temp = pollQsq_10[i].split("-");
@@ -401,7 +402,8 @@ public class TsfPlanningService {
 					String pollQsq=temp[j].toString();
 					poll.setPollQsq(Integer.parseInt(pollQsq)); 
 					String dummy = temp[j+1].toString();        
-					poll.setDummy(dummy);                       
+					poll.setDummy(dummy);                      
+					poll.setAnsIndex(ansIndex);
 					planningDao.savePollCustAnswer(poll);
 					j++;
 				}
@@ -410,6 +412,7 @@ public class TsfPlanningService {
 		
 		//복수형
 		if(poll.getPollQsq_20()!=null && poll.getPollQsq_20()!="") {
+			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_20 =poll.getPollQsq_20().split("/");
 			for (int i = 0; i < pollQsq_20.length; i++) {
 				String[] temp = pollQsq_20[i].split("-");
@@ -417,7 +420,8 @@ public class TsfPlanningService {
 					String pollQsq=temp[j].toString();
 					poll.setPollQsq(Integer.parseInt(pollQsq));
 					String dummy = temp[j+1].toString().replaceAll("[,]", "|");        
-					poll.setDummy(dummy);                       
+					poll.setDummy(dummy);           
+					poll.setAnsIndex(ansIndex);
 					planningDao.savePollCustAnswer(poll);
 					
 					j++;
@@ -427,6 +431,7 @@ public class TsfPlanningService {
 		
 		//단답형
 		if(poll.getPollQsq_30()!=null && poll.getPollQsq_30()!="") {
+			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_30 =poll.getPollQsq_30().split("/");
 			for (int i = 0; i < pollQsq_30.length; i++) {
 				String[] temp = pollQsq_30[i].split("-");
@@ -434,7 +439,8 @@ public class TsfPlanningService {
 					String pollQsq=temp[j].toString();
 					poll.setPollQsq(Integer.parseInt(pollQsq)); 
 					String dummy = temp[j+1].toString();        
-					poll.setDummy(dummy);                       
+					poll.setDummy(dummy);   
+					poll.setAnsIndex(ansIndex);
 					planningDao.savePollCustAnswer(poll);
 					j++;
 				}
@@ -443,6 +449,7 @@ public class TsfPlanningService {
 		
 		//서룰형
 		if(poll.getPollQsq_40()!=null && poll.getPollQsq_40()!="") {
+			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_40 =poll.getPollQsq_40().split("/");
 			for (int i = 0; i < pollQsq_40.length; i++) {
 				String[] temp = pollQsq_40[i].split("-");
@@ -450,7 +457,8 @@ public class TsfPlanningService {
 					String pollQsq=temp[j].toString();
 					poll.setPollQsq(Integer.parseInt(pollQsq)); 
 					String dummy = temp[j+1].toString();        
-					poll.setDummy(dummy);                       
+					poll.setDummy(dummy);       
+					poll.setAnsIndex(ansIndex);
 					planningDao.savePollCustAnswer(poll);
 					j++;
 				}

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1523,8 +1523,8 @@ public class TsfOrderController extends TsfBaseController {
 		param.setPayGb(TscConstants.PaymentGb.DELIVERY.value());
 		coreOrderService.updateDeliveryFeePaySq(param);
 		
-		// TB_REFUND RF_DELIVERY_FEE 컬럼 수정
-		
+		// 추가배송비 결제금액 환불배송비 수정 처리
+		coreOrderService.updateRefundDeliveryFee(param);
 
 		// 6. 반품&교환 접수 알림톡 및 메일 발송
 		Integer ordChgSq = order.getOrdChgSq();

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

@@ -50,6 +50,7 @@ public class Poll extends TscBaseDomain{
 	private int dispOrd;		// 표시 순서
 	private String pollQtypeNm;	// 문제유형 이름
 	private String planNm;			// 이벤트명
+	private int ansIndex;			// 중복답변 인덱스
 	//poll_answer
 	private Integer ansCustNo;		// 투표회원번호
 	private String dummy;			// 임시 (고객 답변)

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

@@ -1325,7 +1325,8 @@
 		       (POLL_QSQ
 		       , ANS_CUST_NO
 		       , POLL_QTYPE
-		       , DUMMY
+		       , DUMMY 
+		       , ANS_INDEX
 		       , REG_NO
 		       , REG_DT
 		       )
@@ -1334,11 +1335,18 @@
 		       , #{custNo}
 		       , (SELECT POLL_QTYPE FROM TB_POLL_QUESTION WHERE POLL_QSQ = #{pollQsq})
 		       , #{dummy}
+		       , #{ansIndex}
 		       , #{custNo}
 		       , CURRENT_TIMESTAMP
 		       )	
 	</insert>
 	
+	<select id="getPollCustAnswerIndex" parameterType="Plan" resultType="int">
+		/* TsfPlanning.getPollCustAnswerIndex */
+		SELECT MAX(ANS_INDEX)+1 AS ANS_INDEX 
+		FROM TB_POLL_ANSWER 
+	</select>
+	
 	<!-- 설문자 중복 카운트 -->
 	<select id="getCustAnswerCount" parameterType="Plan" resultType="int">
 		/* TsfPlanning.getCustAnswerCount */

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -54,7 +54,7 @@
 							<div class="swiper-container thumb_list">
 								<div class="swiper-wrapper">
 									<th:block th:each="goodsImg, status : ${goodsImgList}">
-									<div class="swiper-slide" th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
+									<div class="swiper-slide" th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
 																or #strings.contains(goodsImg.sysImgNm,'_L1.')
 																or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 										<div class="thumb" ><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div></div>  <!--  mov -->

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -321,7 +321,7 @@
 					</th:block>
 				</div>	
 				<!-- 관리자 에디터입력 내용 노출 -->
-				<div class="mdhtml_box">
+				<div class="mdhtml_box" th:if="${goodsVideoList != null and !goodsVideoList.empty}">
 					<!-- 관리자 에디터입력 내용   공지 html -->
 					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 					<div class="movblock">
@@ -339,14 +339,13 @@
 				<div class="mdhtml_box  bnnoti" th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >	
 					<div style="height:4rem"></div><!-- 여백용 html -->
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
-				</div>	
+				</div>
+				<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >	
 				<div class="mdhtml_box"	>
-					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
 						<div style="height:4rem"></div><!-- 여백용 html -->
 						<div id="goodsDescHtml"></div>
-					</th:block>
-					
 				</div>
+				</th:block>
 					
 				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	
 				<!-- 착용컷 노출 -->

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -41,7 +41,7 @@
 										<div class="swiper-wrapper">
 										<th:block th:each="goodsImg, status : ${goodsImgList}">
 											<div class="swiper-slide" th:classappend="${status.first}? 'on' : ''" 
-													th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
+													th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
 															or #strings.contains(goodsImg.sysImgNm,'_L1.')
 															or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 											<a th:href="${'#navLocate'+ status.count}"><span class="thumb"><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=48'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></span></a></div>
@@ -56,7 +56,7 @@
 							<ul>
 								<th:block th:each="goodsImg, status : ${goodsImgList}">
 								<li th:id="${'navLocate'+ status.count}"  th:classappend="${status.first}? 'on' : ''" 
-									th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
+									th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
 												or #strings.contains(goodsImg.sysImgNm,'_L1.')
 												or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 									<a href="javascript:void(0);"><span class="thumb"><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=558'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></span></a></li>
@@ -406,7 +406,10 @@
 				<a href="" id="btn_close_itemThumbPop">닫기버튼</a>
 			</div>
 			<div class="full_pop_container"  th:with="videoYn=${(goodsVideoList != null and !goodsVideoList.empty)? 'Y' :'N'}">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }"
+						th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
+								or #strings.contains(goodsImg.sysImgNm,'_L1.')
+								or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 				<div th:id="${'popThumb1'+ count}" class="scaleview" >
 					<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div>
 			</th:block>

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -1267,7 +1267,10 @@
 				<a href="" id="btn_close_itemThumbPop">닫기버튼</a>
 			</div>
 			<div class="full_pop_container"  th:with="videoYn=${(goodsVideoList != null and !goodsVideoList.empty)? 'Y' :'N'}">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }"
+						th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1') 
+								or #strings.contains(goodsImg.sysImgNm,'_L1')
+								or #strings.contains(goodsImg.sysImgNm,'_L2'))}">
 				<div th:id="${'popThumb1'+ count}" class="scaleview" >
 					<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div>
 			</th:block>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html

@@ -255,13 +255,13 @@
 
 		// 오늘 이후 날짜 선택 처리
 		chgDate = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + (today.getDate())).slice(-2);
-		if (id == 'stDate' && Math.ceil((sdt.getTime() - today.getTime()) / (1000 * 3600 * 24))) {
+		if (id == 'stDate' && Math.ceil((sdt.getTime() - today.getTime()) / (1000 * 3600 * 24)) > 0) {
 			mcxDialog.alert('조회기간을 확인해주세요.');
 			$('#stDate').val(chgDate);
 			$('#searchForm input[name=stDate]').val(chgDate);
 
 			return false;
-		} else if (id == 'edDate' && Math.ceil((edt.getTime() - today.getTime()) / (1000 * 3600 * 24))) {
+		} else if (id == 'edDate' && Math.ceil((edt.getTime() - today.getTime()) / (1000 * 3600 * 24)) > 0) {
 			mcxDialog.alert('조회기간을 확인해주세요.');
 			$('#edDate').val(chgDate);
 			$('#searchForm input[name=edDate]').val(chgDate);

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewCreateFormWeb.html

@@ -377,6 +377,7 @@
 				</div>
 			</div>
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.kollus.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/exif-js"></script>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 let reviewList = [[${reviewInfo}]];
@@ -573,7 +574,6 @@ var fnChooseFile = function(obj) {
 	// multiple 속성이 있으면 files에는 다수의 객체가 할당됨
 	var file = obj.files[0];
 	
-
 	if (!gagajf.isNull(file.name)) {
 		var extension = "\.(jpg|jpeg|png)$";
 		if ((new RegExp(extension, "i")).test(file.name)) {
@@ -593,6 +593,7 @@ var fnChooseFile = function(obj) {
 							// 업로드한 파일명 설정
 							$(".pics").children().eq(0).append("<input type='hidden' name='orgFileNmArr' id='orgFileNm"+(picLength+1)+"' value='"+result.oldFileName+"'>");
 							$(".pics").children().eq(0).append("<input type='hidden' name='sysFileNmArr' id='sysFileNm"+(picLength+1)+"' value='"+result.newFileName+"'>");
+
 						}
 				); 
 		}else if((new RegExp("mp4", "i")).test(file.name)){
@@ -622,18 +623,7 @@ var fnChooseFile = function(obj) {
 			return false;
 		}
 	}
-	// 이거 왜 안먹히지 
 
-	
-	// 파일 업로드
-/* 	 gagajf.ajaxFileUpload('/common/file/upload?subDir=/review'
-			, file
-			, function(result) {
-				// 업로드한 파일명 설정
-				$(".pics").children().eq(0).append("<input type='hidden' name='orgFileNmArr' id='orgFileNm"+(picLength+1)+"' value='"+result.oldFileName+"'>");
-				$(".pics").children().eq(0).append("<input type='hidden' name='sysFileNmArr' id='sysFileNm"+(picLength+1)+"' value='"+result.newFileName+"'>");
-			}
-	);   */
 }