Merge branch 'develop' into card007

src/main/java/com/style24/core/biz/service/TscClauseService.java

@@ -56,13 +56,13 @@ public class TscClauseService {
 	}
 
 	/**
-	 * 약관정보
+	 * 개인정보취급방침 정보
 	 * @param  clauseSq - 약관시퀀스
 	 * @return String - 약관내용
 	 * @author jsshin
 	 * @since 2021. 06. 10
 	 */
-	public Clause getClauseInfo(Integer clauseSq) {
+	public Clause getPrivacyPolicyInfo(Integer clauseSq) {
 		return clauseDao.getClauseInfo(clauseSq);
 	}
 

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -818,7 +818,7 @@ public class TscOrderService {
 		// 1. 쿠폰대상이 있는 상품만 정리
 		for (Order tmtbGoods : tmtbGoodsApplyList) {
 			List<Order> goodsCpnList = new ArrayList<Order>();
-
+			
 			for (Order goodsCpnAll : goodsCpnAllList) {
 				// 2. 적용상풒 전체(A) or 상품코드 같을때 담기
 				if ("A".equals(goodsCpnAll.getApplyScope()) || tmtbGoods.getGoodsCd().equals(goodsCpnAll.getGoodsCd())) {
@@ -826,7 +826,7 @@ public class TscOrderService {
 					
 					// 3. 상품쿠폰목록에 담긴 상풐은 제외
 					for (Order goodsCpnApply : goodsCpnList) {
-						if (goodsCpnAll.getCpnId() == goodsCpnApply.getCpnId()) {
+						if (goodsCpnAll.getCpnId().equals(goodsCpnApply.getCpnId())) {
 							temp = false;
 						}
 					}
@@ -2391,6 +2391,9 @@ public class TscOrderService {
 						} catch (Exception e) {
 							throw new IllegalStateException(message.getMessage("FAIL_0004"));
 						}
+
+						// TODO 취소 메일 송부
+
 					}
 				}
 			}

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -256,7 +256,9 @@ public class TscConstants {
 	public enum OrderCancelReason {
 		CHANGE_CUSTOMER("G686_10"),		// 고객변심
 		ADMIN_CANCEL("G686_20"),			// 관리자취소
-		SOLDOUT_CANCEL("G686_30");		// 품절
+		DELAY_ORDER("G686_13"),			// 상품이 늦게 배송됨
+		SOLDOUT_CANCEL("G686_30"),		// 품절
+		ETC("G686_90");					// 기타
 
 		private String value;
 

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

@@ -48,6 +48,7 @@ public class Point extends TscBaseDomain {
 	private String searchDt;			// 검색일자
 	private int buyPointExpireDays;		// 구매포인트소멸일
 	private int autoBuyConfirmDays;		// 자동구매확정일
+	private String signGb;				// 증가/감소
 	
 	// 암호화 대상 복호화 처리
 	public String getCustNm() {

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

@@ -1990,11 +1990,22 @@
 	<!-- 총알배송 가능시간 조회 -->
 	<select id="getDailyDeliveryTimeInfo" resultType="int">
 		/* order.getDailyDeliveryTimeInfo */
-		SELECT CASE WHEN TIME_FORMAT(NOW(), '%H%i%S') > 100000
-		            THEN 0
-		            ELSE 1
-		            END  SHOT_DELV_ABLE_YN
-		FROM   DUAL
+		SELECT IFNULL(SUM(A.SHOT_DELV_ABLE_YN), 0) AS SHOT_DELV_ABLE_YN
+		FROM (
+			SELECT CASE WHEN TIME_FORMAT(NOW(), '%H') <![CDATA[<]]> ENV.STR_SET_VAL4 AND BIZ.BIZDAY_YN IN ('Y')
+			            THEN 1
+			            ELSE 0
+			            END  SHOT_DELV_ABLE_YN
+			FROM   TB_ENVSET ENV
+			LEFT   OUTER JOIN TB_BIZDAY BIZ
+			ON     1=1
+			AND    BIZ.BIZDAY = DATE_FORMAT(NOW(), '%Y%m%d')
+			WHERE  1=1
+			AND    ENV.SITE_CD = 'G000_10'
+			AND    ENV.ENVSET_TYPE = 'O15'
+			ORDER  BY ENV.REG_DT DESC
+			LIMIT  1
+		) A
 	</select>
 	
 	<!-- 총알배송 가능지역 조회 -->

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

@@ -22,7 +22,14 @@
 		     , #{usPntAmt}
 		     , #{rmPntAmt}
 		     <if test="expBeDt != null and expBeDt != ''">
+		         <choose>
+		            <when test='signGb == "-"'>
+		     , NOW()
+		            </when>
+		            <otherwise>
 		     , DATE_FORMAT(#{expBeDt}, '%Y%m%d%H%i%S')
+		            </otherwise>
+		     </choose>
 		     </if>
 		     , #{expCmpDt}
 		     , #{regNo}