Merge branch 'jsshin' into develop

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

@@ -403,8 +403,8 @@
 		     , CC.CUST_NO
 		     , C.CPN_ID
 		     , C.CPN_NM
-		     , DATE_FORMAT(CC.AVAIL_STDT, '%Y%m%d%H%i%S')             AS AVAIL_STDT
-		     , DATE_FORMAT(CC.AVAIL_EDDT, '%Y%m%d%H%i%S')             AS AVAIL_EDDT
+		     , DATE_FORMAT(CC.AVAIL_STDT, '%Y%m%d%H%i%S')            AS AVAIL_STDT
+		     , DATE_FORMAT(CC.AVAIL_EDDT, '%Y%m%d%H%i%S')            AS AVAIL_EDDT
 		     , CC.PUB_REASON
 		     , CC.PUB_REASON_DTL
 		     , DATE_FORMAT(CC.USED_DT, '%Y%m%d%H%i%S')               AS USED_DT
@@ -426,6 +426,204 @@
 		ORDER BY E.ORD_NO DESC, CC.REG_DT DESC
 	</select>
 
+
+	<!--회원 포인트내역  -->
+	<select id="getCustomerPointList" parameterType="Integer" resultType="Point">
+		/* TsaCustomer.getCustomerPointList */
+		SELECT CC.*
+		FROM (
+		      SELECT DATE_FORMAT(CASE WHEN CPH.PNT_UPLOAD_STAT = '30'
+		                              THEN CPH.PNT_UPLOAD_DT
+		                          ELSE CPH.REG_DT END, '%Y-%m-%d' ) AS DT
+		           , CPH.PNT_HST_SQ
+		           , C.CUST_ID
+		           , C.CUST_NO
+		           , C.SITE_CD
+		           , CPH.OCCUR_GB
+		           , CPH.OCCUR_DTL_DESC
+		           , CPH.PNT_AMT
+		           , CPH.ORD_DTL_NO
+		           , CPH.REVIEW_SQ
+		           , 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
+		      FROM   TB_CUSTOMER C
+		      INNER JOIN
+		             TB_CUST_POINT_HST CPH
+		      ON     C.CUST_NO = CPH.CUST_NO
+		      WHERE  C.CUST_NO = #{custNo}
+		     ) CC
+		ORDER BY CC.DT DESC
+	</select>
+
+	<!-- 회원 상품권이력 -->
+	<select id="getCustomerGiftCardList" parameterType="Integer" resultType="GiftCard">
+		/* TsaCustomer.getCustomerGiftCardList */
+		SELECT *
+		FROM  TB_CUST_GIFTCARD_HST CGH
+		INNER JOIN
+		      TB_CUSTOMER C
+		ON    CGH.CUST_NO = C.CUST_NO
+		WHERE CGH.CUST_NO = #{custNo}
+	</select>
+
+	<!--회원 상품평내역  -->
+	<select id="getCustomerReviewList" parameterType="Integer" resultType="Review">
+		/* TsaCustomer.getCustomerReviewList */
+		SELECT CASE WHEN REVIEW_GB = 'P'
+		            THEN '[포토]'||R.REVIEW_TITLE
+		            ELSE R.REVIEW_TITLE
+		       END                          AS REVIEW_TITLE
+		     , R.REVIEW_SQ
+		     , R.GOODS_CD
+		     , R.CUST_NO
+		     , R.ORD_NO
+		     , R.ORD_DTL_NO
+		     , R.REVIEW_TITLE
+		     , R.REVIEW_CONTENT
+		     , R.SCORE
+		     , R.HEIGHT
+		     , R.WEIGHT
+		     , R.SCORE_SIZE
+		     , R.SCORE_COLOR
+		     , R.SCORE_FIT
+		     , R.SCORE_THICK
+		     , R.SCORE_WEIGHT
+		     , R.SCORE_BALL
+		     , R.GIVE_DUE_PNT
+		     , R.PNT_GIVE_STAT
+		     , R.DISP_YN
+		     , R.DEL_YN
+		     , R.CONFIRM_YN
+		     , FN_GET_USER_NM(R.CONFIRM_UNO)             AS CONFIRM_UNM
+		     , DATE_FORMAT(R.CONFIRM_DT, '%Y%m%d%H%i%S') AS CONFIRM_DT
+		     , FN_GET_USER_NM(R.REG_NO) AS REG_NM
+		     , R.REG_DT
+		     , FN_GET_USER_NM(R.UPD_NO) AS UPD_NM
+		     , R.UPD_DT
+		     , R.ADM_RPL
+		     , R.ADM_RPL_REG_NO
+		     , R.ADM_RPL_DT
+		FROM   TB_REVIEW R
+		     , TB_CUSTOMER C
+		WHERE  R.CUST_NO = C.CUST_NO
+		AND    R.CUST_NO = #{custNo}
+		ORDER BY R.REG_DT DESC
+	</select>
+
+	<!--회원 1:1문의 내역  -->
+	<select id="getCustomerCounselList" parameterType="Integer" resultType="Counsel">
+		/* TsaCustomer.getCustomerCouncelList */
+		SELECT CS.CUST_NO
+		     , CS.SITE_CD
+		     , CS.COUNSEL_CLSF
+		     , CS.COUNSEL_DCLSF
+		     , CS.CUST_NO
+		     , CS.CELL_PHNNO
+		     , CS.EMAIL
+		     , CS.EMAIL_REQ_YN
+		     , CS.EMAIL_SEND_YN
+		     , CS.SMS_REQ_YN
+		     , CS.SMS_SEND_YN
+		     , CS.REL_ORD_NO
+		     , CS.REL_GOODS_CD
+		     , CS.COUNSEL_TYPE
+		     , CS.QUEST_TITLE
+		     , CS.QUEST_CONTENT
+		     , CS.QUEST_DT
+		     , CS.ORG_FILE_NM1
+		     , CS.SYS_FILE_NM1
+		     , CS.ORG_FILE_NM2
+		     , CS.SYS_FILE_NM2
+		     , CS.ANS_STAT
+		     , CS.ANS_TRANS_YN
+		     , CS.ANS_COMP_CD
+		     , CS.ANS_TRANS_NO
+		     , CS.ANS_TRANS_DT
+		     , CS.ASSIGNED_CS_NO
+		     , CS.ASSIGNED_YMD
+		     , CS.ASSIGNED_HMS
+		     , CS.ANS_TITLE
+		     , CS.ANS_CONTENT
+		     , CS.ANS_NO
+		     , CS.ANS_DT
+		     , CS.SECRET_YN
+		FROM  TB_COUNSEL CS
+		INNER JOIN
+		      TB_CUSTOMER C
+		ON    CS.CUST_NO = C.CUST_NO
+		WHERE CS.COUNSEL_TYPE = 'C'
+		AND  CS.CUST_NO = #{custNo}
+	</select>
+
+	<!--회원 상품문의 내역  -->
+	<select id="getCustomerGoodsQnaList" parameterType="Integer" resultType="Counsel">
+		/* TsaCustomer.getCustomerGoodsQnaList */
+		SELECT CS.CUST_NO
+			 , CS.SITE_CD
+			 , CS.COUNSEL_CLSF
+			 , CS.COUNSEL_DCLSF
+			 , CS.CUST_NO
+			 , CS.CELL_PHNNO
+			 , CS.EMAIL
+			 , CS.EMAIL_REQ_YN
+			 , CS.EMAIL_SEND_YN
+			 , CS.SMS_REQ_YN
+			 , CS.SMS_SEND_YN
+			 , CS.REL_ORD_NO
+			 , CS.REL_GOODS_CD
+			 , CS.COUNSEL_TYPE
+			 , CS.QUEST_TITLE
+			 , CS.QUEST_CONTENT
+			 , CS.QUEST_DT
+			 , CS.ORG_FILE_NM1
+			 , CS.SYS_FILE_NM1
+			 , CS.ORG_FILE_NM2
+			 , CS.SYS_FILE_NM2
+			 , CS.ANS_STAT
+			 , CS.ANS_TRANS_YN
+			 , CS.ANS_COMP_CD
+			 , CS.ANS_TRANS_NO
+			 , CS.ANS_TRANS_DT
+			 , CS.ASSIGNED_CS_NO
+			 , CS.ASSIGNED_YMD
+			 , CS.ASSIGNED_HMS
+			 , CS.ANS_TITLE
+			 , CS.ANS_CONTENT
+			 , CS.ANS_NO
+			 , CS.ANS_DT
+			 , CS.SECRET_YN
+		FROM  TB_COUNSEL CS
+			      INNER JOIN
+		      TB_CUSTOMER C
+		      ON    CS.CUST_NO = C.CUST_NO
+		WHERE CS.COUNSEL_TYPE = 'G'
+		  AND  CS.CUST_NO = #{custNo}
+	</select>
+
+	<!--회원등급 변경내역  -->
+	<select id="getCustomerChangeGradeList" parameterType="Integer" resultType="Customer">
+		/* TsaCustomer.getCustomerChangeGradeList */
+		SELECT 1
+	</select>
+
+	<!-- 회원접촉이력 -->
+	<select id="getCustomerContactList" parameterType="Integer" resultType="CustContactHst">
+		/* TsaCustomer.getCustomerContactList */
+		SELECT CONTACT_HST_SQ
+		     , CONTACT_TYPE
+		     , CONTACT_METHOD
+		     , CONTACT_CONTENTS
+		     , SENDER_NO
+		     , DATE_FORMAT(SEND_DT, '%Y%m%d%H%i%S') AS SEND_DT
+		     , RECEIVER_NO
+		     , REG_NO
+		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S')  AS REG_DT
+		FROM   TB_CUST_CONTACT_HST
+		WHERE  RECEIVER_NO = #{custNo}
+		ORDER  BY REG_DT DESC
+	</select>
+
 	<!-- 탈퇴회원목록 -->
 	<select id="getCustomerSecedeList" parameterType="CustomerSearch" resultType="Customer">
 		/* TsaCustomer.getSecedeCustomerList */