Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/admin/biz/dao/TsaSettleDao.java

@@ -6,6 +6,7 @@ import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.AflinkFee;
 import com.style24.persistence.domain.DelvFeeSettle;
 import com.style24.persistence.domain.GoodsSettle;
+import com.style24.persistence.domain.SettleConfirm;
 
 /**
  * 정산 Dao
@@ -34,6 +35,15 @@ public interface TsaSettleDao {
 	 */
 	Collection<DelvFeeSettle> getDeliveryFeeSettleList(DelvFeeSettle delvFeeSettle);
 
+	/**
+	 * 정산확정 목록
+	 * @param settleConfirm - 정산확정 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 7. 26
+	 */
+	Collection<SettleConfirm> getSettleConfirmList(SettleConfirm settleConfirm);
+
 	/**
 	 * 제휴채널정산 목록
 	 * @param afLinkFee - 제휴채널정산 정보

src/main/java/com/style24/admin/biz/service/TsaSettleService.java

@@ -9,6 +9,7 @@ import com.style24.admin.biz.dao.TsaSettleDao;
 import com.style24.persistence.domain.AflinkFee;
 import com.style24.persistence.domain.DelvFeeSettle;
 import com.style24.persistence.domain.GoodsSettle;
+import com.style24.persistence.domain.SettleConfirm;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -47,6 +48,17 @@ public class TsaSettleService {
 		return settleDao.getDeliveryFeeSettleList(delvFeeSettle);
 	}
 
+	/**
+	 * 정산확정 목록
+	 * @param settleConfirm - 정산확정 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 7. 26
+	 */
+	public Collection<SettleConfirm> getSettleConfirmList(SettleConfirm settleConfirm) {
+		return settleDao.getSettleConfirmList(settleConfirm);
+	}
+
 	/**
 	 * 제휴채널정산 목록
 	 * @param afLinkFee - 제휴채널수수료 정보

src/main/java/com/style24/admin/biz/web/TsaSettleController.java

@@ -20,6 +20,7 @@ import com.style24.admin.support.security.session.TsaSession;
 import com.style24.persistence.domain.AflinkFee;
 import com.style24.persistence.domain.DelvFeeSettle;
 import com.style24.persistence.domain.GoodsSettle;
+import com.style24.persistence.domain.SettleConfirm;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -179,6 +180,37 @@ public class TsaSettleController extends TsaBaseController {
 		return mav;
 	}
 
+	/**
+	 * 정산확정 목록
+	 * @param settleConfirm - 정산확정 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 7. 26
+	 */
+	@PostMapping("/confirm/list")
+	@ResponseBody
+	public Collection<SettleConfirm> getSettleConfirmList(@RequestBody SettleConfirm settleConfirm) {
+		if (!StringUtils.isBlank(settleConfirm.getSupplyCompList())) {
+			try {
+				String[] arrSupplyComp = mapper.readValue(settleConfirm.getSupplyCompList(), String[].class);
+				settleConfirm.setMultiSupplyComp(arrSupplyComp);
+			} catch (Exception e) {
+				throw new IllegalStateException("업체코드 검색중 오류로 인해 조회되지 않았습니다.");
+			}
+		}
+
+		if (!StringUtils.isBlank(settleConfirm.getBrandList())) {
+			try {
+				String[] arrBrandCd = mapper.readValue(settleConfirm.getBrandList(), String[].class);
+				settleConfirm.setMultiBrand(arrBrandCd);
+			} catch (Exception e) {
+				throw new IllegalStateException("브랜드코드 검색중 오류로 인해 조회되지 않았습니다.");
+			}
+		}
+
+		return settleService.getSettleConfirmList(settleConfirm);
+	}
+
 	/**
 	 * 업체별정산내역 화면
 	 * @return

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

@@ -0,0 +1,56 @@
+package com.style24.persistence.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.style24.persistence.TscBaseDomain;
+
+import lombok.Data;
+
+/**
+ * 정산확정 Domain
+ *
+ * @author gagamel
+ * @since 2021. 7. 26
+ */
+@SuppressWarnings("serial")
+@Data
+public class SettleConfirm extends TscBaseDomain {
+
+	private String confirmYn;			// 정산확정여부
+	private String supplyCompCd;		// 공급업체코드
+	private String supplyCompNm;		// 공급업체명
+	private String econtractYn;			// 전자계약여부
+	private String bizNo;				// 사업자번호
+	private String settleDay;			// 정산일(매월)
+	private String settleDayNm;			// 정산주기명
+	private int sellQty;				// 판매수량
+	private double sellAmt;				// 판매금액(CPN1_DC_AMT가 빠진 금액이 들어가 있음)
+	private double sellFeeAmt;			// 수수료(실판매금액 * 판매수수료율)
+	private double cpnDcAmt;			// 쿠폰할인금액
+	private double selfCpnDcAmt;		// 자사쿠폰분담액
+	private double supplyCompCpnDcAmt;	// 입점쿠폰분담액
+	private double billAmt;				// 계산서발행금액
+	private double supplyAmt;			// 공급금액
+	private double taxAmt;				// 세액
+	private double delvFeeAmt;			// 배송비금액
+	private double etcDeductAmt;		// 기타차감
+	private double giveAmt;				// 지급금액
+	private double receivableAmt;		// 미수금
+	private double totGiveAmt;			// 총지급금액
+	private String settleStat;			// 정산상태
+	private String bankCd;				// 은행코드
+	private String bankNm;				// 은행명
+	private String accountNo;			// 계좌번호
+	private String depositorNm;			// 예금주명
+	private String billEmail;			// 계산서이메일
+
+	// 검색조건
+	private String salesStdt;			// 매출시작일자
+	private String salesEddt;			// 매출종료일자
+	private String supplyCompList;		// 공급업체코드목록
+	private String brandList;			// 브랜드코드목록
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiBrand;
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiSupplyComp;
+
+}

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

@@ -1900,17 +1900,17 @@
 		              , DISP_STDT
 		              , DISP_EDDT
 		              , CASE WHEN STR_TITLE2 = 1 THEN TITLE END AS GROUP1_TITLE
-		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NO IS NULL THEN '' ELSE BRAND_GROUP_NO END SEPARATOR ',') END GROUP1_BRAND_CD
-		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NM IS NULL THEN '' ELSE BRAND_GROUP_NM END SEPARATOR ',') END GROUP1_BRAND_NM
-		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(CASE WHEN LOGO_FILE_NM IS NULL THEN '' ELSE LOGO_FILE_NM END SEPARATOR ',') END GROUP1_BRAND_IMG
+		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NO IS NULL THEN '' ELSE BRAND_GROUP_NO END ORDER BY DISP_ORD SEPARATOR ',') END GROUP1_BRAND_CD
+		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NM IS NULL THEN '' ELSE BRAND_GROUP_NM END ORDER BY DISP_ORD SEPARATOR ',') END GROUP1_BRAND_NM
+		              , CASE WHEN STR_TITLE2 = 1 THEN GROUP_CONCAT(CASE WHEN LOGO_FILE_NM IS NULL THEN '' ELSE LOGO_FILE_NM END ORDER BY DISP_ORD SEPARATOR ',') END GROUP1_BRAND_IMG
 		              , CASE WHEN STR_TITLE2 = 2 THEN TITLE END AS GROUP2_TITLE
-		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NO IS NULL THEN '' ELSE BRAND_GROUP_NO END SEPARATOR ',') END GROUP2_BRAND_CD
-		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NM IS NULL THEN '' ELSE BRAND_GROUP_NM END SEPARATOR ',') END GROUP2_BRAND_NM
-		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(CASE WHEN LOGO_FILE_NM IS NULL THEN '' ELSE LOGO_FILE_NM END SEPARATOR ',') END GROUP2_BRAND_IMG
+		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NO IS NULL THEN '' ELSE BRAND_GROUP_NO END ORDER BY DISP_ORD SEPARATOR ',') END GROUP2_BRAND_CD
+		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NM IS NULL THEN '' ELSE BRAND_GROUP_NM END ORDER BY DISP_ORD SEPARATOR ',') END GROUP2_BRAND_NM
+		              , CASE WHEN STR_TITLE2 = 2 THEN GROUP_CONCAT(CASE WHEN LOGO_FILE_NM IS NULL THEN '' ELSE LOGO_FILE_NM END ORDER BY DISP_ORD SEPARATOR ',') END GROUP2_BRAND_IMG
 		              , CASE WHEN STR_TITLE2 = 3 THEN TITLE END AS GROUP3_TITLE
-		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NO IS NULL THEN '' ELSE BRAND_GROUP_NO END SEPARATOR ',') END GROUP3_BRAND_CD
-		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NM IS NULL THEN '' ELSE BRAND_GROUP_NM END SEPARATOR ',') END GROUP3_BRAND_NM
-		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(CASE WHEN LOGO_FILE_NM IS NULL THEN '' ELSE LOGO_FILE_NM END SEPARATOR ',') END GROUP3_BRAND_IMG
+		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NO IS NULL THEN '' ELSE BRAND_GROUP_NO END ORDER BY DISP_ORD SEPARATOR ',') END GROUP3_BRAND_CD
+		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(CASE WHEN BRAND_GROUP_NM IS NULL THEN '' ELSE BRAND_GROUP_NM END ORDER BY DISP_ORD SEPARATOR ',') END GROUP3_BRAND_NM
+		              , CASE WHEN STR_TITLE2 = 3 THEN GROUP_CONCAT(CASE WHEN LOGO_FILE_NM IS NULL THEN '' ELSE LOGO_FILE_NM END ORDER BY DISP_ORD SEPARATOR ',') END GROUP3_BRAND_IMG
 		        FROM (
 		            SELECT
 		                  B.STR_TITLE3

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

@@ -226,6 +226,13 @@
 		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
 	</select>
 	
+	<!-- 상품정산 목록 -->
+	<select id="getSettleConfirmList" parameterType="SettleConfirm" resultType="SettleConfirm">
+		/* TsaSettle.getSettleConfirmList */
+		SELECT *
+		FROM   DUAL
+	</select>
+	
 	<!-- 제휴채널정산 목록 -->
 	<select id="getAfLinkFeeList" parameterType="AfLinkFee" resultType="AfLinkFee">
 		/* TsaSettle.getAfLinkFeeList */

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

@@ -948,8 +948,8 @@
 			$('.custJoinDateTr').css('display' , 'none');
 			$('#custJoinStdt').attr('required' , false);
 			$('#custJoinEddt').attr('required' , false);
-			$('#nonCust').prop('checked', true);
-			$('#nonCust').removeAttr('disabled');
+			//$('#nonCust').prop('checked', true);
+			//$('#nonCust').removeAttr('disabled');
 		}
 		
 		if(planInfo.replyLoc == "D"){
@@ -1765,8 +1765,8 @@
 				 $('#nonCust').prop('checked', false);
 				 $('#nonCust').attr('disabled','disabled');
 			 }else{
-			 	 $('#nonCust').prop('checked', true);
-				 $('#nonCust').removeAttr('disabled');
+			 	 //$('#nonCust').prop('checked', true);
+				 //$('#nonCust').removeAttr('disabled');
 			 }
 			 
 			 if(planCateList.length > 0){

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

@@ -2082,6 +2082,9 @@ $(document).ready(function() {
 				
 				if (reviewList[0].dispYn == 'Y') {
 					$('#planTemplateForm input:checkbox[name="reDispYn"]').prop('checked', true);
+				}else{
+					$('#planTemplateForm input:checkbox[name="reDispYn"]').prop('checked', false);
+					$('#planTemplateForm input:checkbox[name="reDispYn"]').val("N");
 				}
 				
 				if(typeof reviewList[0].reItemVal != 'undefined' && reviewList[0].reItemVal != null){
@@ -2097,6 +2100,9 @@ $(document).ready(function() {
 				$('#planTemplateForm input[name=cuPlanContSq]').val(couponNotice.planContSq);
 				if (couponNotice.dispYn == 'Y') {
 					$('#planTemplateForm input:checkbox[name="cuDispYn"]').prop('checked', true);
+				}else{
+					$('#planTemplateForm input:checkbox[name="cuDispYn"]').prop('checked', false);
+					$('#planTemplateForm input:checkbox[name="cuDispYn"]').val("N");
 				}
 				if (couponNotice.cpnNote0 != null && couponNotice.cpnNote0 != '') {
 					$("#planTemplateForm select[name=couponCnt]").val(1);
@@ -2166,6 +2172,9 @@ $(document).ready(function() {
 				
 				if (fileList[0].dispYn == 'Y') {
 					$('#planTemplateForm input:checkbox[name="fileDispYn"]').prop('checked', true);
+				}else{
+					$('#planTemplateForm input:checkbox[name="fileDispYn"]').prop('checked', false);
+					$('#planTemplateForm input:checkbox[name="fileDispYn"]').val("N");
 				}
 				
 				if(fileList.length > 0 && fileList[0].fileItemVal != null)
@@ -2193,6 +2202,9 @@ $(document).ready(function() {
 				
 				if (noticeList[0].dispYn == 'Y') {
 					$('#planTemplateForm input:checkbox[name="noticeDispYn"]').prop('checked', true);
+				}else{
+					$('#planTemplateForm input:checkbox[name="noticeDispYn"]').prop('checked', false);
+					$('#planTemplateForm input:checkbox[name="noticeDispYn"]').val("N");
 				}
 				
 				if(noticeList.length > 0 && noticeList[0].noticeItemVal != null)
@@ -2212,6 +2224,9 @@ $(document).ready(function() {
 				
 				if (fsrcListBtm[0].dispYn == 'Y') {
 					$('#planTemplateForm input:checkbox[name="btmFsrcDispYn"]').prop('checked', true);
+				}else{
+					$('#planTemplateForm input:checkbox[name="btmFsrcDispYn"]').prop('checked', false);
+					$('#planTemplateForm input:checkbox[name="btmFsrcDispYn"]').val("N");
 				}
 			
 				$('#fsrcPcBtm').summernote('code', fsrcListBtm[0].fsrcPc);
@@ -2226,6 +2241,9 @@ $(document).ready(function() {
 				
 				if (fsrcListTop[0].dispYn == 'Y') {
 					$('#planTemplateForm input:checkbox[name="topFsrcDispYn"]').prop('checked', true);
+				}else{
+					$('#planTemplateForm input:checkbox[name="topFsrcDispYn"]').prop('checked', false);
+					$('#planTemplateForm input:checkbox[name="topFsrcDispYn"]').val("N");
 				}
 			
 				$('#fsrcPcTop').summernote('code', fsrcListTop[0].fsrcPc);