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

src/main/java/com/style24/core/biz/dao/TscPointDao.java

@@ -34,12 +34,21 @@ public interface TscPointDao {
 	int createCustomerPointHst(Point point);
 
 	/**
-	 * 구매확정 포인트 조회
-	 * @param Integer
+	 * 구매확정 포인트 생성
+	 * @param Point
 	 * @return int
 	 * @author card007
-	 * @since 2021. 02. 17
+	 * @since 2021. 02. 23
 	 */
-	int getOrderDecisionPoint(Integer ordDtlNo);
+	int createOrderDecisionPoint(Point point);
+
+	/**
+	 * 구매확정 포인트 이력 수정
+	 * @param Point
+	 * @return int
+	 * @author card007
+	 * @since 2021. 02. 23
+	 */
+	int updateOrderDecisionPointHst(Point point);
 
 }

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

@@ -950,25 +950,15 @@ public class TscOrderService {
 		try {
 			for (Integer ordDtlNo : order.getOrdDtlNoArr()) {
 				// 구매확정 포인트 적립
-				int savePntAmt = pointService.getOrderDecisionPoint(ordDtlNo);
-
 				Point point = new Point();
 				point.setCustNo(custNo);
-				point.setGvPntAmt(savePntAmt);
-				point.setUsPntAmt(0);
-				point.setRmPntAmt(savePntAmt);
-				point.setExpBeDt(getExpBeDt());
-				point.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT.value());
-				point.setOccurDtlDesc("구매확정");
-				point.setPntAmt(savePntAmt);
 				point.setOrdNo(ordNo);
 				point.setOrdDtlNo(ordDtlNo);
 				point.setReviewSq(reviewSq);
-				point.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
 				point.setRegNo(regNo);
 				point.setUpdNo(updNo);
 
-				pointService.saveCustomerPoint(point);
+				pointService.createOrderDecisionPoint(point);
 
 				// 주문상세 상태값 변경
 				order.setOrdDtlStat(TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value());
@@ -986,20 +976,6 @@ public class TscOrderService {
 		return result;
 	}
 
-	/**
-	 * 구매확정 만료예정일 계산
-	 *
-	 * @result String
-	 * @author card007
-	 * @since 2021. 02. 17
-	 */
-	private String getExpBeDt() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-		Calendar cal = Calendar.getInstance();
-		cal.add(Calendar.YEAR, 1);
-		return sdf.format(cal.getTime()) + "235959";
-	}
-
 	/**
 	 * 장바구니 쿠폰 적용 상품 리스트 조회
 	 * @param Order

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

@@ -35,16 +35,16 @@ public class TscPointService {
 	}
 
 	/**
-	 * 구매확정 포인트 조회
+	 * 구매확정 포인트 생성
 	 * @param Integer
 	 * @return int
 	 * @author card007
 	 * @since 2021. 02. 17
 	 */
-	public int getOrderDecisionPoint(Integer ordDtlNo) {
-		return pointDao.getOrderDecisionPoint(ordDtlNo);
+	public int createOrderDecisionPoint(Point point) {
+		int result = pointDao.createOrderDecisionPoint(point);
+		result += pointDao.updateOrderDecisionPointHst(point);
+		return result;
 	}
 
-
-
 }

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

@@ -409,7 +409,6 @@ public class Order extends TscBaseDomain {
 	private int delvTotCnt;
 	private int delvFeeTotCnt;
 
-	Collection<Order> notApplyTmtbGoodsList;
 	Collection<Order> wmsCartList;
 	Collection<Order> resCartList;
 	Collection<Order> delvCartList;
@@ -461,8 +460,13 @@ public class Order extends TscBaseDomain {
 	private int applyAmtSectionVal;					// 적용 조건
 	private int applyQtySectionVal;					// 적용 조건
 	private int dcVal;								// 할인값
-	private int tmtbCnt;							// 다다익선 수량
+	private int qtyDcVal;							// 수량 다다익선 할인값
+	private int amtDcVal;							// 금액 다다익선 할인값
+	private int qtyTmtbCnt;							// 수량 다다익선 상품 수
+	private int amtTmtbCnt;							// 금액 다다익선 상품 수
 	private int sectionVal;							// 다다익선 조건
+	private int qtySectionVal;						// 수량 다다익선 조건
+	private int amtSectionVal;						// 금액 다다익선 조건
 	private int tmtbSumQty;							// 장바구니 수량 다다익선 총계
 	private int tmtbSumAmt;							// 장바구니 금액 다다익선 총계
 	private int qtyTmtbSumQty;						// 수량 다다익선 합계 수량
@@ -471,12 +475,15 @@ public class Order extends TscBaseDomain {
 	private int amtTmtbSumAmt;						// 금액 다다익선 합계 금액
 	private String qtyTmtbNm;						// 수량 적용 다다익선명
 	private String amtTmtbNm;						// 금액 적용 다다익선명
+	private String qtyDcWay;						// 수량 다다익선 할인구분
+	private String amtDcWay;						// 금액 다다익선 할인구분
 	private String qtyGoodsGb;						// 상품 구분 (G800_10(기본), G800_20(적용), G800_30(제외), G800_40(ALL))
 	private String amtGoodsGb;						// 상품 구분 (G800_10(기본), G800_20(적용), G800_30(제외), G800_40(ALL))
 	private String goodsGb;							// 상품 구분 (G800_10(기본), G800_20(적용), G800_30(제외), G800_40(ALL))
 	private String applyGb;							// 다다익선 할인 기준
 	private String applyQtySectionYn;				// 다다익선 적용 여부
 	private String applyAmtSectionYn;				// 다다익선 적용 여부
+
 	
 	// 마이페이지
 	private int itemCnt;

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

@@ -80,12 +80,58 @@
 		)
 	</insert>
 
-	<!-- 구매확정 포인트 조회 -->
-	<select id="getOrderDecisionPoint" parameterType="Integer" resultType="int">
+	<!-- 구매확정 포인트 생성 -->
+	<insert id="createOrderDecisionPoint" parameterType="Point" keyProperty="custPntSq">
 		/* TscOrder.createOrderDecisionPoint */
-		SELECT SAVE_PNT_AMT
-		  FROM TB_ORDER_DETAIL
-		 WHERE ORD_DTL_NO = #{ordDtlNo}
-	</select>
+		INSERT INTO TB_CUST_POINT (
+			CUST_NO
+		  , GV_PNT_AMT
+		  , US_PNT_AMT
+		  , RM_PNT_AMT
+		  , EXP_BE_DT
+		  , EXP_CMP_DT
+		  , REG_NO
+		  , REG_DT
+		  , UPD_NO
+		  , UPD_DT
+		)
+		SELECT CUST_NO
+			 , SUM(PNT_AMT) AS GV_POINT_AMT
+			 , 0            AS US_PNT_AMT
+			 , SUM(PNT_AMT) AS RM_POINT_AMT
+			 , CONCAT(CURRENT_DATE + INTERVAL 1 YEAR, ' 23:59:59') AS EXP_BE_DT
+			 , NULL         AS EXP_CMP_DT
+			 , #{regNo}     AS REG_NO
+			 , NOW()        AS REG_DT
+			 , #{updNo}     AS UPD_NO
+			 , NOW()        AS UPD_DT
+		  FROM TB_CUST_POINT_HST
+		 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
+	</insert>
+	
+	<!-- 구매확정 포인트 이력 수정 -->
+	<update id="updateOrderDecisionPointHst" parameterType="Point">
+		/* TscOrder.updateOrderDecisionPoint */
+		UPDATE TB_CUST_POINT_HST
+		   SET CUST_PNT_SQ = #{custPntSq}
+		<if test="reviewSq != null and reviewSq != ''">
+			 , REVIEW_SQ = #{reviewSq}
+		</if>
+			 , SWITCH_DUE_DT = NOW()
+			 , PNT_UPLOAD_STAT = 'G070_30'
+			 , PNT_UPLOAD_DT = NOW()
+			 , UPD_NO = #{updNo}
+			 , UPD_DT = NOW()
+		 WHERE CUST_NO = #{custNo}
+		   AND ORD_NO = #{ordNo}
+		   AND ORD_DTL_NO = #{ordDtlNo}
+		   AND OCCUR_GB = 'G069_12'
+		   AND PNT_UPLOAD_STAT = 'G070_10'
+	</update>
 
 </mapper>