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

# Conflicts:
#	src/main/java/com/style24/core/biz/service/TscOrderService.java

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

@@ -2149,6 +2149,17 @@ public class TscOrderService {
 		}
 	}
 
+	/**
+	 * 주문상세상태 변경 및 이력 생성
+	 * @param order - 고객번호, 주문번호, 주문상세번호
+	 * @author jsshin
+	 * @since 2021. 04. 21
+	 */
+	@Transactional("shopTxnManager")
+	public void saveOrdDtlStat(Order order) {
+		orderDao.changedOrdDtlStat(order);
+		orderDao.createOrderDetailHst(order);
+	}
 }
 
 
@@ -2168,4 +2179,3 @@ public class TscOrderService {
 
 
 
-

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

@@ -1,5 +1,7 @@
 package com.style24.core.biz.service;
 
+import com.style24.core.support.env.TscConstants;
+import com.style24.persistence.domain.Order;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +25,11 @@ public class TscPointService {
 	@Autowired
 	private TscPointDao pointDao;
 
+	@Autowired
+	private TscEnvsetService envsetService;
+
+	@Autowired
+	private TscOrderService orderService;
 
 	/**
 	 * 포인트 적립
@@ -38,12 +45,17 @@ public class TscPointService {
 
 	/**
 	 * 구매확정 포인트 생성
-	 * @param Integer
+	 * @param point
 	 * @return int
 	 * @author card007
 	 * @since 2021. 02. 17
 	 */
+	@Transactional("shopTxnManager")
 	public int createOrderDecisionPoint(Point point) {
+		// 구매포인트소멸기한(일)
+		int expireDays = envsetService.getBuyPointExpireDays(TscConstants.Site.STYLE24.value());
+		point.setBuyPointExpireDays(expireDays);
+
 		// 구매확정 포인트 생성
 		pointDao.createOrderDecisionPoint(point);
 		// 구매확정 포인트 히스토리 수정
@@ -53,4 +65,33 @@ public class TscPointService {
 		return pointDao.getOrderDecisionPoint(point);
 	}
 
+	/**
+	 * 자동 구매확정 포인트 생성
+	 *
+	 * @param point - 고객번호, 주문번호, 주문상세번호
+	 * @author jsshin
+	 * @since 2021. 04. 21
+	 */
+	@Transactional("shopTxnManager")
+	public void saveAutoPurchaseConfirmation(Point point) {
+		// 1.구매포인트소멸기한(일)
+		int expireDays = envsetService.getBuyPointExpireDays(TscConstants.Site.STYLE24.value());
+		point.setBuyPointExpireDays(expireDays);
+
+		// 2.구매확정 포인트 생성
+		pointDao.createOrderDecisionPoint(point);
+		// 3.구매확정 포인트 히스토리 수정
+		pointDao.updateOrderDecisionPointHst(point);
+
+		// 4.주문상세 상태 변경 및 히스토리 생성
+		Order order = new Order();
+		order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
+		order.setOrdNo(point.getOrdNo());
+		order.setOrdDtlNo(point.getOrdDtlNo());
+		order.setRegNo(point.getRegNo());
+		order.setUpdNo(point.getUpdNo());
+		orderService.saveOrdDtlStat(order);
+
+	}
+
 }

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

@@ -41,4 +41,5 @@ public class Point extends TscBaseDomain {
 	private String month;				// 날짜변수
 
 	private String searchDt;			// 검색일자
+	private int buyPointExpireDays;		// 구매포인트소멸일
 }

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

@@ -99,7 +99,7 @@
 			 , SUM(PNT_AMT) AS GV_POINT_AMT
 			 , 0            AS US_PNT_AMT
 			 , SUM(PNT_AMT) AS RM_POINT_AMT
-			 , CONCAT(CURRENT_DATE + INTERVAL 2 YEAR, ' 23:59:59') AS EXP_BE_DT
+			 , CONCAT(CURRENT_DATE + INTERVAL #{buyPointExpireDays} DAY, ' 23:59:59') AS EXP_BE_DT
 			 , NULL         AS EXP_CMP_DT
 			 , #{regNo}     AS REG_NO
 			 , NOW()        AS REG_DT
@@ -109,9 +109,8 @@
 		WHERE CUST_NO = #{custNo}
 		AND   ORD_NO = #{ordNo}
 		AND   ORD_DTL_NO = #{ordDtlNo}
-		AND   OCCUR_GB = 'G069_12'              -- 예정포인트적립
-		AND   PNT_UPLOAD_STAT = 'G070_10'       -- 반영예정
-		GROUP BY CUST_NO
+		AND   OCCUR_GB IN ('G069_12', 'G069_13')  -- 예정포인트적립
+		AND   PNT_UPLOAD_STAT = 'G070_10'         -- 반영예정
 	</insert>
 	
 	<!-- 구매확정 포인트 이력 수정 -->
@@ -130,7 +129,7 @@
 		WHERE  CUST_NO = #{custNo}
 		AND    ORD_NO = #{ordNo}
 		AND    ORD_DTL_NO = #{ordDtlNo}
-		AND    OCCUR_GB = 'G069_12'
+		AND    OCCUR_GB IN ('G069_12', 'G069_13')
 		AND    PNT_UPLOAD_STAT = 'G070_10'
 	</update>
 	
@@ -138,8 +137,8 @@
 	<select id="getOrderDecisionPoint" parameterType="Point" resultType="int">
 		/* TscPoint.getOrderDecisionPoint */
 		SELECT GV_PNT_AMT
-		  FROM TB_CUST_POINT
-		 WHERE CUST_PNT_SQ = #{custPntSq}
+		FROM TB_CUST_POINT
+		WHERE CUST_PNT_SQ = #{custPntSq}
 	</select>
 
 </mapper>