Merged PR 68: ISTCS-108(총알배송 제외상품 관리 메뉴 수정의 건)

ISTCS-108(총알배송 제외상품 관리 메뉴 수정의 건)
 -상품등록되기 전에 총알배송 제외상품 선등록 가능하게 수정
 -목록에 조회조건 수정

src/main/java/com/style24/admin/biz/service/TsaGoodsService.java

@@ -4043,13 +4043,7 @@ public class TsaGoodsService {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		GoodsSearch search = new GoodsSearch();
-		search.setConditionList(goods.getArrGoodsCd());
-		search.setSearch("searchGoodsCd");
-		int cnt = getGoodsListCount(search);
-		if (cnt < goods.getArrGoodsCd().length) {
-			throw new IllegalStateException("상품코드를 확인해주세요.");
-		}
+		
 
 		goods.setRegNo(TsaSession.getInfo().getUserNo());
 		goods.setUpdNo(TsaSession.getInfo().getUserNo());
@@ -4101,18 +4095,12 @@ public class TsaGoodsService {
 			throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 		}
 
-		// 검증
-		GoodsSearch search = new GoodsSearch();
-		search.setSearch("searchGoodsCd");
+
 
 		int index = 0;
 		for (Goods goods : goodsList) {
 
-			search.setGoodsCd(goods.getGoodsCd());
-			int cnt = getGoodsListCount(search);
-			if (cnt == 0) {
-				throw new IllegalStateException("상품코드를 확인해주세요.");
-			}
+
 
 			goods.setRegNo(TsaSession.getInfo().getUserNo());
 

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

@@ -5049,12 +5049,12 @@
 		/* TsaGoods.getGoodsQuikDeleverySkipCount */
 		SELECT COUNT(*)
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
+		LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
+		LEFT JOIN (
 		            SELECT SEARCH_CD
 		                 , TMP_DISP_ORD
 		            FROM (
@@ -5097,7 +5097,7 @@
 		FROM (
 		    SELECT A.*
 		    FROM (
-		SELECT G.GOODS_CD
+		SELECT A.GOODS_CD
 		     , G.GOODS_NM
 		     , G.GOODS_STAT
 		     , G.SUPPLY_COMP_CD
@@ -5115,12 +5115,12 @@
 		         </otherwise>
 		     </choose>
 		FROM TB_GOODS_SHOT_DELV_SKIP A
-		INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		LEFT JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		LEFT JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		LEFT JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO  = D.BRAND_GROUP_NO
+		LEFT JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
+		LEFT JOIN (
 		            SELECT SEARCH_CD
 		                 , TMP_DISP_ORD
 		            FROM (

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