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

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

@@ -393,6 +393,9 @@ public class TsaCustomerController extends TsaBaseController {
 
 		// 포인트반영상태
 		mav.addObject("pntUploadStatList", rendererService.getCommonCodeList("G070"));
+		
+		// 상품평포인트반영상태
+		mav.addObject("reviewPntStatList", rendererService.getCommonCodeList("G043"));
 
 		// 상품권유형
 		mav.addObject("giftCardOccurGbList", rendererService.getCommonCodeList("G074"));

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

@@ -34,6 +34,7 @@ public class Counsel extends TscBaseDomain {
 	private String email;			// 이메일
 //	private String emailReqYn;		// 이메일요청여부
 //	private String emailSendYn;		// 이메일발송여부
+	private String relOrdNo;		// 관련상품 주문번호
 	private String relGoodsCd;		// 관련상품코드(상품문의에서만 사용)
 	private String goodsNm;			// 상품명(상품문의에서만 사용)
 	private String goodsImg;		// 상품이미지

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

@@ -241,7 +241,7 @@
 	<update id="updateCustomerCellPhnno" parameterType="Customer">
 		/* TsaCustomer.updateCustomerCellPhnno */
 		UPDATE TB_CUSTOMER
-		SET    CELL_PHNNO = #{cellPhnno}
+		SET    CELL_PHNNO = #{encodedCellPhnno}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 		WHERE  CUST_NO = #{custNo}
@@ -307,7 +307,7 @@
 		     , CDA.DEL_YN
 		     , CDA.REG_NO
 		     , DATE_FORMAT(CDA.REG_DT, '%Y%m%d%H%i%S') AS REG_DT
-		     , CDA.UPD_NO
+		     , FN_GET_USER_NM(CDA.UPD_NO) AS REG_NM
 		     , DATE_FORMAT(CDA.UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
 		FROM   TB_CUSTOMER C
 		INNER JOIN
@@ -425,7 +425,7 @@
 		     , CC.END_ALIM_SEND_YN
 		     , E.ORD_NO
 		     , DATE_FORMAT(CC.USED_DT, '%Y%m%d%H%i%S')               AS USED_DT
-		     , CC.REG_NO                                             AS REG_NO
+		     , FN_GET_USER_NM(CC.REG_NO)                             AS REG_NM
 		     , CC.UPD_NO                                             AS UPD_NO
 		     , DATE_FORMAT(CC.REG_DT, '%Y%m%d%H%i%S')                AS REG_DT
 		FROM   TB_COUPON C
@@ -513,7 +513,7 @@
 		      , DATE_FORMAT(CPH.SWITCH_DUE_DT, '%Y%m%d%H%i%S')  AS SWITCH_DUE_DT
 		      , CPH.PNT_UPLOAD_STAT
 		      , DATE_FORMAT(CPH.PNT_UPLOAD_DT, '%Y%m%d%H%i%S')  AS PNT_UPLOAD_DT
-		      , CPH.REG_NO                                      AS REG_NO
+		      , FN_GET_USER_NM(CPH.REG_NO)                      AS REG_NM
 		      , DATE_FORMAT(CPH.REG_DT, '%Y%m%d%H%i%S')         AS REG_DT
 		      , CPH.UPD_NO                                      AS UPD_NO
 		      , DATE_FORMAT(CPH.UPD_DT, '%Y%m%d%H%i%S')         AS UPD_DT
@@ -548,7 +548,7 @@
 		     , CGH.CUST_GFCD_SQ
 		     , CGH.ORD_NO
 		     , CGH.ORD_DTL_NO
-		     , CGH.REG_NO
+		     , FN_GET_USER_NM(CGH.REG_NO)                      AS REG_NM
 		     , CGH.REG_DT
 		     , CGH.UPD_NO
 		     , CGH.UPD_DT
@@ -607,7 +607,8 @@
 	<!--회원 1:1문의 내역  -->
 	<select id="getCustomerCounselList" parameterType="Integer" resultType="Counsel">
 		/* TsaCustomer.getCustomerCouncelList */
-		SELECT CS.CUST_NO
+		SELECT CS.COUNSEL_SQ 
+		     , CS.CUST_NO
 		     , CS.SITE_CD
 		     , CS.COUNSEL_CLSF
 		     , CS.COUNSEL_DCLSF
@@ -638,6 +639,7 @@
 		     , CS.ASSIGNED_HMS
 		     , CS.ANS_TITLE
 		     , CS.ANS_CONTENT
+		     , CS.ANS_NO				 AS ANS_NO
 		     , FN_GET_USER_NM(CS.ANS_NO) AS ANS_NM
 		     , CS.ANS_DT
 		     , CS.SECRET_YN
@@ -652,7 +654,8 @@
 	<!--회원 상품문의 내역  -->
 	<select id="getCustomerGoodsQnaList" parameterType="Integer" resultType="Counsel">
 		/* TsaCustomer.getCustomerGoodsQnaList */
-		SELECT CS.CUST_NO
+		SELECT CS.COUNSEL_SQ 
+		     , CS.CUST_NO
 		     , CS.SITE_CD
 		     , CS.COUNSEL_CLSF
 		     , CS.COUNSEL_DCLSF
@@ -683,6 +686,7 @@
 		     , CS.ASSIGNED_HMS
 		     , CS.ANS_TITLE
 		     , CS.ANS_CONTENT
+		     , CS.ANS_NO				 AS ANS_NO
 		     , FN_GET_USER_NM(CS.ANS_NO) AS ANS_NM
 		     , CS.ANS_DT
 		     , CS.SECRET_YN
@@ -722,7 +726,7 @@
 		     , SENDER_NO
 		     , DATE_FORMAT(SEND_DT, '%Y%m%d%H%i%S') AS SEND_DT
 		     , RECEIVER_NO
-		     , REG_NO
+		     , FN_GET_USER_NM(REG_NO)               AS REG_NM
 		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S')  AS REG_DT
 		FROM   TB_CUST_CONTACT_HST
 		WHERE  RECEIVER_NO = #{custNo}

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -14,7 +14,7 @@
  * 1.0  2021.01.18   jsshin     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1820" data-height="750">
+<div class="modalPopup" data-width="1820" data-height="750" id="customerDetailForm">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -192,7 +192,7 @@
 										<th class="dashR">가입일시</th>
 										<td class="dashR" id="joinDt" name="joinDt"></td>
 										<th class="dashR">최종로그인일시</th>
-										<td class="dashR" id="loginDt" name="loginDt"></td>
+										<td class="dashR" id="loginLdt" name="loginLdt"></td>
 									</tr>
 									<tr>
 										<th class="dashR">내외국인</th>
@@ -520,6 +520,7 @@
 	const pubReasonList = gagajf.convertToArray([[${pubReasonList}]]);				//쿠폰발행사유
 	const pntOccurGbList = gagajf.convertToArray([[${pntOccurGbList}]]);			//포인트반영구분
 	const pntUploadStatList = gagajf.convertToArray([[${pntUploadStatList}]]);		//포인트반영상태
+	const reviewPntStatList = gagajf.convertToArray([[${reviewPntStatList}]]);		//상품평포인트반영상태
 	const giftCardOccurGbList = gagajf.convertToArray([[${giftCardOccurGbList}]]);	//상품권유형
 	const counselClsfList = gagajf.convertToArray([[${counselClsfList}]]);			//상담분류
 	const contactTypeList = gagajf.convertToArray([[${contactTypeList}]]);			//회원접촉유형
@@ -604,8 +605,8 @@
 				return gagaAgGrid.toDateTimeFormat(params.value);
 			}
 		},
-		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
-		{headerName: "확인자", field: "userNm", width: 100, cellClass: 'text-center'}
+// 		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
+		{headerName: "확인자", field: "ansNm", width: 100, cellClass: 'text-center'}
 	];
 
 	// 상품문의 내역 그리드
@@ -630,7 +631,7 @@
 			}
 		},
 		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
-		{headerName: "확인자", field: "userNm", width: 100, cellClass: 'text-center'}
+		{headerName: "확인자", field: "ansNm", width: 100, cellClass: 'text-center'}
 	];
 
 	//쿠폰내역 그리드
@@ -747,7 +748,7 @@
 				return gagaAgGrid.lookupValue(pntOccurGbList, params.value);
 			}
 		},
-		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'}
+		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'}
 	];
 
 	//상품평 그리드
@@ -772,7 +773,7 @@
 				return gagaAgGrid.toDateTimeFormat(params.value);
 			}
 		},
-		{headerName: "지급No", field: "confirmNo", width: 130, cellClass: 'text-center'},
+		{headerName: "지급자", field: "confirmUnm", width: 130, cellClass: 'text-center'},
 		{headerName: "게시여부", field: "dispYn", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "지급예정포인트", field: "giveDuePnt", width: 120, cellClass: 'text-center',
@@ -783,7 +784,7 @@
 		{
 			headerName: "포인트지급상태", field: "pntGiveStat", width: 120, cellClass: 'text-center',
 			valueFormatter: function (params) {
-				return gagaAgGrid.lookupValue(pntUploadStatList, params.value);
+				return gagaAgGrid.lookupValue(reviewPntStatList, params.value);
 			}
 		}
 	];
@@ -839,7 +840,7 @@
 			}
 		},
 		{headerName: "삭제", field: "delYn", width: 50, cellClass: 'text-center'},
-		{headerName: "수정자", field: "updNo", width: 100, cellClass: 'text-center'},
+		{headerName: "수정자", field: "regNm", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "수정일시", field: "updDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -864,7 +865,7 @@
 			}
 		},
 		{headerName: "내용", field: "contactContents", width: 1000, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "등록일", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -1025,7 +1026,9 @@
 			sureBtnClick: function () {
 				let jsonData = JSON.stringify(customer);
 				//console.log(jsonData);
-				gagajf.ajaxJsonSubmit('/customer/info/save', jsonData, fnSearchCustInfo);
+				gagajf.ajaxJsonSubmit('/customer/info/save', jsonData);
+				uifnPopupClose('customerDetailForm');
+				$('#btnSearch').trigger('click');
 			}
 		});
 
@@ -1210,8 +1213,8 @@
 					$('#managedDt').text(gagaAgGrid.toDateTimeFormat(data.managedDt));
 					$('#joinDt').text(gagaAgGrid.toDateTimeFormat(data.joinDt));
 
-					let loginDt = fnGetLoginDt(data.loginDt);
-					$('#loginDt').text(loginDt);
+					let loginLdt = fnGetloginLdt(data.loginLdt);
+					$('#loginLdt').text(loginLdt);
 
 					let foreignerYn = data.foreignerYn === 'Y' ? '외국인' : '내국인';
 					$('#foreignerYn').text(foreignerYn);
@@ -1423,10 +1426,10 @@
 	};
 
 	// 최종로그인 일시
-	var fnGetLoginDt = function (loginDt) {
+	var fnGetloginLdt = function (loginLdt) {
 		let result = '로그인 이력이 없습니다.';
-		if (!gagajf.isNull(loginDt)) {
-			result = gagaAgGrid.toDateTimeFormat(loginDt);
+		if (!gagajf.isNull(loginLdt)) {
+			result = gagaAgGrid.toDateTimeFormat(loginLdt);
 		}
 		return result;
 	};

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -142,7 +142,7 @@
 				html += '<tr>';
 				html += '	<th>썸네일 <br>글자 색상</th>';
 				html += '	<td colspan="3">';
-				if(result[i].strVar7='BLACK'){
+				if(result[i].strVar7=='BLACK'){
 					html += '		<label class="rdoBtn"><input type="radio" name="thumTextColor'+i+'" value="BLACK" checked="checked"/>BLACK</label>';
 					html += '		<label class="rdoBtn"><input type="radio" name="thumTextColor'+i+'" value="WHITE" />WHITE</label>';
 				}else{

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

@@ -186,6 +186,12 @@
 							</div>
 						</td>
 					</tr>
+					<tr>
+						<th>투표일련번호</th>
+						<td>
+							<input type="text" class="w100 aR" name="pollSq" th:field="*{pollSq}"/>
+						</td>
+					</tr>
 					<tr>
 						<th>댓글여부</th>
 						<td colspan="3">
@@ -212,12 +218,6 @@
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="U" />상품리스트 상단</label>
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="D"/>상품리스트 하단</label>
 						</td>
-						
-						<th>투표일련번호</th>
-						<td>
-							<input type="text" class="w100 aR" name="pollSq" th:field="*{pollSq}"/>
-						</td>
-					
 					</tr>
 					<tr style="display:none" id="append3">
 						<th>댓글이미지<br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgReplyImgDelYn" value="Y"/></label>]</th>
@@ -513,6 +513,14 @@
 							</div>
 						</td>
 					</tr>
+					<tr>
+									
+						<th>투표일련번호</th>
+						<td>
+							<input type="text" class="w100 aR" name="pollSq"/>
+						</td>
+					
+					</tr>
 					<tr>
 						<th>댓글여부<em class="required" title="필수"></em></th>
 						<td colspan="5">
@@ -539,12 +547,6 @@
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="U"/>상품리스트 상단</label>
 							<label class="rdoBtn"><input type="radio" name="replyLoc" value="D"/>상품리스트 하단</label>
 						</td>
-						
-						<th>투표일련번호</th>
-						<td>
-							<input type="text" class="w100 aR" name="pollSq"/>
-						</td>
-					
 					</tr>
 					<tr style="display:none" id="append3">
 						<th>댓글이미지</th>