Merge remote-tracking branch 'origin/jsh77b' into order

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

@@ -615,4 +615,28 @@ public class Order extends TscBaseDomain {
 		}
 	}
 	
+	// 휴대폰 번호 대쉬 붙이기
+	public void setHypenRecipPhone() {
+		if (StringUtils.isNotBlank(this.cellPhnno)) {
+			if (this.recipPhnno.length() > 10) {
+				this.recipPhnno = this.recipPhnno.substring(0, 3) + "-" + this.recipPhnno.substring(3, 7) + "-" + this.recipPhnno.substring(7, 11);
+			} else {
+				this.recipPhnno = this.recipPhnno.substring(0, 3) + "-" + this.recipPhnno.substring(3, 6) + "-" + this.recipPhnno.substring(6, 10);
+			}
+		}
+	}
+	
+	private String birthYmd;			// 생년월일(탈퇴 시 NULL로 처리)
+	private String sexGb;				// 성별구분(공통코드G007). 탈퇴 시 NULL로 처리
+	
+	public String getBirthYmd() {
+		this.birthYmd = CryptoUtils.decryptAES(this.birthYmd);
+		return this.birthYmd;
+	}
+	
+	public String getSexGb() {
+		this.sexGb = CryptoUtils.decryptAES(this.sexGb);
+		return this.sexGb;
+	}
+	
 }

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

@@ -1783,10 +1783,10 @@
 		     , Z.CPN1_CPN_SQ
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
-			 , Z.SYS_IMG_NM
-			 , Z.SHOT_DELV_YN
-			 , Z.FOREIGN_BUY_YN
-			 , Z.ORDER_MADE_YN
+		     , Z.SYS_IMG_NM
+		     , Z.SHOT_DELV_YN
+		     , Z.FOREIGN_BUY_YN
+		     , Z.ORDER_MADE_YN
 		ORDER  BY Z.SUPPLY_COMP_CD
 		     , Z.DELV_FEE_CD
 		     , Z.GOODS_CD
@@ -1800,6 +1800,8 @@
 		     , CU.EMAIL
 		     , CU.CELL_PHNNO
 		     , CU.CI
+		     , CU.SEX_GB
+		     , CU.BIRTH_YMD
 		  FROM TB_CUSTOMER CU
 		 WHERE 1=1
 		   AND CU.CUST_NO = #{custNo}
@@ -1907,11 +1909,11 @@
 	<select id="getCustPointInfo" parameterType="Order" resultType="int">
 		/* TscOrder.getCustPointInfo */
 		SELECT IFNULL(SUM(CP.RM_PNT_AMT), 0) AS RM_PNT_AMT
-		FROM TB_CUST_POINT CP
-		WHERE 1=1
-		AND CP.CUST_NO = #{custNo}
-		AND CP.EXP_BE_DT <![CDATA[ < ]]> NOW()
-		AND CP.EXP_CMP_DT IS NULL
+		FROM   TB_CUST_POINT CP
+		WHERE  1=1
+		AND    CP.CUST_NO = #{custNo}
+		AND    CP.EXP_BE_DT <![CDATA[ < ]]> NOW()
+		AND    CP.EXP_CMP_DT IS NULL
 	</select>
 	
 	<!-- 상품권정보 조회 -->