|
|
@@ -1554,6 +1554,7 @@ public class TssGoodsService {
|
|
|
float pntPrate = 0f;
|
|
|
float pntMrate = 0f;
|
|
|
float sellFeeRate = 0f;
|
|
|
+ String distributionGb = "G065_12";
|
|
|
|
|
|
for (Brand tmpBrand : brandList) {
|
|
|
if ("G009_10".equals(goods.getFormalGb())) {
|
|
|
@@ -1564,6 +1565,7 @@ public class TssGoodsService {
|
|
|
pntMrate = tmpBrand.getPntMrate20();
|
|
|
}
|
|
|
sellFeeRate = tmpBrand.getSellFeeRate(); //판매수수료율
|
|
|
+ distributionGb = tmpBrand.getDistributionGb(); //유통구분
|
|
|
}
|
|
|
goods.setPntPrate(pntPrate); // 포인트적립율(PC)
|
|
|
goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
|
|
|
@@ -1657,10 +1659,10 @@ public class TssGoodsService {
|
|
|
goods.setGoodsType("G056_N"); //상품타입
|
|
|
goods.setFormalGb("G009_10"); // 정상이월 구분
|
|
|
goods.setGoodsGb("G073_11"); //상품구분
|
|
|
- goods.setDistributionGb("G065_12"); //유통구분
|
|
|
- if ("S006".equals(goods.getBrandCd())) { //frj 사입처리
|
|
|
- goods.setDistributionGb("G065_11"); //자사 - 사입
|
|
|
- }
|
|
|
+ goods.setDistributionGb(distributionGb); //유통구분
|
|
|
+// if ("S006".equals(goods.getBrandCd())) { //frj 사입처리
|
|
|
+// goods.setDistributionGb("G065_11"); //자사 - 사입
|
|
|
+// }
|
|
|
goods.setTaxGb("10"); // 과세구분 10: 과세, 20:비과세
|
|
|
goods.setSelfGoodsYn("Y"); // 자사상품여부
|
|
|
goods.setSelfMallYn("Y"); //자사몰 노출여부
|
|
|
@@ -2254,7 +2256,7 @@ public class TssGoodsService {
|
|
|
|
|
|
float pntPrate = 0f;
|
|
|
float pntMrate = 0f;
|
|
|
-
|
|
|
+ String distributionGb = "G065_20";
|
|
|
for (Brand tmpBrand : brandList) {
|
|
|
if ("G009_10".equals(goods.getFormalGb())) {
|
|
|
pntPrate = tmpBrand.getPntPrate10();
|
|
|
@@ -2263,6 +2265,7 @@ public class TssGoodsService {
|
|
|
pntPrate = tmpBrand.getPntPrate20();
|
|
|
pntMrate = tmpBrand.getPntMrate20();
|
|
|
}
|
|
|
+ distributionGb = tmpBrand.getDistributionGb(); //유통구분
|
|
|
}
|
|
|
goods.setPntPrate(pntPrate); // 포인트적립율(PC)
|
|
|
goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
|
|
|
@@ -2430,7 +2433,7 @@ public class TssGoodsService {
|
|
|
}
|
|
|
|
|
|
goods.setGoodsType("G056_N"); //상품타입
|
|
|
- goods.setDistributionGb("G065_20"); //유통구분
|
|
|
+ goods.setDistributionGb(distributionGb); //유통구분
|
|
|
goods.setSelfGoodsYn("N"); // 자사상품여부
|
|
|
goods.setSelfMallYn("Y"); //자사몰 노출여부
|
|
|
goods.setErpStockLinkYn("N"); // ERP재고연동여부
|
eskim