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

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

@@ -941,8 +941,6 @@ public class TscOrderChangeService {
 			orderChangeDao.updateOrdFreegiftDel(freegiftOrder);
 		}
 
-
-
 		// 상품권으로만 결제 시 PG점프
 		if (!TscConstants.PgGb.ISTYLE.value().equals(pgGb)) {
 			if (TscConstants.PgGb.KCP.value().equals(pgGb) || TscConstants.PgGb.PAYCO.value().equals(pgGb)) {

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

@@ -693,4 +693,6 @@ public class Order extends TscBaseDomain {
 	private int realOrdSumAmt;
 	private int delvSumAmt;
 	
+	private String delvFeeCdGrp;		// 자사,입점구분을 위해서 생성
+	
 }

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

@@ -115,7 +115,6 @@
 		     , G.PRODUCT_NO
 		     , G.PRODUCT_CODE 
 		     , G.GOODS_NM 
-		     , G.GOODS_NUM 
 		     , G.SYS_IMG_NM 
 		FROM   TB_FREEGIFT_VAL FGV
 		INNER  JOIN TB_FREEGIFT FG

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

@@ -611,6 +611,7 @@
 		     , A.RETURNABLE_YN
 		     , A.CHANGEABLE_YN
 		     , A.DELV_FEE_CD
+		     , A.DELV_FEE_CD_GRP
 		FROM (
 			SELECT OD.ORD_NO
 		         , CASE WHEN OD.ORD_EXCH_GB = 'O'
@@ -681,6 +682,10 @@
 		         , OD.RETURNABLE_YN
 		         , OD.CHANGEABLE_YN
 		         , OD.DELV_FEE_CD
+                 , CASE WHEN G1.SELF_GOODS_YN = 'Y'
+                        THEN 'WMS'
+                        ELSE OD.DELV_FEE_CD
+                        END  DELV_FEE_CD_GRP
 		      FROM TB_ORDER O
 		     INNER JOIN TB_ORDER_DETAIL OD
 		        ON O.ORD_NO = OD.ORD_NO
@@ -778,6 +783,7 @@
 		     , A.RETURNABLE_YN
 		     , A.CHANGEABLE_YN
 		     , A.DELV_FEE_CD
+		     , A.DELV_FEE_CD_GRP
 	</select>
 
 	<!-- 주문상세 > 사은품목록 -->
@@ -3015,7 +3021,6 @@
 		    , ITEM_QTY
 		    , PRODUCT_NO
 		    , PRODUCT_CODE
-		    , GOODS_NUM
 		    , BRAND_CD
 		    , DEL_YN
 		    , REG_NO
@@ -3035,7 +3040,6 @@
 		    , FGV.ITEM_QTY
 		    , FGV.PRODUCT_NO
 		    , FRG.PRODUCT_CODE
-		    , FRG.GOODS_NUM
 		    , FRG.BRAND_CD
 		    , 'N'
 		    , #{custNo}
@@ -3062,7 +3066,7 @@
 		/* TscOrder.createOrdFreegiftDtl */
 		INSERT INTO TB_ORD_FREEGIFT_DTL (
 		    ORD_FREEGIFT_SQ
-		    , FREGIFT_SQ
+		    , FREEGIFT_SQ
 		    , ORD_NO
 		    , ORD_DTL_NO
 		    , DEL_YN

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

@@ -136,15 +136,14 @@
 				</foreach>
 			</if>
 			<if test="ordDtlNoArr != null and ordDtlNoArr != ''">
-				   AND OD. ORD_DTL_NO IN
+				   AND OD.ORD_DTL_NO IN
 				<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
 					#{item}
 				</foreach>
 			</if>
 				   AND OD.ORD_NO = #{ordNo}
-				   AND OD.DELV_FEE_CD = #{delvFeeCd}
 			) Z
-			LEFT OUTER JOIN (
+			INNER JOIN (
 			    SELECT X.DELV_FEE_CD
 			         , SUM(X.DELV_FEE) AS DELV_FEE
 			      FROM TB_DELIVERY_FEE X
@@ -154,6 +153,7 @@
 			     GROUP BY X.DELV_FEE_CD
 			) DF
 			ON Z.DELV_FEE_CD = DF.DELV_FEE_CD
+			AND Z.DELV_FEE_CD = #{delvFeeCdGrp}
 		) Y
 		 GROUP BY Y.ORD_NO, Y.ORD_DTL_NO, Y.ORD_DTL_STAT, Y.ORD_DTL_STAT_NM, Y.ALL_CAN_YN, Y.GOODS_CD, Y.GOODS_NM, Y.GOODS_TYPE, Y.GOODS_TYPE_NM
 				, Y.ORD_DTL_ITEM_SQ, Y.ITEM_CD, Y.ITEM_NM, Y.OPT_CD, Y.OPT_CD1, Y.OPT_CD2, Y.ITEM_QTY, Y.ORD_QTY, Y.CNCL_RTN_QTY, Y.ORD_REQ_CHG_QTY