Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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

@@ -4,6 +4,8 @@ import java.util.Collection;
 
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Category;
+import com.style24.persistence.domain.GoodsCategory;
+import com.style24.persistence.domain.GoodsSearch;
 import com.style24.persistence.domain.ItemkindCategory;
 
 /**
@@ -136,4 +138,12 @@ public interface TsaDisplayDao {
 	 */
 	Collection<ItemkindCategory> getItemkindCategoryMappingList(String itemkindCd);
 
+	/**
+	 * 상품별카테고리전시관리 목록 건수 조회
+	 * @param goodsCategory
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 15
+	 */
+	int getGoodsCategoryListCount(GoodsCategory goodsCategory);
 }

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

@@ -13,7 +13,7 @@ import com.style24.admin.support.security.session.TsaSession;
 import com.style24.admin.support.util.TsitUtil;
 
 import com.style24.persistence.domain.Delivery;
-import com.style24.admin.support.env.TsaConstants.OrderDetailStat;
+import com.style24.core.support.env.TscConstants.OrderDetailStat;
 import com.style24.admin.support.env.TsaConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 

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

@@ -2,6 +2,8 @@ package com.style24.admin.biz.service;
 
 import java.util.Collection;
 
+import com.style24.persistence.domain.GoodsCategory;
+import com.style24.persistence.domain.GoodsSearch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -157,4 +159,14 @@ public class TsaDisplayService {
 		return displayDao.getItemkindCategoryMappingList(itemkindCd);
 	}
 
+	/**
+	 * 상품별카테고리전시관리 목록 건수 조회
+	 * @param goodsCategory
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 15
+	 */
+	public int getGoodsCategoryListCount(GoodsCategory goodsCategory) {
+		return displayDao.getGoodsCategoryListCount(goodsCategory);
+	}
 }

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

@@ -32,7 +32,6 @@ import com.style24.persistence.domain.Withdraw;
 
 
 import com.style24.admin.support.env.TsaConstants;
-import com.style24.admin.support.env.TsaConstants.OrderDetailStat;
 //import com.style24.admin.support.env.TsaConstants.OrderStat;
 //import com.style24.admin.support.env.TsaConstants.PayMeans;
 //import com.style24.admin.support.env.TsaConstants.PaymentStat;

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

@@ -2,8 +2,11 @@ package com.style24.admin.biz.web;
 
 import java.util.Collection;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.util.GagaDateUtil;
-import com.style24.persistence.domain.Brand;
+import com.style24.admin.support.security.session.TsaSession;
+import com.style24.persistence.TscPageRequest;
+import com.style24.persistence.domain.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,8 +21,6 @@ import com.style24.admin.biz.service.TsaDisplayService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.core.support.message.TscMessageByLocale;
-import com.style24.persistence.domain.Category;
-import com.style24.persistence.domain.ItemkindCategory;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -241,4 +242,26 @@ public class TsaDisplayController extends TsaBaseController {
 		return mav;
 	}
 
+	/**
+	 * 상품별카테고리전시관리 조회
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 1. 15
+	 */
+	@PostMapping("/goods/category/list")
+	@ResponseBody
+	public GagaMap getGoodsCategoryList(@RequestBody GoodsCategory goodsCategory) {
+		GagaMap result = new GagaMap();
+		log.info("[getGoodsCategoryList GoodsCategory]{}",goodsCategory);
+
+		goodsCategory.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
+		goodsCategory.setPageable(new TscPageRequest(goodsCategory.getPageNo() - 1, goodsCategory.getPageSize()));
+		goodsCategory.getPageable().setTotalCount(displayService.getGoodsCategoryListCount(goodsCategory));
+
+		result.set("pageing", goodsCategory);
+		//result.set("goodsList", goodsService.getGoodsList(goodsSearch));
+
+		return null;
+	}
+
 }

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

@@ -21,6 +21,7 @@ import com.style24.admin.biz.service.TsaOrderService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
@@ -325,8 +326,44 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
-	
-	
+
+	/**
+	 * 교환요청 화면
+	 *
+	 * @param ordNo - 주문번호
+	 * @return ModelAndView
+	 * @author card007
+	 * @since 2021. 01. 14
+	 */
+	@GetMapping("/exchange/request/form")
+	public ModelAndView exchangeRequestFrom(@RequestParam(value = "ordNo") int ordNo) {
+
+		Order order = new Order();
+		ModelAndView mav = new ModelAndView();
+
+		order.setOrdNo(ordNo);
+
+		// 교환가능 주문상세상탭값 설정
+		String[] ordDtlStatArr = new String[3];
+		ordDtlStatArr[0] = TscConstants.OrderDetailStat.SHIPPING.value();
+		ordDtlStatArr[1] = TscConstants.OrderDetailStat.SHIP_COMPLETE.value();
+		ordDtlStatArr[2] = TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value();
+		order.setOrdDtlStatArr(ordDtlStatArr);
+
+		Collection<Order> cancelRequestTargetList = orderChangeService.getCancelRequestTargetList(order);
+
+		Collection<Order> orderInfoList = orderService.getOrderInfoList(order);
+
+		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G686"));	// 반품사유
+		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);							// 반품요청대상 목록
+		mav.addObject("orderInfoList"				, orderInfoList);									// 주문정보
+		mav.addObject("ordNo"						, ordNo);
+		mav.addObject("orderDelvRtnAddrInfo"		, orderService.getDeliveryAddrList(order));			// 배송정보
+
+		mav.setViewName("order/ReturnRequestForm");
+
+		return mav;
+	}
 }
 
 

src/main/java/com/style24/admin/support/env/TsaConstants.java

@@ -26,32 +26,6 @@ public class TsaConstants {
 		}
 	}
 
-	// 주문상세상태
-	public enum OrderDetailStat {
-		DEPOSIT_WAIT("G013_10"),			// 입금대기
-		ORDER_WAIT_PRICE("G013_18"),		// 발주대기-가격차이
-		ORDER_WAIT_POST("G013_19"),			// 발주대기-우편번호상이
-		PAYMENT_COMPLETE("G013_20"),		// 결제완료
-		GOODS_PREPARE("G013_30"),			// 상품준비중
-		DELIVERY_PREPARE("G013_40"),		// 배송준비중
-		SHIPPING("G013_50"),				// 배송중
-		SHIP_COMPLETE("G013_55"),			// 출고완료
-		DELIVERY_COMPLETE("G013_60"),		// 배송완료
-		//PURCHASE_CONFIRM("70"),			// 구매확정
-		PAYMENT_BEFORE_CANCEL("G013_98"),	// 결제전주문취소
-		PAYMENT_AFTER_CANCEL("G013_99");	// 결제후주문취소
-
-		private String value;
-
-		private OrderDetailStat(String value) {
-			this.value = value;
-		}
-
-		public String value() {
-			return value;
-		}
-	}
-	
 	// 몰구분
 	public enum MallGb {
 		SELFMALL("G011_10"),			// 자사몰

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

@@ -3,6 +3,7 @@ package com.style24.persistence.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 
+import com.style24.persistence.TscPageRequest;
 import lombok.Data;
 
 /**
@@ -90,4 +91,10 @@ public class GoodsCategory extends TscBaseDomain {
 	private String[] goodsCdList;
 
 	private String goodsCds;
+
+	// Pagination
+	private TscPageRequest pageable;
+	private int pageNo = 1;
+	private int pageSize = 50;
+	private int pageUnit = 10;
 }

src/main/webapp/WEB-INF/views/display/GoodsCategoryForm.html

@@ -28,6 +28,7 @@
 		<!-- 검색조건 영역 -->
 		<div class="panelStyle">
 			<form id="goodsCateForm" name="goodsCateForm" action="#" th:action="@{'/display/goods/category/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
+				<input type="hidden" id="searchGb" name="searchGb" />
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col width="7%"/>
@@ -185,39 +186,12 @@
 			<div id="gridList" style="width: 100%; height: 500px;" class="ag-theme-balham lh60"></div>
 			<ul class="panelBar">
 				<li class="center">
-					<div class="tablePaging" id="goodsListPagination"></div>
+					<div class="tablePaging" id="goodsCateListPagination"></div>
 				</li>
 			</ul>
 		</div>
 		<!-- //리스트 영역 -->
-		
-		<!-- 등록/수정 -->
-		<div class="panelStyle">
-			<form id="detailForm" name="detailForm" action="#" th:action="@{'/display/category/save'}">
-				<table class="frmStyle" aria-describedby="등록/수정 폼">
-					<colgroup>
-						<col style="width:10%;"/>
-						<col style="width:23%;"/>
-						<col style="width:10%;"/>
-						<col style="width:23%;"/>
-						<col style="width:10%;"/>
-						<col/>
-					</colgroup>
 
-				</table>
-			</form>
-			
-			<!-- 버튼 배치 영역 -->
-			<ul class="panelBar">
-				<li class="right">
-					<button type="button" class="btn btn-info btn-lg" id="btnNew">신규</button>
-					<button type="button" class="btn btn-success btn-lg" id="btnSave">저장</button>
-					<button type="button" class="btn btn-base btn-lg" id="btnRefresh4Srch" th:if="${sessionInfo.roleCd == 'G001_0000'}">4SRCH 갱신</button>
-				</li>
-			</ul>
-			<!-- //버튼 배치 영역 -->
-		</div>
-		<!-- 등록/수정 -->
 	</div>
 
 <script th:inline="javascript">
@@ -226,7 +200,7 @@
 	columnDefs = [
 		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: 'No', width: 60, cellClass: 'text-center',
-			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
+			valueGetter: function(params) { return cfnGridNumner('goodsCateForm',params.node.rowIndex, 'A');}
 		},
 		{headerName: "이미지", field: "sysImgNm", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
@@ -239,12 +213,13 @@
 			}
 		},
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
-		{headerName: "품목명", field: "itemkindNm", width: 250, cellClass: 'text-left'},
+		{headerName: "기존품목코드", field: "itemkindCd", width: 150, cellClass: 'text-center' }
+		/*{headerName: "품목명", field: "itemkindNm", width: 250, cellClass: 'text-left'},
 		{headerName: "기존품목코드", field: "itemkindCd", width: 150, cellClass: 'text-center' },
 		{headerName: "변경품목코드", field: "itemkindCdNew", width: 150, cellClass: 'text-center', editable : true,
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 5, required: true, onblur: '$(this).val($(this).val().toUpperCase())' }
-		}
+		}*/
 	];
 
 	// Get GridOptions
@@ -257,6 +232,26 @@
 
 	gridOptions.stopEditingWhenGridLosesFocus = true;
 
+	// 조회
+	$('#btnSearch').on('click', function() {
+		// 검색조건 추가해야함 ㅠㅠ
+
+		$("#goodsCateForm input[name=searchGb]").val("BASIC");
+		fnSearch();
+	});
+
+	$("#pageSize").on("change", function(){
+		var rowCnt = gridOptions.api.getDisplayedRowCount();
+		if(rowCnt > 0){
+			fnSearch();
+		}
+	});
+
+	var fnSearch = function(){
+		gagaPaging.init('goodsCateForm', fnSearchCallBack, 'goodsCateListPagination', $('#goodsCateForm').find('#pageSize').val());
+		gagaPaging.load(1);
+	};
+
 	// 업체변경시
 	$('#goodsCateForm select[name=supplyCompCd]').on('change', function() {
 		var actionUrl = '/renderer/supplyCompany/brand/list/' + $(this).val();

src/main/webapp/ux/plugins/gaga/gaga.paging.js

@@ -165,13 +165,12 @@ var gagaPaging = {
 		let pageSize = pageable.pageSize;
 		let pageUnit = pageable.pageUnit;
 		let totalCount = pageable.totalCount;
-
 		let firstCount = (getPageGroup() - 1) * pageable.pageUnit + 1;
 		let loopCount = firstCount + pageUnit;
 		if (loopCount > getTotalPage()) {
-			loopCount = getTotalPage() + 1;
+			loopCount = Number(getTotalPage() + 1);
 		}
-
+		
 		var pageTag = '';
 		if (!(firstCount == 1 && loopCount == 1)) {
 			if (pageNo == 1) {
@@ -193,20 +192,24 @@ var gagaPaging = {
 					pageTag += "<a class=\"num\" href=\"#pageNo=" + i + "\">" + i +"</a>\n"
 				}
 			}
-
-			if (loopCount <= (getTotalPage() + 1)) {
-				if (pageNo == getTotalPage()) {
-					pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
-					pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-double-right\" alt=\"맨마지막\"></i></a>\n";
-				} else {
-					pageTag += "<a class=\"arrow\" href=\"#pageNo=" + (getPageGroup() * pageUnit + 1) + "\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
+			
+			if (loopCount <= (Number(getTotalPage() + 1))) {
+				//if (getTotalPage() <= pageUnit) {
+				//	pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
+				//	pageTag += "<a class=\"arrow\" href=\"#\"><i class=\"fa fa-angle-double-right\" alt=\"맨마지막\"></i></a>\n";
+				//} else {
+					if (getTotalPage() > loopCount){
+						pageTag += "<a class=\"arrow\" href=\"#pageNo=" + (getPageGroup() * pageUnit + 1) + "\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";	
+					}else{
+						pageTag += "<a class=\"arrow\" href=\"#pageNo=" + getTotalPage() + "\"><i class=\"fa fa-angle-right\" alt=\"다음페이지\"></i></a>\n";
+					}
 					pageTag += "<a class=\"arrow\" href=\"#pageNo=" + getTotalPage() + "\"><i class=\"fa fa-angle-double-right\" alt=\"맨마지막\"></i></a>\n";
-				}
+				//}
 			}
 		}
 
 		function getPageGroup() {
-			return parseInt(pageNo / pageUnit + 1 );
+			return parseInt((pageNo-1) / pageUnit + 1 );
 		}
 
 		function getTotalPage() {