Merge branch 'develop' into bin2107

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

@@ -897,6 +897,7 @@ public class TsaPlanService {
 			
 			// 웹용 상단PC 등록
 			if (StringUtils.isNotBlank(param.getFsrcPcTop())) {
+				
 				createPlanFsrcPcTop(param);
 			}
 		}
@@ -1385,54 +1386,58 @@ public class TsaPlanService {
 		fsrcTop.setPlanSq(param.getPlanSq());    
 		fsrcTop.setDispYn(param.getTopFsrcDispYn());
 		
-		if (fsrcPcTotalCnt > byteCnt || fsrcMobileTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
-			StringBuilder sbStr = new StringBuilder(4000);
-
-			int cnt = 0;
-			int getCnt = 0;
-			int tempCnt = 1500;
-
-			for (char ch : param.getFsrcPcTop().toCharArray()) {
-				getCnt++;
-				sbStr.append(ch);
-
-				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-					fsrcTop.setSeq(cnt + 1);
-					fsrcTop.setFsrcPc(sbStr.toString());
-
-					// 초기화
-					sbStr.delete(0, tempCnt);
-					cnt++;
-					tempCnt += byteCnt;
-
-					//planDao.savePlanFsrcInfo(fsrcTop);
-				}
-			}
+		fsrcTop.setFsrcPc(param.getFsrcPcTop());
+		fsrcTop.setFsrcMob(param.getFsrcMobileTop());
+		planDao.savePlanFsrcInfo(fsrcTop);
 		
-			for (char ch : param.getFsrcMobileTop().toCharArray()) {
-				getCnt++;
-				sbStr.append(ch);
-
-				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-					fsrcTop.setSeq(cnt + 1);
-					fsrcTop.setFsrcMob(sbStr.toString());
-
-					// 초기화
-					sbStr.delete(0, tempCnt);
-					cnt++;
-					tempCnt += byteCnt;
-					
-				}
-			}		
-			planDao.savePlanFsrcInfo(fsrcTop);
-		} 
-		else {
-			fsrcTop.setSeq(1);
-			fsrcTop.setFsrcPc(param.getFsrcPcTop());
-			fsrcTop.setFsrcMob(param.getFsrcMobileTop());
-
-			planDao.savePlanFsrcInfo(fsrcTop);
-		}
+//		if (fsrcPcTotalCnt > byteCnt || fsrcMobileTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
+//			StringBuilder sbStr = new StringBuilder(4000);
+//
+//			int cnt = 0;
+//			int getCnt = 0;
+//			int tempCnt = 1500;
+//
+//			for (char ch : param.getFsrcPcTop().toCharArray()) {
+//				getCnt++;
+//				sbStr.append(ch);
+//
+//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
+//					fsrcTop.setSeq(cnt + 1);
+//					fsrcTop.setFsrcPc(sbStr.toString());
+//
+//					// 초기화
+//					sbStr.delete(0, tempCnt);
+//					cnt++;
+//					tempCnt += byteCnt;
+//
+//					//planDao.savePlanFsrcInfo(fsrcTop);
+//				}
+//			}
+//		
+//			for (char ch : param.getFsrcMobileTop().toCharArray()) {
+//				getCnt++;
+//				sbStr.append(ch);
+//
+//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
+//					fsrcTop.setSeq(cnt + 1);
+//					fsrcTop.setFsrcMob(sbStr.toString());
+//
+//					// 초기화
+//					sbStr.delete(0, tempCnt);
+//					cnt++;
+//					tempCnt += byteCnt;
+//					
+//				}
+//			}		
+//			planDao.savePlanFsrcInfo(fsrcTop);
+//		} 
+//		else {
+//			fsrcTop.setSeq(1);
+//			fsrcTop.setFsrcPc(param.getFsrcPcTop());
+//			fsrcTop.setFsrcMob(param.getFsrcMobileTop());
+//
+//			planDao.savePlanFsrcInfo(fsrcTop);
+//		}
 		return param;
 	}
 
@@ -1452,55 +1457,58 @@ public class TsaPlanService {
 		fsrcBtm.setRegNo(param.getRegNo());      
 		fsrcBtm.setPlanSq(param.getPlanSq());    
 		fsrcBtm.setDispYn(param.getBtmFsrcDispYn());
+		fsrcBtm.setFsrcPc(param.getFsrcPcBtm());
+		fsrcBtm.setFsrcMob(param.getFsrcMobileBtm());
+		planDao.savePlanFsrcInfo(fsrcBtm);
 		
-		if (fsrcPcTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
-			StringBuilder sbStr = new StringBuilder(4000);
-
-			int cnt = 0;
-			int getCnt = 0;
-			int tempCnt = 1500;
-
-			for (char ch : param.getFsrcPcBtm().toCharArray()) {
-				getCnt++;
-				sbStr.append(ch);
-
-				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-					fsrcBtm.setSeq(cnt + 1);
-					fsrcBtm.setFsrcPc(sbStr.toString());
-
-					// 초기화
-					sbStr.delete(0, tempCnt);
-					cnt++;
-					tempCnt += byteCnt;
-
-				}
-
-			}
-			
-			for (char ch : param.getFsrcMobileBtm().toCharArray()) {
-				getCnt++;
-				sbStr.append(ch);
-
-				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
-					fsrcBtm.setSeq(cnt + 1);
-					fsrcBtm.setFsrcMob(sbStr.toString());
-
-					// 초기화
-					sbStr.delete(0, tempCnt);
-					cnt++;
-					tempCnt += byteCnt;
-					
-				}
-			}		
-			
-			planDao.savePlanFsrcInfo(fsrcBtm);
-		} else {
-			fsrcBtm.setSeq(1);
-			fsrcBtm.setFsrcPc(param.getFsrcPcBtm());
-			fsrcBtm.setFsrcMob(param.getFsrcMobileBtm());
-
-			planDao.savePlanFsrcInfo(fsrcBtm);
-		}
+//		if (fsrcPcTotalCnt > byteCnt) { // 4000 바이트 이상 일 때 파싱.
+//			StringBuilder sbStr = new StringBuilder(4000);
+//
+//			int cnt = 0;
+//			int getCnt = 0;
+//			int tempCnt = 1500;
+//
+//			for (char ch : param.getFsrcPcBtm().toCharArray()) {
+//				getCnt++;
+//				sbStr.append(ch);
+//
+//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
+//					fsrcBtm.setSeq(cnt + 1);
+//					fsrcBtm.setFsrcPc(sbStr.toString());
+//
+//					// 초기화
+//					sbStr.delete(0, tempCnt);
+//					cnt++;
+//					tempCnt += byteCnt;
+//
+//				}
+//
+//			}
+//			
+//			for (char ch : param.getFsrcMobileBtm().toCharArray()) {
+//				getCnt++;
+//				sbStr.append(ch);
+//
+//				if (getCnt == tempCnt || getCnt == fsrcPcTotalCnt) {
+//					fsrcBtm.setSeq(cnt + 1);
+//					fsrcBtm.setFsrcMob(sbStr.toString());
+//
+//					// 초기화
+//					sbStr.delete(0, tempCnt);
+//					cnt++;
+//					tempCnt += byteCnt;
+//					
+//				}
+//			}		
+//			
+//			planDao.savePlanFsrcInfo(fsrcBtm);
+//		} else {
+//			fsrcBtm.setSeq(1);
+//			fsrcBtm.setFsrcPc(param.getFsrcPcBtm());
+//			fsrcBtm.setFsrcMob(param.getFsrcMobileBtm());
+//
+//			planDao.savePlanFsrcInfo(fsrcBtm);
+//		}
 		return param;
 	}
 

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

@@ -97,6 +97,8 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
+		     , MK_AGREE_YN
+		     , DATE_FORMAT(MK_AGREE_DT, '%Y%m%d%H%i%S') AS MK_AGREE_DT
 		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
@@ -163,6 +165,9 @@
 		<if test="appAgreeYn != null and appAgreeYn != ''">
 		AND   APP_AGREE_YN = #{appAgreeYn}
 		</if>
+		<if test="mkAgreeYn != null and mkAgreeYn != ''">
+		AND   MK_AGREE_YN = #{mkAgreeYn}
+		</if>
 		<if test="stDate != null and edDate != '' and stDate != null and edDate != ''">
 		     <if test="searchDateGb == 'joinDt'">
 		AND   JOIN_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
@@ -191,8 +196,7 @@
 	<update id="updateCustomerInfo" parameterType="Customer">
 		/* TsaCustomer.updateCustomerInfo */
 		UPDATE TB_CUSTOMER
-		<set>
-		      CUST_GB = #{custGb}
+		SET   CUST_GB = #{custGb}
 		    , CUST_GRADE = #{custGrade}
 		    <if test="emailAgreeYn != null and emailAgreeYn != ''">
 		    , EMAIL_AGREE_DT = NOW()
@@ -202,6 +206,14 @@
 		    , SMS_AGREE_DT = NOW()
 		    , SMS_AGREE_YN = #{smsAgreeYn}
 		    </if>
+		    <if test="appAgreeYn != null and appAgreeYn != ''">
+		    , APP_AGREE_DT = NOW()
+		    , APP_AGREE_YN = #{appAgreeYn}
+		    </if>
+		    <if test="mkAgreeYn != null and mkAgreeYn != ''">
+		    , MK_AGREE_DT = NOW()
+		    , MK_AGREE_YN = #{mkAgreeYn}
+		    </if>
 		    <if test="homeZipcode != null and homeZipcode != ''">
 		    , HOME_ZIPCODE = #{homeZipcode}
 		    </if>
@@ -233,7 +245,6 @@
 		    </if>
 		    , UPD_NO = #{updNo}
 		    , UPD_DT = NOW()
-		</set>
 		WHERE CUST_NO = #{custNo}
 	</update>
 

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

@@ -2115,10 +2115,10 @@ $(document).ready(function() {
 					$('#planTemplateForm input:checkbox[name="btmFsrcDispYn"]').prop('checked', true);
 				}
 			
-				//$('#fsrcPcBtm').summernote('code', fsrcListBtm[0].fsrcPc);
-				//$('#fsrcMobileBtm').summernote('code', fsrcListBtm[0].fsrcMob);
-				gagaSn.setContents('#fsrcPcBtm', fsrcListBtm[0].fsrcPc); 
-				gagaSn.setContents('#fsrcMobileBtm', fsrcListBtm[0].fsrcMob);
+				$('#fsrcPcBtm').summernote('code', fsrcListBtm[0].fsrcPc);
+				$('#fsrcMobileBtm').summernote('code', fsrcListBtm[0].fsrcMob);
+				//gagaSn.setContents('#fsrcPcBtm', fsrcListBtm[0].fsrcPc); 
+				//gagaSn.setContents('#fsrcMobileBtm', fsrcListBtm[0].fsrcMob);
 			}
 			
 			//html(상단)
@@ -2129,10 +2129,10 @@ $(document).ready(function() {
 					$('#planTemplateForm input:checkbox[name="topFsrcDispYn"]').prop('checked', true);
 				}
 			
-				//$('#fsrcPcTop').summernote('code', fsrcListTop[0].fsrcPc);
-				//$('#fsrcMobileTop').summernote('code', fsrcListTop[0].fsrcMob);
-				gagaSn.setContents('#fsrcPcTop', fsrcListTop[0].fsrcPc); 
-				gagaSn.setContents('#fsrcMobileTop', fsrcListTop[0].fsrcMob);
+				$('#fsrcPcTop').summernote('code', fsrcListTop[0].fsrcPc);
+				$('#fsrcMobileTop').summernote('code', fsrcListTop[0].fsrcMob);
+				//gagaSn.setContents('#fsrcPcTop', fsrcListTop[0].fsrcPc); 
+				//gagaSn.setContents('#fsrcMobileTop', fsrcListTop[0].fsrcMob);
 			}
 			
 			//상품