정산확정 배송비 계산 수정

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

@@ -387,6 +387,7 @@
 		                     , OD.SUPPLY_COMP_CD              /*공급업체코드*/
 		                     , ODIH.ORD_NO                    /*주문번호*/
 		                     , ODIH.ORD_DTL_STAT AS SETTLE_GB /*정산구분*/
+		                     , OD.DELV_FEE_CD
 		                FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		                     , TB_ORDER_DETAIL OD
 		                     , TB_GOODS G
@@ -397,9 +398,14 @@
 		                AND    ODIH.ORD_DTL_STAT IN ('G720_20','G720_50','G720_60') /*판매-배송중,환입-반품완료,환입-교환완료*/
 		               ) OD
 		             , TB_DELIVERY_FEE DF
-		        WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
-		        AND    OD.ORD_NO = DF.ORD_NO
-		        AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
+		       		 , TB_SUPPLY_COMPANY SC
+                     , TB_SUPPLY_VENDOR SV
+                WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
+                AND    OD.ORD_NO = DF.ORD_NO
+                AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
+                AND    OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+                AND    SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+                AND    OD.DELV_FEE_CD = DF.DELV_FEE_CD
 		        GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y%m%d')
 		                , OD.SUPPLY_COMP_CD
 		       ) ODIH