Просмотр исходного кода

입점상품 등록- 배송비 정책 처리

eskim 5 лет назад
Родитель
Сommit
e4cb1e574b

+ 7 - 3
src/main/java/com/style24/persistence/mybatis/shop/TssGoods.xml

@@ -1065,6 +1065,8 @@
 		    LEFT OUTER JOIN TB_GOODS_COMPOSE B ON A.GOODS_CD = B.GOODS_CD
 		    WHERE A.GOODS_CD = #{goodsCd}
 		    )
+		SELECT * 
+		FROM (
 		SELECT #{goodsCd} AS GOODS_CD
 		     , A.GOODS_CD AS COMPS_GOODS_CD
 		     , A.OPT_CD
@@ -1079,6 +1081,7 @@
 		     , A.SOLDOUT_YN
 		     , A.DISP_ORD
 		     , A.DISP_YN
+		     , C.DISP_ORD AS GOODS_ORD
 		     , COUNT(*) OVER(PARTITION BY A.GOODS_CD ) AS RCOUNT
 		     , ROW_NUMBER() OVER(PARTITION BY A.GOODS_CD ORDER BY A.DISP_ORD, A.OPT_CD1, A.OPT_CD2) AS RNUM
 		FROM  TMP_GOODS C 
@@ -1097,7 +1100,8 @@
 		             AND A.OPT_CD = B.OPT_CD)
 		WHERE 1 = 1
 		AND C.GOODS_CD = #{goodsCd}
-		ORDER BY C.DISP_ORD, A.DISP_ORD, A.OPT_CD1, A.OPT_CD2
+		) Z
+		ORDER BY GOODS_ORD, RNUM
 	</select>
 	
 	<!-- 상품 색상목록 조회 -->
@@ -1112,7 +1116,7 @@
 		FROM (
 		      SELECT A.GOODS_CD 
 		           , A.MAIN_COLOR_CD 
-		           , IFNULL(B.OPT_CD1,'00') AS OPT_CD1
+		           , IFNULL(B.OPT_CD1,'XX') AS OPT_CD1
 		      FROM TB_GOODS A
 		      LEFT OUTER JOIN TB_OPTION B ON A.GOODS_CD = B.GOODS_CD
 		                                  AND 1 = (CASE WHEN A.SELF_GOODS_YN = 'Y' THEN 1
@@ -1177,7 +1181,7 @@
 		  , #{goodsTnm}
 		  , #{goodsSnm}
 		  , #{goodsSnm1}
-		  , IFNULL(#{mainColorCd},'00')
+		  , IFNULL(#{mainColorCd},'XX')
 		  , #{styleYear}
 		  , #{seasonCd}
 		  , #{sexGb}

+ 5 - 6
src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -1662,7 +1662,7 @@ public class TssGoodsService {
 	 * @since 2021. 01. 19
 	 */
 	@Transactional("shopTxnManager")
-	public String createExceluploadGoods(GagaMap gagaMap, String procJob) {
+	public String createExceluploadGoods(GagaMap gagaMap, String procJob, String delvFeeCd) {
 
 		GoodsMass goodsMass = mapper.convertValue(gagaMap, GoodsMass.class);
 
@@ -1676,6 +1676,9 @@ public class TssGoodsService {
 
 		//상품코드 생성
 		goods.setGoodsCd(this.getGoodsCodeSeq("E", goods.getBrandCd())); // 입점상품 상품코드 생성
+		
+		//배송비 정책 코드
+		goods.setDelvFeeCd(delvFeeCd);
 
 		// 상품고시정보 - 항목및 기본값
 		Collection<GoodsNotiInfo> goodsNotiList = goodsDao.getItemkindNotiInfoList(goods);
@@ -2074,7 +2077,6 @@ public class TssGoodsService {
 		float pntPrate = 0f;
 		float pntMrate = 0f;
 		float sellFeeRate = 0f;
-		String supplyCompCd = "";
 		for (Brand tmpBrand : brandList) {
 			if ("G009_10".equals(goods.getFormalGb())) {
 				pntPrate = tmpBrand.getPntPrate10();
@@ -2083,16 +2085,12 @@ public class TssGoodsService {
 				pntPrate = tmpBrand.getPntPrate20();
 				pntMrate = tmpBrand.getPntMrate20();
 			}
-			supplyCompCd = tmpBrand.getSupplyCompCd();	//업체코드
 			sellFeeRate = tmpBrand.getSellFeeRate();	//판매수수료율
 		}
 		goods.setPntPrate(pntPrate); // 포인트적립율(PC)
 		goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
-		goods.setSupplyCompCd(supplyCompCd); // 업체코드
 		goods.setSellFeeRate(sellFeeRate); // 판매수수료율
 
-		goodsMass.setSupplyCompCd(supplyCompCd); // 업체 코드
-
 		// 배송비 정책
 		goods.setDelvFeeCd(goodsMass.getDelvFeeCd()); // 화면에서 받은값
 
@@ -2177,6 +2175,7 @@ public class TssGoodsService {
 		goods.setSelfGoodsYn("N"); // 자사상품여부
 		goods.setSelfMallYn("Y"); //자사몰 노출여부
 		goods.setErpStockLinkYn("N"); // ERP재고연동여부
+		goods.setMainColorCd("XX"); // 무의미 데이터
 
 		return goods;
 	}

+ 1 - 1
src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -854,7 +854,7 @@ public class TssGoodsController extends TssBaseController {
 			}
 
 			for (GagaMap gagaMap : ecxelGoodsList) {
-				goodsService.createExceluploadGoods(gagaMap, goodsMass.getProcJob());
+				goodsService.createExceluploadGoods(gagaMap, goodsMass.getProcJob(), goodsMass.getDelvFeeCd());
 			}
 
 		}