Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/dao/TsaCustomerDao.java

@@ -206,5 +206,15 @@ public interface TsaCustomerDao {
 	 */
 	int getCustomerFindByCellPhone(CustomerSearch customerSearch);
 
+	/**
+	 * 고객 생년월일 저장
+	 *
+	 * @param customer - 고객번호, 생년월일
+	 * @return int - 결과
+	 * @author jsshin
+	 * @since 2021. 05. 10
+	 */
+	int saveBatchBirth(Customer customer);
+
 
 }

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

@@ -122,6 +122,8 @@ public class TsaCustomerService {
 
 		// 3.고객정보 수정
 		customerDao.updateCustomerInfo(customer);
+		// 4.생년월일 수정
+		customerDao.saveBatchBirth(customer);
 
 	}
 

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

@@ -887,4 +887,28 @@
 		WHERE NUMB = 1
 	</select>
 
+	<!--배치 생년월일 -->
+	<insert id="saveBatchBirth" parameterType="Customer">
+		/*TsaCustomer.saveBatchBirth*/
+		INSERT INTO TB_BATCH_BIRTH (
+		       CUST_NO
+		     , BIRTH_YMD
+		     , REG_DT
+		     , REG_NO
+		     , UPD_DT
+		     , UPD_NO
+		) VALUES (
+		       #{custNo}
+		     , #{birthYmd}
+		     , NOW()
+		     , #{custNo}
+		     , NOW()
+		     , #{custNo}
+		)
+		ON DUPLICATE KEY UPDATE
+		       BIRTH_YMD = #{birthYmd}
+		    ,  UPD_DT = NOW()
+		    ,  UPD_NO = #{updNo}
+	</insert>
+
 </mapper>

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

@@ -162,7 +162,6 @@
 		        , M.POLL_QVAL9                                                                                                 
 		        , M.POLL_QVAL10    
 		        , M.POLL_QTYPE_NM
-		        , M.PLAN_SQ
 		 FROM
 		 (		      
 		   SELECT A.POLL_SQ
@@ -188,9 +187,7 @@
 		        , B.POLL_QVAL9
 		        , B.POLL_QVAL10
 		        , B.POLL_QTYPE
-		        , P.PLAN_SQ
 		  FROM   TB_POLL A LEFT JOIN TB_POLL_QUESTION B ON A.POLL_SQ = B.POLL_SQ 
-		                   LEFT JOIN TB_PLAN P ON A.POLL_SQ = P.POLL_SQ
 		  WHERE 1=1
 		     AND A.DEL_YN = 'N'
 		     AND B.DEL_YN = 'N'
@@ -227,7 +224,6 @@
 	              , B.POLL_QVAL8
 	              , B.POLL_QVAL9
 	              , B.POLL_QVAL10
-	              , P.PLAN_SQ
          )M
          ORDER BY M.REG_DT DESC
 	

src/main/resources/config/application-run.yml

@@ -29,7 +29,7 @@ logging.config: classpath:log/logback-run.xml
 domain:
     admin: //bos.style24.com
     style24: //www.style24.com
-    image: //image.istyle24.com
+    image: //image.istyle24.com/Upload
     uximage: //bos.style24.com
 
 upload:
@@ -38,9 +38,9 @@ upload:
         target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     goods:
-        target.path: /files/data/style24/Upload/ProductImage
+        target.path: /files/data/style24/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
@@ -48,19 +48,19 @@ upload:
         target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     excel:
         target.path: /files/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //image.istyle24.com/excel
+        view: //image.istyle24.com/Upload/excel
     sample:
         target.path: /files/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.style24.com/sample
+        view: //image.style24.com/Upload/sample
 
-download.path: /files/data
+download.path: /files/data/style24
 
 # SMTP
 mail:

src/main/resources/config/application-style.yml

@@ -19,8 +19,8 @@ domain:
     admin: //bos.style24.com
     style24: //www.style24.com
     front: //www.style24.com
-    image: //image.istyle24.com
-    cdnimage: //image.istyle24.com
+    image: //image.istyle24.com/Upload
+    cdnimage: //image.istyle24.com/Upload
     uximage: //bos.style24.com
 
 upload:
@@ -30,9 +30,9 @@ upload:
         target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     goods:
-        target.path: /files/data/style24/Upload/productimage
+        target.path: /files/data/style24/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
@@ -40,19 +40,19 @@ upload:
         target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     excel:
         target.path: /files/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //image.istyle24.com/excel
+        view: //image.istyle24.com/Upload/excel
     sample:
         target.path: /files/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.style24.com/sample
+        view: //image.style24.com/Upload/sample
 
-download.path: /files/data
+download.path: /files/data/style24
 
 # PG
 pg:

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -2382,7 +2382,7 @@
 		}
 		
 		// 인증대상이 아니면 스킵
-		if ("G083_1" != $("#goodsDetailForm  input[name=certTargetGb]").val()){
+		if ("G083_1" != $("#goodsDetailForm input[name=selCertTargetGb]:checked").val()){
 			return true;
 		}
 		

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

@@ -1723,6 +1723,16 @@
 				$("#attendTd").css('display','none');
 			}
 			 
+			 if (planInfo.planGb =='E') {
+				 $("#pollTr").show();
+				
+			}else{
+				 $("#pollTr").hide();
+			}
+			 
+			 
+			
+			 
 			 
 			gridOptionsFGBrandList.api.setRowData(planBrandList);
 			gridOptionsFGCateList.api.setRowData(planCateList);

src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -126,7 +126,7 @@ var gagaSn = {
 		$.ajax({
 			data : formData,
 			type : 'POST',
-			url : '/common/file/upload?subDir=/Upload/editor',
+			url : '/common/file/upload?subDir=/editor',
 			cache : false,
 			contentType : false,
 			enctype : 'multipart/form-data',