Merge branch 'style' into jmh

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

@@ -269,7 +269,7 @@
 	</select>
 
 	<!-- 택배사명 목록 조회 -->
-	<select id="getShipCompanyList" resultType="CommonCode">
+	<select id="getShipCompanyList" parameterType="CommonCode" resultType="CommonCode">
 		/* TsaDelivery.getShipCompanyList */
 		SELECT SHIP_COMP_CD  AS CD
 		     , SHIP_COMP_NM  AS CD_NM

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

@@ -63,7 +63,7 @@
 	</select>
 	
 	<!-- 입점업체 상품정산 목록 -->
-	<select id="getSupplyCompanyGoodsFeeList" parameterType="SupplyCompFee" resultType="SupplyCompFee">
+	<select id="getSupplyCompanyGoodsFeeList" parameterType="SupplyCompFee" resultType="SupplyCompFee" timeout="600">
 		/* TsaSettle.getSupplyCompanyGoodsFeeList */
 		SELECT ODIH.ORD_NO                                                                                     /*주문번호*/
 		     , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
@@ -162,11 +162,11 @@
 		                                                   END))
 		                    END AS SIGNED INT)                                                          AS SELL_AMT                /*판매금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
-		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * CASE WHEN CC2.CPN_ID=59 THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액 / 59번쿠폰제외*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액 / 59번쿠폰제외*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * 
 		               (((100 - IFNULL(CB1.BURDEN_RATE,0)) / 100) * ODIH.CPN1_DC_AMT
-		                + ((100 - IFNULL(CB2.BURDEN_RATE,0)) / 100) * CASE WHEN CC2.CPN_ID=59 THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END )             AS SELF_CPN_DC_AMT         /*자사쿠폰분담액 / 59번 쿠폰 제외 / 주문서쿠폰제외*/
+		                + ((100 - IFNULL(CB2.BURDEN_RATE,0)) / 100) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END )             AS SELF_CPN_DC_AMT         /*자사쿠폰분담액 / 59번 쿠폰 제외 / 주문서쿠폰제외*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) *
 		               ((IFNULL(CB1.BURDEN_RATE,0) / 100) * ODIH.CPN1_DC_AMT
 		                + (IFNULL(CB2.BURDEN_RATE,0) / 100) * ODIH.GOODS_CPN_DC_AMT

src/main/java/com/style24/scm/biz/dao/TssRendererDao.java

@@ -151,7 +151,7 @@ public interface TssRendererDao {
 	 * @author moon
 	 * @since 2020. 11. 05
 	 */
-	Collection<CommonCode> getShipCompanyList();
+	Collection<CommonCode> getShipCompanyList(CommonCode commonCode);
 //
 //	/**
 //	 * MD별 브랜드 목록 조회

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

@@ -410,7 +410,9 @@ public class TssRendererService {
 	 * @since 2020. 11. 05
 	 */
 	public Collection<CommonCode> getShipCompanyList() {
-		return rendererDao.getShipCompanyList();
+		CommonCode data = new CommonCode();
+		data.setUseYn("Y");
+		return rendererDao.getShipCompanyList(data);
 	}
 //
 //	/**

src/main/java/com/style24/scm/biz/web/TssMarketingController.java

@@ -709,6 +709,11 @@ public class TssMarketingController extends TssBaseController {
 		
 		mav.addObject("dcWayList", rendererService.getCommonCodeList("G240"));
 
+		// 사용가능 고객구분 조회
+		String[] exceptCds1 = {"G100_00"};
+		mav.addObject("usableCustGbList", rendererService.getCommonCodeList("G100", "Y", exceptCds1));
+		mav.addObject("usableCustGradeList", rendererService.getCommonCodeList("G110")); // 사용가능 고객등급 조회
+
 		if (mode.equals("U")) {
 			issueCnt = coreCouponService.getCouponIssueCnt(cpnId);
 			mav.addObject("cpnDetail", coreCouponService.getCouponDetail(cpnId)); // 쿠폰상세조회

src/main/java/com/style24/scm/support/controller/TssErrorController.java

@@ -6,12 +6,12 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * Error Controller
  * 		Disabling the Whitelabel Error Page
@@ -38,7 +38,7 @@ public class TssErrorController implements ErrorController {
 	/**
 	 * Error
 	 */
-	@GetMapping("/error")
+	@RequestMapping("/error")
 	public String error(HttpServletRequest request) throws HttpRequestMethodNotSupportedException {
 		Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
 

src/main/webapp/WEB-INF/views/marketing/CouponPopupForm.html

@@ -217,7 +217,7 @@
 												<col style="width:85%;">
 											</colgroup>
 											<tbody>
-											<tr>
+											<tr class="applyScopeArea">
 												<th>적용범위<em class="required" title="필수"></em></th>
 												<td>
 													<input type="hidden" name="applyScope" id="applyScope" required="required" data-valid-name="적용범위">
@@ -276,7 +276,7 @@
 								<div class="inner-panelContent exceptArea">
 									<div class="panelContent">
 										<div class="panelBar">
-											<h4>적용 대상 상품 등록</h4>
+											<h4>제외 대상 상품 등록</h4>
 										</div>
 										<table class="frmStyle">
 											<colgroup>
@@ -318,9 +318,9 @@
 												<th>업체 분담율</th>
 												<td>
 													<div class="padding10 inner-tb-solid">
-														<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddApplyBurden">업체추가</button>
-														<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelApplyBurden">선택삭제</button>
-														<br/>
+														<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddApplyBurden" style="display: none">업체추가</button>
+														<button type="button" class="btn btnRight btn-success btn-lg" id="btnDelApplyBurden" style="display: none">선택삭제</button>
+<!--														<br/>-->
 														<div id="inComGridList" style="width:100%; height:200px;" class="ag-theme-balham"></div>
 													</div>
 												</td>
@@ -354,6 +354,8 @@
 	var cpnDtlRefvalBrandList 		= [[${cpnDtlRefvalBrandList}]];
 	var cpnDtlRefvalExceptGoodsList = [[${cpnDtlRefvalExceptGoodsList}]];
 	var cpnDtlBurdenList 			= [[${cpnDtlBurdenList}]];
+	var usableCustGbList 			= [[${usableCustGbList}]];
+	var usableCustGradeList			= [[${usableCustGradeList}]];
 
 	var issueCnt = [[${issueCnt}]];
 
@@ -738,6 +740,10 @@
 
 	// 쿠폰 등록
 	function fnCouponCreate(){
+		var usableCustGbArr = [];
+		var usableCustGradeArr = [];
+		var payTypeArr = [];
+
 		// 필수값들 셋팅
 		setReqValue();
 
@@ -755,10 +761,16 @@
 			if(!checkValidation20(chkCpnType)){
 				return false;
 			}
+			
+			// 2021.11.02 card007 SCM 쿠폰 등록은 전체고객구분 및 전체고객등급 설정 처리
+			$.each(usableCustGbList, function(idx ,item) {
+				usableCustGbArr.push(item.cd);
+			});
+			
+			$.each(usableCustGradeList, function(idx ,item) {
+				usableCustGradeArr.push(item.cd);
+			});
 		}
-		var usableCustGbArr = [];
-		var usableCustGradeArr = [];
-		var payTypeArr = [];
 
 		mcxDialog.confirm('저장하시겠습니까?' , {
 			cancelBtnText: "취소",
@@ -770,7 +782,9 @@
 					,cpnDesc 				: $('#CouponForm input[name=cpnDesc]').val()
 					,siteCd 				: $('#CouponForm select[name=siteCd]').val()
 					,cpnType 				: $('input:radio[name="rdoCpnType"]:checked').val()
-					,applyScope 			: $('input:radio[name="rdoApplyScope"]:checked').val()
+					// 2021.10.29 card007 SCM에서는 해당 업체 상품만 적용처리 사유로 적용범위 개별로 설정
+					//,applyScope 			: $('input:radio[name="rdoApplyScope"]:checked').val()
+					,applyScope 			: 'I'
 					,dcWay 					: $('input:radio[name="rdoDcWay"]:checked').val()
 					,dcPval 				: $('#CouponForm input[name=dcPval]').val().replaceAll(',','')
 					,dcMval 				: $('#CouponForm input[name=dcMval]').val().replaceAll(',','')
@@ -811,6 +825,7 @@
 					,afChannelList 			: null
 					,scmYn 					: 'Y'
 				};
+
 				var jsonData = JSON.stringify(data);
 				gagajf.ajaxJsonSubmit($('#CouponForm').prop('action'), jsonData, fnCouponSaveCollback);
 			}
@@ -960,7 +975,8 @@
 			// 적용대상 탭
 			$("#CouponForm .supplyTrArea").show();
 			$("#CouponForm .brandTrArea").show();
-			$("#CouponForm .categoryTrArea").show();
+			// 2021.10.29 card007 SCM은 적용대상 > 카테고리 미사용 처리
+			//$("#CouponForm .categoryTrArea").show();
 			$("#CouponForm .goodsTrArea").show();
 			$("#CouponForm .exceptArea").show();
 
@@ -1329,6 +1345,15 @@
 			$("#btnCouponSave").show();	// 저장버튼
 			$("#CouponForm .buttonSpan").show();
 
+			// 2021.10.29 card007 SCM은 입점업체분담율 해당 업체 100% 디폴트 처리
+			for (let data in ibSupplyComList) {
+				let supplyGridData = {};
+				supplyGridData.supplyCompCd = data;
+				supplyGridData.supplyCompNm = ibSupplyComList[data];
+				supplyGridData.burdenRate = 100;
+
+				gagaAgGrid.addRowData(inComGridOptions, supplyGridData);
+			}
 		} else {
 			// 수정모드시 그리드 세팅
 			inComGridOptions.api.setRowData(cpnDtlBurdenList);
@@ -1552,6 +1577,10 @@
 		// 기본세팅
 		pdGbChange();
 
+		// 2021.10.29 card007 SCM 적용범위, 카테고리 미사용 처리
+		$('.applyScopeArea').hide();
+		$('.categoryTrArea').hide();
+
 	});
 
 	// 날짜분리 ( 시작/종료날짜구분(start , end) , 날짜String , 적용타겟대상 )
@@ -1656,7 +1685,6 @@
 		});
 	});
 
-
 	/*]]>*/
 </script>
 </html>