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

@@ -1,11 +1,11 @@
 package com.style24.admin.biz.service;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -70,7 +70,7 @@ public class TsaShoplinkerService {
 		int optionAll=0, optionSucc=0;
 		int excelCnt= ecxelGoodsList.size();
 		int tProdSucc = 0, productSucc=0, goodsNotiSucc=0, certSucc=0, imageSucc=0;
-
+		log.info(" #### SHOPLINKER CHK3 - "+excelCnt);
 		for (GagaMap gagaMap : ecxelGoodsList) {
 			if( !"".equals(gagaMap.getString("goodsCd").trim())) {
 				shoplinkerGoods.setGoodsCd(gagaMap.getString("goodsCd"));
@@ -833,7 +833,7 @@ public class TsaShoplinkerService {
 			map.setXmlTxt(sbRequest.toString());
 			map.setApiProductId(resultMsg.getProductId());
 			map.setApiResult(resultMsg.getResult());
-			map.setApiMessage(resultMsg.getMessage());
+			map.setApiMessage(StringUtils.abbreviate(resultMsg.getMessage(), 0 , 120));
 
 			if( "true".equals(resultMsg.getResult())){
 				succCnt = 1;
@@ -848,7 +848,7 @@ public class TsaShoplinkerService {
 			log.error("error", e);
 			map.setXmlTxt(sbRequest.toString());
 			map.setApiResult("error");
-			map.setApiMessage("API 통신오류");
+			map.setApiMessage("API 오류");
 		}
 
 		// 전송이력 저장
@@ -1162,7 +1162,7 @@ public class TsaShoplinkerService {
 						apiHstMap.setXmlTxt(sbRequest.toString());
 						apiHstMap.setOrdDtlNo(info.getOrdDtlNo());
 						apiHstMap.setApiResult("error");
-						apiHstMap.setApiMessage("API 통신오류");
+						apiHstMap.setApiMessage("API 오류");
 					}
 
 					// 전송이력 저장

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

@@ -171,6 +171,7 @@ public class TsaShoplinkerController extends TsaBaseController {
 		slkSearch.setApiType("GOODS");
 		ShoplinkerSearch runMap = tscShoplinkerService.getCallRunableInfo(slkSearch);
 
+log.info(" #### SHOPLINKER CHK1 - "+runMap.getRunCnt() +" || "+GagaDateUtil.getTodayDateTime());
 		if( runMap.getRunCnt() < 1 ) {
 			try {
 				// 1. API 호출 이력 저장 시작(실행중 재호출 금지하기 위함)
@@ -207,6 +208,7 @@ public class TsaShoplinkerController extends TsaBaseController {
 				// 3. xml 데이터 생성
 				shoplinkerGoods.setCustomerId(env.getProperty("shoplinker.customer_id"));
 				shoplinkerGoods.setRegNo(TsaSession.getInfo().getUserNo());
+				log.info(" #### SHOPLINKER CHK2 ");
 				rtnMap = admShoplinkerService.createShoplinkerXml(ecxelGoodsList, shoplinkerGoods);
 
 				// 4. 파일 삭제
@@ -890,6 +892,23 @@ System.out.println("####### : "+re.getResult());
 			//1 상품등록 테스트
 			String testXmlUrl;
 
+			/*for( i=2; i< 87; i++) {
+				testXmlUrl = "http://ts5000.ipdisk.co.kr:8999/shoplinker/goods_reg/T142TS200P/option_"+i+".xml";
+				responseXmlData =    shoplinkerUtil.callShoplinkerApiByGet(GagaShoplinkerConstants.API_DOMAIN+"/Product/attribute_insert.php?iteminfo_url="+URLEncoder.encode(testXmlUrl), "" );
+				shoplinkerResult =  (com.gagaframework.shoplinker.domain.goods.result.Shoplinker)shoplinkerUtil.unmarshal(com.gagaframework.shoplinker.domain.goods.result.Shoplinker.class, responseXmlData);
+				resultMsg = shoplinkerResult.getResultMessage();
+				System.out.println(i+"\n### 1.단품 result1 :: "+resultMsg.getResult());
+			  	System.out.println(i+"### 1.단품 result2 :: "+resultMsg.getMessage());
+			}*/
+
+			testXmlUrl = "http://ts5000.ipdisk.co.kr:8999/shoplinker/goods_reg/T142TS200P/product.xml";
+			responseXmlData =   shoplinkerUtil.callShoplinkerApiByGet(GagaShoplinkerConstants.API_DOMAIN+"/Product/attribute_prod_insert.php?iteminfo_url="+URLEncoder.encode(testXmlUrl), "");
+			shoplinkerResult =  (com.gagaframework.shoplinker.domain.goods.result.Shoplinker)shoplinkerUtil.unmarshal(com.gagaframework.shoplinker.domain.goods.result.Shoplinker.class, responseXmlData);
+			resultMsg = shoplinkerResult.getResultMessage();
+			System.out.println("\n\n\n### 2.상품 result1 :: "+resultMsg.getResult());
+			System.out.println(" :: "+responseXmlData);
+			System.out.println("### 2.상품 result2 :: "+resultMsg.getMessage());
+
 	for( i=1; i< 1; i++) {
 
 			testXmlUrl = "http://ts5000.ipdisk.co.kr:8999/shoplinker/goods_reg/option_1.xml";

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

@@ -358,12 +358,13 @@
 
 	/**************** 엑셀업로드 ********************************************************/
 	$('#btnGoodsUpload').on('click', function() {
-
+		console.log(" excel click");
 		var jsonData = JSON.stringify({apiType : "GOODS"});
 		gagajf.ajaxJsonSubmit('/shoplinker/check/api_runable', jsonData, function(result) {
 
 			// 현재실행중인건 없음.
 			if( 0 == result.runCnt){
+				console.log(" excel pupup");
 				cfnExcelUploadPopup('shoplinkerUploadGoods', 'shoplinkerUploadGoods');
 
 			}else{
@@ -374,6 +375,7 @@
 
 	var shoplinkerUploadGoods = function(result){
 
+		console.log(" excel post !!! ");
 		var actionUrl = "/shoplinker/goods/send/excelupload/register";
 		let params = {};
 		params.procJob = result.procJob;
@@ -404,20 +406,6 @@
 		var jsonData = JSON.stringify(data);
 		gagajf.ajaxJsonSubmit('/shoplinker/apiTest2', jsonData, null);
 	}
-
-	// 테스트- 엑셀업로드2
-	var fnGoodsExcelDownLoad = function(flag){
-		cfnExcelUploadPopup('shoplinkerSearchGoods', 'shoplinkerSearchGoods');
-	};
-
-	var shoplinkerSearchGoods = function(result){
-
-		var data = {procJob : result.procJob
-					,excelFileNm : result.excelFileNm
-					};
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/shoplinker/goods/excel/list', jsonData, null);
-	}
 	/**************** 테스트용 // *****************************************************/
 
 

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시 //T0</h3>
+					<h3><i class="fa fa-info-circle"></i>[배치주기] 평일: 5시~15시 한시간 단위 | (월) 5시: 전주 금요일 15 ~ 금일 5시 / (화~금) 5시: 전날 15 ~ 금일 5시 -T1</h3>
 					<span class="panelControl">
 						<i class="fa fa-chevron-up"></i>
 					</span>