Merge branch 'style' into card007

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

@@ -900,7 +900,7 @@ public interface TscOrderDao {
 	 * @author card007
 	 * @since 2021. 05. 26
 	 */
-	Order getCustPaymeans(Order order);
+	//Order getCustPaymeans(Order order);
 	
 	/**
 	 * 추가결제시 업체명 목록 조회
@@ -1013,6 +1013,42 @@ public interface TscOrderDao {
 	 * @since 2021. 09. 11
 	 */
 	Collection<Order> getSoldOutCnclFailList(Order order);
+	
+	/**
+	 * 최근사용한결제수단
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	Order getCustPaymeans(Order order);
+	
+	/**
+	 * 최근사용한결제수단 조회
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 06. 01
+	 */
+	Order getCustPgGb(Order order);
+	
+	/**
+	 * 최근사용한결제수단 등록
+	 * @param param
+	 * @author jsh77b
+	 * @since  2021. 05. 28
+	 */
+	void createCustPgGb(Order order);
+	
+	/**
+	 * 최근사용한결제수단 수정
+	 * @param param
+	 * @author jsh77b
+	 * @since  2021. 05. 28
+	 */
+	void updateCustPgGb(Order order);
 }
 
 

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

@@ -1507,22 +1507,6 @@ public class TscOrderService {
 			int realDelvAmt = delvFeeCd.getDelvFee() - delvFeeCd.getDelvCpnDcAmt() - delvFeeCd.getDelvGfcdUseAmt();
 			delvFeeCd.setRealDelvAmt(realDelvAmt);
 			
-			/*
-			// TODO 보유쿠폰존재여부체크
-			// 배송비쿠폰할인금액이 존재한다면 실결제배송비용에 쿠폰할인금액을 적용
-			if (delvFeeCd.getDelvCpnDcAmt() > 0) {
-				// 배송비 > 쿠폰할인금액
-				if (delvFeeCd.getDelvFee() > delvFeeCd.getDelvCpnDcAmt()) {
-					int realDelvAmt = delvFeeCd.getDelvFee() - delvFeeCd.getDelvCpnDcAmt();
-					delvFeeCd.setRealDelvAmt(realDelvAmt);
-				} else {
-					delvFeeCd.setRealDelvAmt(0);
-				}
-			} else {
-				delvFeeCd.setRealDelvAmt(delvFeeCd.getDelvFee());
-			}
-			*/
-			
 			orderDao.createDeliveryFee(delvFeeCd); // 주문배송비정보등록
 		}
 		
@@ -1682,6 +1666,19 @@ public class TscOrderService {
 				orderDao.createInsurance(order);
 			}
 		}
+		
+		// 9. 회원의 경우 자주사용하는 결제정보 등록		
+		if (order.getCustNo() > 0) {
+			if ("Y".equals(order.getCustPayMeans())) {
+				Order custPgGb = orderDao.getCustPgGb(order);
+				
+				if (custPgGb != null) {
+					orderDao.updateCustPgGb(order);
+				} else {
+					orderDao.createCustPgGb(order);
+				}
+			}
+		}
 	}
 
 	/**

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

@@ -5320,20 +5320,6 @@
 		LIMIT  1
 	</select>
 
-	<!-- 최근적용한결제정보 -->
-	<select id="getCustPaymeans" parameterType="Order" resultType="Order">
-		/* TscOrder.getCustPaymeans : 최근적용한결제정보 */
-		SELECT PAY_MEANS
-		     , PG_GB
-		FROM   TB_PAYMENT
-		WHERE  1=1
-		AND    REG_NO = #{custNo}
-		AND    PAY_STAT = 'G016_30'
-		AND    PAY_GB = 'O'
-		ORDER  BY REG_DT DESC
-		LIMIT  1
-	</select>
-
 	<!-- 추가결제시 업체명 목록 조회 -->
 	<select id="getDelvFeeCdSupplyCompNmList" parameterType="Order" resultType="Order">
 		/* TscOrder.getDelvFeeCdSupplyCompNmList : 추가결제시 업체명 목록 조회 */
@@ -5683,6 +5669,68 @@
 		     , AA.DELV_FEE_CD_GRP
 		     , AA.ORD_EXCH_GB
 	</select>
+	
+	<!-- 최근적용한결제정보 -->
+	<select id="getCustPaymeans" parameterType="Order" resultType="Order">
+		/* TscOrder.getCustPaymeans : 최근적용한결제정보 */
+		SELECT PAY_MEANS
+		     , PG_GB
+		FROM   TB_PAYMENT
+		WHERE  1=1
+		AND    REG_NO = #{custNo}
+		AND    PAY_STAT = 'G016_30'
+		AND    PAY_GB = 'O'
+		ORDER  BY REG_DT DESC
+		LIMIT  1
+	</select>
+	
+	<!-- 최근적용한결제정보 -->
+	<select id="getCustPgGb" parameterType="Order" resultType="Order">
+		/* TscOrder.getCustPgGb : 최근적용한결제정보 */
+		SELECT PAY_MEANS
+		     , PG_GB
+		FROM   TB_CUST_PG_GB
+		WHERE  1=1
+		AND    REG_NO = #{custNo}
+		LIMIT  1
+	</select>
+	
+	<!-- 자주쓰는결제정보등록 -->
+	<insert id="createCustPgGb" parameterType="Order">
+		/* TscOrder.createCustPgGb : 자주쓰는결제정보등록 */
+		INSERT INTO TB_CUST_PG_GB (
+			CUST_NO
+			, PG_GB
+			, PAY_MEANS
+			, DEL_YN
+			, REG_NO
+			, REG_DT
+			, UPD_NO
+			, UPD_DT
+		) VALUES (
+			#{custNo}
+			, #{pgGb}
+			, #{payMeans}
+			, 'N'
+			, #{custNo}
+			, NOW()
+			, #{custNo}
+			, NOW()
+		)
+	</insert>
+	
+	<!-- 자주쓰는결제정보수정 -->
+	<insert id="updateCustPgGb" parameterType="Order">
+		/* TscOrder.updateCustPgGb : 자주쓰는결제정보수정 */
+		UPDATE TB_CUST_PG_GB
+		SET    PG_GB = #{pgGb}
+		     , PAY_MEANS = #{payMeans}
+		     , UPD_NO = #{custNo}
+		     , UPD_DT = NOW()
+		WHERE  1=1
+		AND    CUST_NO = #{custNo}
+	</insert>
+	
 </mapper>