입점상품관련 적립율관련 수정

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -3768,6 +3768,30 @@ public class TssGoodsService {
 
 		goods.setSellFeeRate(supplyCompanyList.iterator().next().getSellFeeRate()); // 판매수수료율
 
+		// 적립포인트 관련 브랜드 확인
+		Brand brand = new Brand();
+		brand.setBrandCd(goods.getBrandCd());
+		Collection<Brand> brandList = businessService.getBrandList(brand);
+		if (brandList == null || brandList.isEmpty()) {
+			throw new IllegalStateException("상품브랜드를  확인해 주세요.");
+		}
+
+		float pntPrate = 0f;
+		float pntMrate = 0f;
+		for (Brand tmpBrand : brandList) {
+			if ("G009_10".equals(goods.getFormalGb())) {
+				pntPrate = tmpBrand.getPntPrate10();
+				pntMrate = tmpBrand.getPntMrate10();
+			} else {
+				pntPrate = tmpBrand.getPntPrate20();
+				pntMrate = tmpBrand.getPntMrate20();
+			}
+		}
+		goods.setPntPrate(pntPrate); // 포인트적립율(PC)
+		goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
+		goods.setPrePpntUsableYn("N");
+		goods.setPreMpntUsableYn("N");
+
 		//log.info("[createGoodsDetail 22 ] goods=>{}", goods);
 		// 기본정보 생성
 		goodsDao.createGoods(goods); // 상품기본 저장

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -1026,18 +1026,23 @@
 			$("#goodsDetailForm input[type=radio][checked]").addClass("checked");
 			//$("#goodsDetailForm input[type=radio][checked]").parent("label").addClass("checked");
 
+			$('#goodsDetailForm input[name=pntPrate]').val(result.pntPrate);
+			$('#goodsDetailForm input[name=pntPrateOrg]').val(result.pntPrate);
+			$('#goodsDetailForm input[name=pntMrate]').val(result.pntMrate);
+			$('#goodsDetailForm input[name=pntMrateOrg]').val(result.pntMrate);
 			//입점상품일 경우
 			if (result.selfGoodsYn == "N"){
 				$("#goodsDetailForm").find("#selfGoodsDpTitle").html('원코드');
 				$("#goodsDetailForm").find("#selfGoodsDpTxt").html('<div id="supplyGoodsCdTxt"></div>');
 				$('#goodsDetailForm').find('#supplyGoodsCdTxt').html(result.supplyGoodsCd);
 				$('#goodsDetailForm select[name=distributionGb]').attr('readonly', true);
+				$('#goodsDetailForm input[name=pntPrate]').attr('readonly', true);
+				$('#goodsDetailForm input[name=pntMrate]').attr('readonly', true);
+				$('#goodsDetailForm input[name=prePpntUsableYn]').attr('readonly', true);
+				$('#goodsDetailForm input[name=preMpntUsableYn]').attr('readonly', true);
 			}
 			$('#goodsDetailForm input[name=delvFee]').val(result.delvFee.addComma());
-			$('#goodsDetailForm input[name=pntPrate]').val(result.pntPrate);
-			$('#goodsDetailForm input[name=pntPrateOrg]').val(result.pntPrate);
-			$('#goodsDetailForm input[name=pntMrate]').val(result.pntMrate);
-			$('#goodsDetailForm input[name=pntMrateOrg]').val(result.pntMrate);
+			
 			$('#goodsDetailForm input[name=minOrdAmt]').val(result.minOrdAmt.addComma());
 			$('#goodsDetailForm input[name=minOrdQty]').val(result.minOrdQty);
 			$('#goodsDetailForm input[name=minOrdQtyOrg]').val(result.minOrdQty);

src/main/webapp/WEB-INF/views/goods/GoodsRegisterForm.html

@@ -274,7 +274,7 @@
 											<input type="text" class="w100 aR" id="minOrdAmt" name="minOrdAmt" disabled="disabled"/> 원
 										</td>
 									</tr>
-									<tr>
+									<!-- <tr>
 										<th>PC포인트/즉시사용여부<em class="required" title="필수"></em></th>
 										<td>
 											<input type="text" class="w50 aR" id="pntPrate" name="pntPrate" data-valid-type="numeric" maxlength="3" required="required" data-valid-name="PC포인트"/> ％ /&nbsp;
@@ -288,7 +288,7 @@
 											<label class="rdoBtn"><input type="radio" name="preMpntUsableYn" id="preMpntUsableYnN" value="N" checked="checked"/>N</label>
 										</td>
 										
-									</tr>
+									</tr> -->
 									<tr>
 										<th>최소주문수량<em class="required" title="필수"></em></th>
 										<td>