제휴몰관리 수수료율(관리용) 추가

src/main/java/com/style24/persistence/domain/Extmall.java

@@ -23,6 +23,7 @@ public class Extmall extends TscBaseDomain {
 	private String sellStoreCd;		// 판매매장코드
 	private float stockSellRate;	// 재고판매비율
 	private float priceAcceptRate;	// 가격허용율
+	private float sellFeeRate;		// 수수료율(관리용)
 	private String dwdpYn;			// 직접회수여부(Y:제휴몰에서회수, N:자사몰에서회수)
 	private String cnclsmsSendYn;	// 취소문자발송여부(Y:제휴몰에서발송, N:자사몰에서발송)
 	private String useYn;			// 사용여부

src/main/java/com/style24/persistence/mybatis/shop/TsaOcm.xml

@@ -14,6 +14,7 @@
 		     , SELL_STORE_CD     /*판매매장코드*/
 		     , STOCK_SELL_RATE   /*재고판매비율*/
 		     , PRICE_ACCEPT_RATE /*가격차이허용율*/
+		     , SELL_FEE_RATE 	 /*수수료율(관리용)*/
 		     , DWDP_YN           /*직접회수처리여부*/
 		     , CNCLSMS_SEND_YN   /*취소문자발송여부*/
 		     , USE_YN            /*사용여부*/
@@ -40,6 +41,7 @@
 		     , SELL_STORE_CD
 		     , STOCK_SELL_RATE
 		     , PRICE_ACCEPT_RATE
+		     , SELL_FEE_RATE
 		     , DWDP_YN
 		     , CNCLSMS_SEND_YN
 		     , EXTMALL_TEL
@@ -58,6 +60,7 @@
 		     , #{sellStoreCd}
 		     , IFNULL(#{stockSellRate},0)
 		     , IFNULL(#{priceAcceptRate},0)
+		     , IFNULL(#{sellFeeRate},0)
 		     , #{dwdpYn}
 		     , #{cnclsmsSendYn}
 		     , #{extmallTel}
@@ -74,6 +77,7 @@
 		     , SELL_STORE_CD = #{sellStoreCd}
 		     , STOCK_SELL_RATE = IFNULL(#{stockSellRate},0)
 		     , PRICE_ACCEPT_RATE = IFNULL(#{priceAcceptRate},0)
+		     , SELL_FEE_RATE = IFNULL(#{sellFeeRate},0)
 		     , DWDP_YN = #{dwdpYn}
 		     , CNCLSMS_SEND_YN = #{cnclsmsSendYn}
 		     , EXTMALL_TEL = #{extmallTel}

src/main/java/com/style24/persistence/mybatis/shop/TsaShoplinker.xml

@@ -601,7 +601,7 @@
 	        </if>
 
 			<if test="uploadStat != null and uploadStat != ''">
-	        AND B.UPLOAD_STAT = #{uploadStat}
+	        AND IFNULL(B.UPLOAD_STAT, 'G021_50') = #{uploadStat}
 	        </if>
 	        <if test="uploadFailCd != null and uploadFailCd != ''">
 	        AND B.UPLOAD_FAIL_CD = #{uploadFailCd}
@@ -703,7 +703,7 @@
 
 		) A
 
-		ORDER BY DELV_STDT DESC, ORD_NO, ORD_DTL_NO
+		ORDER BY DELV_STDT DESC, REG_DT DESC, ORD_NO, ORD_DTL_NO
 		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
 	</select>
 

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

@@ -120,7 +120,11 @@
 						<td>
 							<input type="text" class="w150" name="extmallTel" maxlength="20"/>
 						</td>
-						<td colspan="4"></td>
+						<th>수수료율(관리용)</th>
+						<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>판매매장코드</th>
 						<td>
@@ -193,6 +197,7 @@
 			valueGetter: function (params) { return gagaAgGrid.lookupValue(supplyCompList, params.data.supplyCompCd); }
 		},
 		{headerName: "고객센터연락처", field: "extmallTel", width: 150, cellClass: 'text-center'},
+		{headerName: "수수료율(관리용)", field: "sellFeeRate", width: 120, cellClass: 'text-center'},
 		/* {headerName: "판매매장코드", field: "sellStoreCd", width: 120, cellClass: 'text-center'},
 		{headerName: "재고판매비율(%)", field: "stockSellRate", width: 150, cellClass: 'text-center'},
 		{headerName: "가격차이허용율(%)", field: "priceAcceptRate", width: 150, cellClass: 'text-center'}, */
@@ -229,10 +234,11 @@
 		$('#detailForm input[name=extmallNm]').val(event.data.extmallNm);
 		$('#detailForm input[name=extmallTel]').val(event.data.extmallTel);
 		$('#detailForm select[name=supplyCompCd]').val(event.data.supplyCompCd);
-		$('#detailForm input[name=sellStoreCd]').val(event.data.sellStoreCd);
-		$('#detailForm input[name=stockSellRate]').val(event.data.stockSellRate);
-		$('#detailForm input[name=priceAcceptRate]').val(event.data.priceAcceptRate);
-		
+		$('#detailForm input[name=sellFeeRate]').val(event.data.sellFeeRate);
+		//$('#detailForm input[name=sellStoreCd]').val(event.data.sellStoreCd);
+		//$('#detailForm input[name=stockSellRate]').val(event.data.stockSellRate);
+		//$('#detailForm input[name=priceAcceptRate]').val(event.data.priceAcceptRate);
+
 		if (event.data.dwdpYn == 'Y') {
 			$('#detailForm input:radio[name=dwdpYn]').eq(0).trigger('click');
 		} else {