Bladeren bron

제휴몰관리 - 배송비합산여부 항목 추가건

jmh 4 jaren geleden
bovenliggende
commit
756c0c448a

+ 2 - 1
src/main/java/com/style24/persistence/domain/Extmall.java

@@ -27,7 +27,8 @@ public class Extmall extends TscBaseDomain {
 	private String dwdpYn;			// 직접회수여부(Y:제휴몰에서회수, N:자사몰에서회수)
 	private String cnclsmsSendYn;	// 취소문자발송여부(Y:제휴몰에서발송, N:자사몰에서발송)
 	private String useYn;			// 사용여부
-
+	private String delvFeeSumYn;	// 샵링커 주문수집 배송비 산정방식 -> 합산여부 YN
+	
 	// 검색조건
 	private String searchTxt;		// 검색어
 	private String callbackFn;		// 콜백함수

+ 4 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsaOcm.xml

@@ -18,6 +18,7 @@
 		     , DWDP_YN           /*직접회수처리여부*/
 		     , CNCLSMS_SEND_YN   /*취소문자발송여부*/
 		     , USE_YN            /*사용여부*/
+		     , DELV_FEE_SUM_YN	 /*배송비합산여부*/
 		FROM   TB_EXTMALL A
 		WHERE  1 = 1
 		<if test="extmallId != null and extmallId != ''">
@@ -48,6 +49,7 @@
 		     , DWDP_YN
 		     , CNCLSMS_SEND_YN
 		     , EXTMALL_TEL
+		     , DELV_FEE_SUM_YN
 		     , USE_YN
 		     , REG_NO
 		     , REG_DT
@@ -67,6 +69,7 @@
 		     , #{dwdpYn}
 		     , #{cnclsmsSendYn}
 		     , #{extmallTel}
+		     , #{delvFeeSumYn}
 		     , #{useYn}
 		     , #{regNo}
 		     , NOW()
@@ -84,6 +87,7 @@
 		     , DWDP_YN = #{dwdpYn}
 		     , CNCLSMS_SEND_YN = #{cnclsmsSendYn}
 		     , EXTMALL_TEL = #{extmallTel}
+		     , DELV_FEE_SUM_YN = #{delvFeeSumYn}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

+ 24 - 1
src/main/webapp/WEB-INF/views/ocm/ExtmallForm.html

@@ -122,7 +122,23 @@
 						<td>
 							<input type="text" class="w100 aR" name="sellFeeRate" maxlength="3" required="required" data-valid-type="real" data-valid-name="수수료율(관리용)"/>%
 						</td>
-						<td colspan="2"></td>
+						<th>
+							<!-- 아이콘 툴팁 -->
+							<div class="iconTooltip">
+								<i class="fa fa-info" aria-hidden="true"></i>
+								<span class="left aL" style="width:350px;">
+									샵링커 주문수집 시 제휴몰 별 배송비 산정방식
+									<br>- YES : 주문서별 배송비 합산(SUM) 
+									<br>- NO : 주문서별 배송비 1개로 계산
+								</span>
+							</div>
+							<!-- //아이콘 툴팁 -->
+							배송비합산여부
+						</th>
+						<td>
+							<label class="rdoBtn"><input type="radio" name="delvFeeSumYn" value="Y" checked="checked">Yes<span></span></label>
+							<label class="rdoBtn"><input type="radio" name="delvFeeSumYn" value="N">No<span></span></label>
+						</td>
 						<!-- 숨김처리 사용안하기로 함
 						<th>판매매장코드</th>
 						<td>
@@ -254,6 +270,13 @@
 		} else {
 			$('#detailForm input:radio[name=useYn]').eq(1).trigger('click');
 		}
+		
+		if (event.data.delvFeeSumYn == 'Y') {
+			$('#detailForm input:radio[name=delvFeeSumYn]').eq(0).trigger('click');
+		} else {
+			$('#detailForm input:radio[name=delvFeeSumYn]').eq(1).trigger('click');
+		}
+		
 	}
 
 	// 검색