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

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

@@ -767,6 +767,26 @@ public interface TsaGoodsDao {
 	 * @since 2020. 11. 13
 	 */
 	void deleteGoodPriceRes(GoodsPriceRes goodsPriceRes);
+	
+	/**
+	 * 상품 가격예약 종료
+	 *
+	 * @param goodsPriceRes
+	 * @return void
+	 * @author jmh
+	 * @since 2021. 11. 15
+	 */
+	void closeGoodPriceRes(GoodsPriceRes goodsPriceRes);
+	
+	/**
+	 * 상품 가격예약 이력 등록(화면)
+	 *
+	 * @param goodsPriceRes
+	 * @return void
+	 * @author jmh
+	 * @since 2021. 11. 15
+	 */
+	void createGoodPriceResHst(GoodsPriceRes goodsPriceRes);
 
 	/**
 	 * 상품 동영상 목록 조회

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

@@ -109,6 +109,16 @@ public interface TsaShoplinkerDao {
 	 */
 	Collection<GagaMap> getGoodsSendExcelList(ShoplinkerSearch shoplinkerSearch);
 
+	/**
+	 * 상품등록-기획전 엑셀 다운로드
+	 *
+	 * @param shoplinkerSearch
+	 * @return
+	 * @author jmh
+	 * @since 2021. 11. 16
+	 */
+	Collection<GagaMap> getGoodsSendExcelPlanning(ShoplinkerSearch shoplinkerSearch);
+
 	/**
 	 * 재고-단품 등록
 	 *

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

@@ -2105,11 +2105,39 @@ public class TsaGoodsService {
 		int idx = 0;
 		for (String goodsCd : goodsPriceRes.getArrGoodsCd()) {
 			goodsPriceRes.setGoodsPriceResSq(goodsPriceRes.getArrGoodsPriceResSq()[idx]);
+			goodsPriceRes.setRegNo(TsaSession.getInfo().getUserNo());
+			goodsPriceRes.setRegGb("D");
+			goodsDao.createGoodPriceResHst(goodsPriceRes);
 			goodsDao.deleteGoodPriceRes(goodsPriceRes);
 			idx++;
 		}
 	}
 
+	/**
+	 * 상품 가격예약 종료
+	 *
+	 * @param goodsPriceRes
+	 * @return void
+	 * @author jmh
+	 * @since 2021. 11. 15
+	 */
+	@Transactional("shopTxnManager")
+	public void closeGoodsPriceRes(GoodsPriceRes goodsPriceRes) {
+		if (goodsPriceRes.getArrGoodsCd().length <= 0) {
+			throw new IllegalStateException(message.getMessage("FAIL_1001"));
+		}
+		int idx = 0;
+		for (String goodsCd : goodsPriceRes.getArrGoodsCd()) {
+			goodsPriceRes.setGoodsPriceResSq(goodsPriceRes.getArrGoodsPriceResSq()[idx]);
+			goodsPriceRes.setRegNo(TsaSession.getInfo().getUserNo());
+			goodsPriceRes.setUpdNo(TsaSession.getInfo().getUserNo());
+			goodsPriceRes.setRegGb("C");
+			goodsDao.createGoodPriceResHst(goodsPriceRes);
+			goodsDao.closeGoodPriceRes(goodsPriceRes);
+			idx++;
+		}
+	}
+	
 	/**
 	 * 상품 가격예약 저장
 	 *

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

@@ -937,6 +937,37 @@ public class TsaShoplinkerService {
 			throw new IllegalStateException(e);
 		}
 	}
+	
+	/**
+	 * 상품등록-기획전 엑셀 다운로드
+	 *
+	 * @param shoplinkerSearch
+	 * @param excelFilenameWithPath - 경로를 포함한 엑셀파일명
+	 * @return
+	 * @author jmh
+	 * @since 2021. 11. 16
+	 */
+	public void getGoodsSendExcelPlanning(ShoplinkerSearch shoplinkerSearch, String excelFilenameWithPath) {
+
+		// 헤더 title 설정
+		String[] listTitles = {"샵링커 상품코드\n(단품아님.상품기준)", "sku코드", "선택1", "선택2"};
+
+		// DB 처리 시 사용되는 파라미터명(셀명) 설정
+		String[] cellNames = {"API_PRODUCT_ID", "OPT_CD", "OPT_CD1", "OPT_CD2"};
+
+		String[] cellTypes = {
+			GagaExcelConstants.CellType.CHAR_LEFT.name(), GagaExcelConstants.CellType.CHAR_LEFT.name(),
+			GagaExcelConstants.CellType.CHAR_LEFT.name(), GagaExcelConstants.CellType.CHAR_LEFT.name()};
+
+		Collection<GagaMap> dataList = admShoplinkerDao.getGoodsSendExcelPlanning(shoplinkerSearch);
+
+		try {
+
+			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList, listTitles, cellNames, cellTypes);
+		} catch (Exception e) {
+			throw new IllegalStateException(e);
+		}
+	}
 
 
 	/**

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

@@ -2663,6 +2663,21 @@ public class TsaGoodsController extends TsaBaseController {
 		goodsService.deleteGoodsPriceRes(goodsPriceRes);
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
+	
+	/**
+	 * 상품 가격예약 종료
+	 *
+	 * @param goodsResSell
+	 * @return GagaResponse
+	 * @author jmh
+	 * @since 2021. 11. 15
+	 */
+	@PostMapping("/price/reserve/close")
+	@ResponseBody
+	public GagaResponse closeGoodsPriceRes(@RequestBody GoodsPriceRes goodsPriceRes) {
+		goodsService.closeGoodsPriceRes(goodsPriceRes);
+		return super.ok(message.getMessage("SUCC_0004"));
+	}
 
 	/**
 	 * 상품 가격예약 변경

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

@@ -287,6 +287,33 @@ log.info(" #### SHOPLINKER CHKE 1 - "+runMap.getRunCnt()+" | "+runMap.getSidOver
 
 		return GagaFileUtil.writeFile(request, excelFilenameWithPath);
 	}
+	
+	/**
+	 * 샵링커상품등록- 엑셀다운로드
+	 *
+	 * @param shoplinkerSearch
+	 * @return
+	 * @author jmh
+	 * @since 2021. 06. 29
+	 */
+	@GetMapping("/goods/excel/planning")
+	public ResponseEntity<InputStreamResource> downloadGoodsPlanningExcel(HttpServletRequest request, ShoplinkerSearch shoplinkerSearch) throws Exception {
+		String excelfileName = "샵링커_기획전_" + GagaDateUtil.getTodayDateTime() + ".xlsx";
+		String excelFilenameWithPath = GagaFileUtil.getConcatenationPath(env.getProperty("download.path"), "excel", excelfileName);
+
+		// multi row 검색관련 처리
+		if (!StringUtils.isBlank(shoplinkerSearch.getCondition())) {
+			shoplinkerSearch.setConditionList(shoplinkerSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
+		}
+
+		if( 500 < shoplinkerSearch.getConditionList().length ) {
+			throw new IllegalStateException("상품코드를 500개 이하로 입력해주세요.");
+		}
+		
+		admShoplinkerService.getGoodsSendExcelPlanning(shoplinkerSearch, excelFilenameWithPath);
+
+		return GagaFileUtil.writeFile(request, excelFilenameWithPath);
+	}
 
 
 	/**

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

@@ -45,6 +45,7 @@ public class GoodsPriceRes extends TscBaseDomain {
 	private String searchBrandCd;
 	private String brandList;
 	private String supplyCompList;
+	private String regGb;
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrGoodsCd;

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

@@ -2954,6 +2954,55 @@
 		WHERE GOODS_PRICE_RES_SQ = #{goodsPriceResSq}
 		AND APPLY_YN = 'N'
 	</delete>
+	
+	<!-- 상품 가격예약 종료 -->
+	<update id="closeGoodPriceRes" parameterType="GoodsPriceRes">
+		/* TsaGoods.closeGoodPriceRes */
+		UPDATE TB_GOODS_PRICE_RES
+		SET UPD_DT = NOW()
+			, UPD_NO = #{updNo}  
+			, APPLY_EDDT = NOW()
+		WHERE GOODS_PRICE_RES_SQ = #{goodsPriceResSq}	
+	</update>
+	
+	<!-- 상품 가격예약 이력 등록 -->
+	<insert id="createGoodPriceResHst" parameterType="GoodsPriceRes">
+		/* TsaGoods.createGoodPriceResHst */
+		INSERT INTO TB_GOODS_PRICE_RES_HST (
+		  GOODS_PRICE_RES_HST_SQ
+		, GOODS_CD
+		, RES_GOODS_PRICE
+		, END_GOODS_PRICE
+		, SELL_FEE_RATE
+		, APPLY_STDT
+		, APPLY_EDDT
+		, CFRM_YN
+		, CFRM_NO
+		, CFRM_DT
+		, APPLY_YN
+		, REG_GB
+		, REG_NO
+		, REG_DT
+		)
+		SELECT
+			  NULL
+			, GOODS_CD
+			, RES_GOODS_PRICE
+			, END_GOODS_PRICE
+			, SELL_FEE_RATE
+			, APPLY_STDT
+			, APPLY_EDDT
+			, CFRM_YN
+			, CFRM_NO
+			, CFRM_DT
+			, APPLY_YN
+			, #{regGb}
+			, #{regNo}
+			, NOW()
+		FROM TB_GOODS_PRICE_RES
+		WHERE GOODS_PRICE_RES_SQ = #{goodsPriceResSq}
+	</insert>
+	
 
 	<!-- 상품 동영상 조회 -->
 	<select id="getGoodsVideoList" parameterType="GoodsVideo" resultType="GoodsVideo">

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

@@ -272,7 +272,28 @@
 
 		ORDER BY REG_DT DESC
 	</select>
-
+	
+	<!-- 상품등록-기획전 엑셀 다운로드 -->
+	<select id="getGoodsSendExcelPlanning" parameterType="ShoplinkerSearch" resultType="paramMap">
+		/* TsaShoplinker.getGoodsSendExcelPlanning */
+		SELECT
+			A.API_PRODUCT_ID
+			, A.GOODS_CD
+			, OP.OPT_CD
+			, OP.OPT_CD1
+			, OP.OPT_CD2
+		FROM SHOPLINKER_SYNC_HST A
+		LEFT OUTER JOIN TB_OPTION OP ON A.GOODS_CD = OP.GOODS_CD
+		WHERE A.GOODS_CD IN
+            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
+       		UPPER(#{item})
+            </foreach>
+		AND A.API_TYPE = 'PRODUCT'
+		AND A.API_PRODUCT_ID IS NOT NULL
+		GROUP BY A.API_PRODUCT_ID, A.GOODS_CD, OP.OPT_CD, OP.OPT_CD1, OP.OPT_CD2
+		ORDER BY A.API_PRODUCT_ID, OP.DISP_ORD, OP.OPT_CD1, OP.OPT_CD2
+	</select>
+	
 	<!-- 재고-단품 등록 -->
 	<insert id="insertStockOption" parameterType="ShoplinkerGoods">
 		/* TsaShoplinker.insertStockOption */

src/main/webapp/WEB-INF/views/goods/GoodsPriceReserveForm.html

@@ -121,6 +121,7 @@
 					<button type="button" class="btn btn-success btn-lg" id="btnGoodsExcelSave" th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}">상품가격예약등록</button>
 					<button type="button" class="btn btn-success  btn-lg" id="btnGoodsPriceResSave">예약등록</button>
 					<button type="button" class="btn btn-danger btn-lg" id="btnGoodsPriceResDelete">예약삭제</button>
+					<button type="button" class="btn btn-danger btn-lg" id="btnGoodsPriceResClose">종료</button>
 				</li>
 				<li class="right">
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
@@ -567,6 +568,73 @@
 		fnGoodsPriceSearch("EXCELRESULT");
 	}
 	
+	//종료처리 21.11.15 추가
+	$('#btnGoodsPriceResClose').click(function(e) {
+		//상품선택여부 확인처리 추가
+		var selectedData = gridOptions.api.getSelectedRows();
+
+		if (selectedData.length == 0) {
+			mcxDialog.alert('선택된 행이 없습니다.');
+			return false;
+		}
+		
+		var arrGoodsCd = [];
+		var arrGoodsPriceResSq = [];
+		var chkFlag = false;
+		//selectedData = gagaAgGrid.getAllRowData(gridOptions);
+		$.each(selectedData, function(idx, item) {
+			
+			if (gagajf.isNull(item.goodsPriceResSq) || item.goodsPriceResSq == "0"){
+				chkFlag = true;
+				mcxDialog.alert(item.goodsCd +"상품은 가격이 예약된 상품이 아닙니다.");
+				return false;
+			}
+			
+			var toDateStr = new Date().format("YYYYMMDDHHmmss");
+			if (toDateStr > item.applyEddt){
+				chkFlag = true;
+				mcxDialog.alertC("종료된 예약 상품은 종료할 수 없습니다.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$('#goodsRsvtTnmForm input[name=applyEdYMD]').focus();
+					}
+				});
+				return false;
+			}
+			
+			/*if ((toDateStr > item.applyStdt)){
+				chkFlag = true;
+				mcxDialog.alertC("시작된 예약 상품은 삭제할 수 없습니다.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$('#goodsRsvtTnmForm input[name=applyEdYMD]').focus();
+					}
+				});
+				return false;
+			}*/
+			
+			arrGoodsCd.push(item.goodsCd);
+			arrGoodsPriceResSq.push(item.goodsPriceResSq);
+		});
+
+		if (chkFlag){
+			return;
+		}
+		
+		mcxDialog.confirm('종료하시겠습니까?',  {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				var data = {arrGoodsCd : arrGoodsCd
+						,arrGoodsPriceResSq : arrGoodsPriceResSq
+			};
+			
+			var jsonData = JSON.stringify(data);
+			gagajf.ajaxJsonSubmit('/goods/price/reserve/close', jsonData, fnGoodsPriceResDeleteCollBack);
+			}
+		});
+	});
+	
 	$(document).ready(function() {
 
 		cfnCreateCalendar('#sellTerms', 'applyStdt', 'applyEddt', true, '예약일', 'X');

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerGoodsSendForm.html

@@ -94,6 +94,7 @@
 							<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
 							<button type="button" class="btn btn-gray btn-lg" id="btnInit">초기화</button>
 							<button type="button" class="btn btn-primary btn-lg" id="btnGoodsUpload">엑셀업로드</button>
+							<button type="button" class="btn btn-primary btn-lg" id="btnGoodsPlanning">샵링커기획전생성엑셀</button>
 							<!-- <button th:if="${sessionInfo.userId == 'jmh'}" type="button" class="btn btn-default btn-lg" onclick="fnTest();">테스트</button> -->
 						</li>
 					</ul>
@@ -406,6 +407,26 @@
 	}
 	/**************** 엑셀다운로드 // *****************************************************/
 
+	/**************** 샵링커기획전생성엑셀 *****************************************************/
+	$('#btnGoodsPlanning').on('click', function() {
+		var formId = '#searchForm';
+		if (gagajf.isNull($("#searchForm textarea[name=condition]").val()) ){
+			
+			mcxDialog.alertC("상품 코드를 입력하세요", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$("#searchForm textarea[name=condition]").focus();
+				}
+			});
+			return false;
+		}
+		
+		var params =  $(formId).serialize();
+		$('#ExcelList').attr({ href : '/shoplinker/goods/excel/planning?' + params }).get(0).click();
+		
+	});
+	/**************** 샵링커기획전생성엑셀 // *****************************************************/
+	
 	/**************** 테스트용  *******************************************************/
     // 테스트- 실제 샵링커 호출
 	var fnTest = function(){