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

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

@@ -470,6 +470,14 @@ public interface TscOrderDao {
 	 * @since 2021. 05. 10
 	 */
 	void updateInsurance(Order order);
+
+	/**
+	 * 네이버페이 주문번호 저장
+	 * @param order
+	 * @author xodud1202
+	 * @since 2021. 05. 11
+	 */
+	void updateNaverPayOrderNo(Order order);
 	
 	/**
 	 * 2. 주문배송지정보 등록

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

@@ -1515,17 +1515,19 @@ public class TscOrderService {
 		
 		// 5. 주문사은품정보등록
 		order.setOrdDtlStat(TscConstants.OrderDetailStat.ORDER_RECEIPT.value());
-		orderDao.createOrdFreegift(order);
-		
-		// 6. 주문사은품 상품 정보 등록
-		orderDao.createOrdFreegiftVal(order);
-		
-		// 7. 주문사은품 주문상세정보 등록
-		for(int i = 0 ; i < order.getFreegiftGoodsArr().length ; i++) {
-			order.setFreegiftSq(order.getFreegiftSqArr()[i]);
-			order.setGoodsCd(order.getFreegiftGoodsArr()[i]);
-			
-			orderDao.createOrdFreegiftDtl(order);
+		if(order.getFreegiftValArr() != null && order.getFreegiftValArr().length > 0) {
+			orderDao.createOrdFreegift(order);
+
+			// 6. 주문사은품 상품 정보 등록
+			orderDao.createOrdFreegiftVal(order);
+
+			// 7. 주문사은품 주문상세정보 등록
+			for(int i = 0 ; i < order.getFreegiftGoodsArr().length ; i++) {
+				order.setFreegiftSq(order.getFreegiftSqArr()[i]);
+				order.setGoodsCd(order.getFreegiftGoodsArr()[i]);
+
+				orderDao.createOrdFreegiftDtl(order);
+			}
 		}
 		
 		// 8. 2021.04.25 보증보험신청정보등록 (무통장결제, 실시간계좌이체)

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

@@ -675,4 +675,7 @@ public class Order extends TscBaseDomain {
 	private int pointUseOrdMinAmt;		// 포인트사용기준
 	private int pointUseMaxLimit;		// 최대사용가능포인트율
 	private String custPayMeans;		// 결제타입설정
+
+	private String backUrl;
+	private String goodsUrl;
 }

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

@@ -858,9 +858,15 @@
 		 ORDER BY OM.REG_DT DESC
 	</select>
 
-
-
-
+	<!-- 네이버페이 주문번호 저장 -->
+	<update id="updateNaverPayOrderNo" parameterType="Order">
+		/* TscOrder.updateNaverPayOrderNo */
+		UPDATE TB_ORDER SET
+		       NPAY_ORD_NO = #{npayOrdNo}
+		     , UPD_NO       = #{updNo}
+		     , UPD_DT       = NOW()
+		WHERE  ORD_NO = #{ordDtlNo}
+	</update>
 
 	<!-- 주문/배송 > 입점업체 주문상세정보 변경 (입점) -->
 	<update id="updateOrderDetailStat" parameterType="Order">
@@ -1415,6 +1421,7 @@
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
 		     , Z.SYS_IMG_NM
+		     , Z.DELV_FEE_CRITE
 		     , CASE WHEN #{frontGb} = 'P' 
 		            THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_PRATE/100)
 		            ELSE (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100) 
@@ -1452,6 +1459,7 @@
 		             , G.PNT_PRATE
 		             , G.PNT_MRATE
 		             , DFP.SUPPLY_COMP_CD
+		             , DFP.DELV_FEE_CRITE
 		             , CT.CUST_GRADE
 		             , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
 		                    ELSE DFP.DELV_FEE_CD 
@@ -1519,6 +1527,7 @@
 			) Z
 		GROUP  BY Z.CART_SQ
 		     , Z.BRAND_ENM
+		     , Z.BRAND_KNM
 		     , Z.GOODS_NM
 		     , Z.GOODS_CD
 		     , Z.GOODS_QTY
@@ -1541,9 +1550,13 @@
 		     , Z.CURR_PRICE
 		     , Z.ORG_CURR_PRICE
 		     , Z.CPN1_CPN_SQ
+		     , CPN1_DC_AMT
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
 		     , Z.SYS_IMG_NM
+		     , Z.DELV_FEE_CRITE
+		     , SAVE_PNT_AMT
+		     , PRE_PNT_DC_AMT
 		     , Z.SHOT_DELV_YN
 		     , Z.FOREIGN_BUY_YN
 		     , Z.ORDER_MADE_YN