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

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

@@ -66,7 +66,6 @@ public class TsaShoplinkerService {
 		// 파일명 추가 네이밍 규칙
 		fileAddNm = shoplinkerGoods.getRegNo() +"_"+ GagaDateUtil.getToday("yyMMddHHmmss");
 
-		log.info(" #### SHOPLINKER CHK3 - "+ecxelGoodsList.size());
 		for (GagaMap gagaMap : ecxelGoodsList) {
 			if( !"".equals(gagaMap.getString("goodsCd").trim())) {
 				shoplinkerGoods.setGoodsCd(gagaMap.getString("goodsCd"));

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

@@ -156,7 +156,7 @@ public class TsaShoplinkerController extends TsaBaseController {
 	 */
 	@PostMapping("/goods/send/excelupload/register")
 	@ResponseBody
-	public void shoplinkerGoodsRegister(@RequestParam HashMap<String, String> paramMap) throws IOException {
+	public void shoplinkerGoodsRegister(@RequestParam HashMap<String, String> paramMap) throws Exception {
 
 		ShoplinkerGoods shoplinkerGoods = new ShoplinkerGoods();
 		shoplinkerGoods.setExcelFileNm(paramMap.get("excelFileNm"));
@@ -169,14 +169,14 @@ public class TsaShoplinkerController extends TsaBaseController {
 		// API 호출 중인건수 있는지 확인
 		ShoplinkerSearch slkSearch = new ShoplinkerSearch();
 		slkSearch.setApiType("GOODS");
-		ShoplinkerSearch runMap = tscShoplinkerService.getCallRunableInfo(slkSearch);
+		slkSearch.setSid(paramMap.get("sid"));
+		slkSearch.setRegNo(TsaSession.getInfo().getUserNo());
+		ShoplinkerSearch runMap = tscShoplinkerService.getCallRunableInfoGoods(slkSearch);
 
-log.info(" #### SHOPLINKER CHK1 - "+runMap.getRunCnt() +" || "+GagaDateUtil.getTodayDateTime());
-		if( runMap.getRunCnt() < 1 ) {
+log.info(" #### SHOPLINKER CHKE 1 - "+runMap.getRunCnt()+" | "+runMap.getSidOverlapCnt() +" | "+paramMap.get("sid"));
+		if( runMap.getRunCnt() < 1 && runMap.getSidOverlapCnt() < 1 ) {
 			try {
 				// 1. API 호출 이력 저장 시작(실행중 재호출 금지하기 위함)
-				slkSearch.setSid(GagaDateUtil.getTodayDateTime());
-				slkSearch.setRegNo(TsaSession.getInfo().getUserNo());
 				tscShoplinkerService.saveCallApiRunable(slkSearch);
 
 				// 2. 엑셀데이터 확인 및 xml 관련 위치 확인
@@ -450,12 +450,12 @@ log.info(" #### SHOPLINKER CHK1 - "+runMap.getRunCnt() +" || "+GagaDateUtil.getT
 	 * 주문수집관리-주문수집 api 호출
 	 * @param apiStDate
 	 * @author jmh
-	 * @throws IOException
+	 * @throws Exception
 	 * @since 2021. 5. 20
 	 */
 	@PostMapping("/order/collection/receiveList/{apiStDate}")
 	@ResponseBody
-	public void orderReceiveList(@PathVariable("apiStDate") String apiStDate) throws IOException {
+	public void orderReceiveList(@PathVariable("apiStDate") String apiStDate) throws Exception {
 
 		GagaMap rtnMap = new GagaMap();
 
@@ -816,7 +816,7 @@ log.info(" #### SHOPLINKER CHK1 - "+runMap.getRunCnt() +" || "+GagaDateUtil.getT
 	 */
 	@PostMapping("/check/api_runable")
 	@ResponseBody
-	public ShoplinkerSearch apiRunable(@RequestBody ShoplinkerSearch slkSearch) throws IOException {
+	public ShoplinkerSearch apiRunable(@RequestBody ShoplinkerSearch slkSearch) throws Exception {
 
 		slkSearch.setRegNo(TsaSession.getInfo().getUserNo());
 		ShoplinkerSearch runMap = tscShoplinkerService.getCallRunableInfo(slkSearch);

src/main/resources/config/application-style.yml

@@ -90,6 +90,20 @@ naverPay:
     payUrl:
         web : test-pay.naver.com
         mob : test-m.pay.naver.com
+    shop.id: istyle24
+    button.key: 3A1578F9-6824-4FCF-AC8D-262318C63227
+    button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
+    button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
+    common.certification.key: s_3799db3bf4af-
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
+    order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
+    order.pc.url: https://test-order.pay.naver.com/customer/buy/
+    order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/
+    access.license: 01000100005b15bb8faab722d100d589f34bd64843659e37a168b3617443c4f52a3fda45b8
+    secret.key: AQABAADtZ/jOC1Y3LNsyI0TWwCMvPfrg0sqM9pnxliSegbjSqQ==
+    port.address: http://sandbox.api.naver.com/Checkout/MallService5
+    service.name: MallService5
+    version: 5.0
 
 # 샵링커 API(개발계정)
 shoplinker:

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

@@ -364,7 +364,6 @@
 
 			// 현재실행중인건 없음.
 			if( 0 == result.runCnt){
-				console.log(" excel pupup");
 				cfnExcelUploadPopup('shoplinkerUploadGoods', 'shoplinkerUploadGoods');
 
 			}else{
@@ -374,13 +373,16 @@
 	});
 
 	var shoplinkerUploadGoods = function(result){
+		var dateStr = new Date().format("YYYYMMDDHHmmss");
 
-		console.log(" excel post !!! ");
 		var actionUrl = "/shoplinker/goods/send/excelupload/register";
 		let params = {};
 		params.procJob = result.procJob;
 		params.excelFileNm = result.excelFileNm;
-		$.post(actionUrl, $.param(params), null, 'json');
+		params.sid = dateStr;
+
+		console.log(" excel post:" +params.sid);
+		$.post(actionUrl, $.param(params));
 	}
 	/**************** 엑셀업로드 // *****************************************************/
 

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

@@ -29,7 +29,7 @@
 
 			<div class="panelStyle">
 				<div class="panelTitle">
-					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 5시~15시 한시간 단위 | (월) 5시: 전주 금요일 15 ~ 금일 5시 / (화~금) 5시: 전날 15 ~ 금일 5시 -v1</h3>
+					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 5시~15시 한시간 단위 | (월) 5시: 전주 금요일 15 ~ 금일 5시 / (화~금) 5시: 전날 15 ~ 금일 5시 -v2</h3>
 					<span class="panelControl">
 						<i class="fa fa-chevron-up"></i>
 					</span>