Browse Source

배송비정책 자사일때는 값 1개로만 처리되도록 수정

gagamel 5 years ago
parent
commit
3c927ad550

+ 1 - 0
src/main/java/com/style24/persistence/domain/DelvFeePolicy.java

@@ -21,5 +21,6 @@ public class DelvFeePolicy extends TscBaseDomain {
 	private int delvFee;			// 배송비
 	private int rtnDelvFee;			// 반품배송비
 	private String useYn;			// 사용여부
+	private String distributionGb;	// 유통구분
 
 }

+ 12 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsaBusiness.xml

@@ -348,7 +348,18 @@
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
-		WHERE  DELV_FEE_CD = #{delvFeeCd}
+		WHERE  1 = 1
+		<choose>
+		    <when test="distributionGb == 'G065_20'"> <!-- 입점-위탁 -->
+		AND    DELV_FEE_CD = #{delvFeeCd}
+		    </when>
+		    <otherwise>
+		AND    SUPPLY_COMP_CD IN (SELECT SUPPLY_COMP_CD
+		                          FROM   TB_SUPPLY_COMPANY
+		                          WHERE  DISTRIBUTION_GB != 'G065_20' /*자사*/
+		                         )
+		    </otherwise>
+		</choose>
 	</update>
 	
 	<!-- 출고처 목록 -->

+ 8 - 4
src/main/webapp/WEB-INF/views/business/SupplyCompanyForm.html

@@ -439,6 +439,13 @@
 		$('#detailForm input[name=bizDtlAddr]').val(event.data.bizDtlAddr);
 		$('#detailForm input[name=homepageUrl]').val(event.data.homepageUrl);
 		$('#detailForm select[name=distributionGb]').val(event.data.distributionGb);
+		
+		if (event.data.distributionGb == 'G065_20') { // 입점업체
+			$('#btnAddDelvFeePolicy').show();
+		} else { // 자사업체
+			$('#btnAddDelvFeePolicy').hide();
+		}
+		
 		$('#detailForm input[name=mainTelno]').val(event.data.mainTelno);
 		$('#detailForm input[name=mainFaxno]').val(event.data.mainFaxno);
 		$('#detailForm input[name=sellFeeRate]').val(event.data.sellFeeRate);
@@ -656,6 +663,7 @@
 					params.delvFee = $(this).find('input[name=delvFee]').val();
 					params.rtnDelvFee = $(this).find('select[name=rtnDelvFee]').val();
 					params.useYn = $(this).find('select[name=useYn]').val();
+					params.distributionGb = $('#detailForm select[name=distributionGb]').val();
 					arrData.push(params);
 				});
 				
@@ -690,10 +698,6 @@
 	$(document).ready(function() {
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);
-		
-		// Create a summernote
-		var snOptions = gagaSn.getToolbarOptions('media');
-		gagaSn.createSummernote(snOptions, '#note');
 	});
 /*]]>*/
 </script>