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

@@ -1040,8 +1040,13 @@ public class TsaShoplinkerService {
 			sbRequest.append("	<OrderInfo>\n");
 			sbRequest.append("		<Order>\n");
 
+			/*
 			sbRequest.append("			<customer_id>").append(shoplinkerOrder.getCustomerId()).append("</customer_id>\n");
 			sbRequest.append("			<shoplinker_id><![CDATA[").append(shoplinkerOrder.getShoplinkerId()).append("]]></shoplinker_id>\n");
+			*/
+			sbRequest.append("			<customer_id>").append("a0021915").append("</customer_id>\n");
+			sbRequest.append("			<shoplinker_id><![CDATA[").append("yes2424").append("]]></shoplinker_id>\n");
+			sbRequest.append("			<order_flag>004</order_flag>\n");// 테스트용
 			sbRequest.append("			<st_date>").append(shoplinkerOrder.getApiStDate().replace("-", "")).append("</st_date>\n");
 			sbRequest.append("			<ed_date>").append(shoplinkerOrder.getApiStDate().replace("-", "")).append("</ed_date>\n");
 			sbRequest.append("			<page_no>").append(shoplinkerOrder.getOrderPageNo()).append("</page_no>\n");
@@ -1061,7 +1066,7 @@ public class TsaShoplinkerService {
 			shoplinkerUtil.makeRequestXmlFile(sbRequest.toString(), xmlPath);
 			String xmlUrl = GagaFileUtil.getConcatenationPath(shoplinkerOrder.getDomainUrl(), xmlFileName.toString());
 
-			if ("run".equals(shoplinkerOrder.getProfiles())) { // 운영서버이면
+			if (!"locd".equals(shoplinkerOrder.getProfiles())) { // 로컬이 아닐때
 				try {
 					// API 호출
 					responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(GagaShoplinkerConstants.API_DOMAIN+regMap.getApiSubUrl()+URLEncoder.encode(xmlUrl), "");
@@ -1134,12 +1139,10 @@ public class TsaShoplinkerService {
 				// 테스트용
 				xmlUrl = "http://ts5000.ipdisk.co.kr:8999/shoplinker/order/order_real_0430_"+shoplinkerOrder.getOrderPageNo()+".xml";
 
-				// API 호출
-				//responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(GagaShoplinkerConstants.API_DOMAIN+regMap.getApiSubUrl()+URLEncoder.encode(xmlUrl), "");
-								//testOrderStr();
 				try {
 					// API 호출
 					responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(GagaShoplinkerConstants.API_DOMAIN+regMap.getApiSubUrl()+URLEncoder.encode(xmlUrl), "");
+									//testOrderStr();
 
 					// response 결과
 					shoplinkerResult = (com.gagaframework.shoplinker.domain.orderlist.Shoplinker)shoplinkerUtil.unmarshal(com.gagaframework.shoplinker.domain.orderlist.Shoplinker.class, responseXmlData);
@@ -1209,7 +1212,7 @@ public class TsaShoplinkerService {
 			returnMap.setString("RESULT_TYPE", "TRUE");
 
 			// 생성 파일삭제
-			GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(shoplinkerOrder.getXmlPath(), xmlFileName.toString()));
+			// GagaFileUtil.deleteFile(GagaFileUtil.getConcatenationPath(shoplinkerOrder.getXmlPath(), xmlFileName.toString()));
 
 		}catch(Exception e) {
 			log.error("xml 생성오류 ", e);
@@ -1682,7 +1685,7 @@ public class TsaShoplinkerService {
 				+ "<receive_tel><![CDATA[]]></receive_tel>\r\n"
 				+ "<receive_cel><![CDATA[]]></receive_cel>\r\n"
 				+ "<receive_zipcode><![CDATA[]]></receive_zipcode>\r\n"
-				+ "<receive_addr><![CDATA[주소소주소주주소소주소주주소소주소주주소13소주소주주소소주주소소주소주주소소주소주]]></receive_addr>\r\n"
+				+ "<receive_addr><![CDATA[]]></receive_addr>\r\n"
 				+ "<baesong_type><![CDATA[쇼핑몰확인요망]]></baesong_type>\r\n"
 				+ "<baesong_bi>0</baesong_bi>\r\n"
 				+ "<delivery_msg><![CDATA[]]></delivery_msg>\r\n"

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

@@ -177,11 +177,18 @@
 	<select id="getExtmallMasterOrderList" parameterType="ExtmallOrder" resultType="ExtmallOrder">
 	/* TsaOcm.getExtmallMasterOrderList */
 		SELECT
-			A.VENDOR_ID, A.EXTMALL_ID, A.EXTMALL_ORDER_ID, A.ORD_NM, A.ORD_PHNNO, A.RECIP_NM, A.RECIP_PHNNO, A.RECIP_BASE_ADDR, A.RECIP_DTL_ADDR
+			A.VENDOR_ID, A.EXTMALL_ID, A.EXTMALL_ORDER_ID
+			, IFNULL(A.ORD_NM, '') AS ORD_NM
+			, IFNULL(A.ORD_PHNNO, '') AS ORD_PHNNO
+			, IFNULL(A.RECIP_NM, '') AS RECIP_NM
+			, IFNULL(A.RECIP_PHNNO, '') AS RECIP_PHNNO
+			, IFNULL(A.RECIP_BASE_ADDR, '') AS RECIP_BASE_ADDR
+			, IFNULL(A.RECIP_DTL_ADDR, '') AS RECIP_DTL_ADDR
 			, SUM(A.DELV_FEE) AS DELV_FEE
 			, SUM(A.ORD_AMT) AS TOTAL_ORD_AMT
 		FROM TB_EXTMALL_ORDER_UPLOAD A
 		WHERE A.UPLOAD_STAT = 'G021_00'
+		AND RECIP_BASE_ADDR IS NOT NULL AND RECIP_BASE_ADDR != ''
 		GROUP BY A.VENDOR_ID, A.EXTMALL_ID, A.EXTMALL_ORDER_ID, A.ORD_NM, A.ORD_PHNNO, A.RECIP_NM, A.RECIP_PHNNO, A.RECIP_BASE_ADDR, A.RECIP_DTL_ADDR
 		ORDER BY A.VENDOR_ID, A.EXTMALL_ID, A.EXTMALL_ORDER_ID
 	</select>
@@ -193,10 +200,46 @@
 			 B.GOODS_NM
 			, B.SUPPLY_COMP_CD -- 공급업체코드
 			, B.DELV_FEE_CD -- 배송비정책코드
-			, A.*
+			, A.VENDOR_ID
+			, A.EXTMALL_ID
+			, A.EXTMALL_NM
+			, A.AGENT_ORDER_ID
+			, A.EXTMALL_ORDER_ID
+			, A.EXTMALL_PROD_ID
+			, A.EXTMALL_PROD_NM
+			, A.GOODS_CD
+			, A.SKU
+			, A.CURR_PRICE
+			, A.ORD_QTY
+			, A.ORD_AMT
+			, A.CPN_DC_AMT
+			, A.PNT_DC_AMT
+			, A.DELV_FEE
+			, A.ORD_RECV_DT
+			, A.ORD_DT
+			, IFNULL(A.ORD_NM, '') AS ORD_NM
+			, IFNULL(A.ORD_PHNNO, '') AS ORD_PHNNO
+			, A.ORD_TELNO
+			, A.ORD_EMAIL
+			, IFNULL(A.RECIP_NM, '') AS RECIP_NM
+			, IFNULL(A.RECIP_PHNNO, '') AS RECIP_PHNNO
+			, A.RECIP_TELNO
+			, A.RECIP_ZIPCODE
+			, IFNULL(A.RECIP_BASE_ADDR, '') AS RECIP_BASE_ADDR
+			, IFNULL(A.RECIP_DTL_ADDR, '') AS RECIP_DTL_ADDR
+			, A.DELV_MEMO
+			, A.UPLOAD_STAT
+			, A.UPLOAD_FAIL_CD
+			, A.UPLOAD_FAIL_REASON
+			, A.ORD_NO
+			, A.DELV_ADDR_SQ
+			, A.REG_NO
+			, A.REG_DT
+			, A.OPT_CD
 		FROM TB_EXTMALL_ORDER_UPLOAD A
 			LEFT OUTER JOIN TB_GOODS B ON A.GOODS_CD = B.GOODS_CD
 		WHERE 1=1
+		AND RECIP_BASE_ADDR IS NOT NULL AND RECIP_BASE_ADDR != ''
 		<if test="uploadStat != null and uploadStat != ''">
 	      AND A.UPLOAD_STAT = #{uploadStat}
 	    </if>

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

@@ -515,7 +515,7 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 			FROM SHOPLINKER_ORDER A
-				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
+				INNER JOIN TB_EXTMALL_ORDER_UPLOAD B
 					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
 					AND A.MALL_ORDER_ID = B.EXTMALL_ORDER_ID
 			WHERE A.SKU_MATCH_CODE IS NOT NULL
@@ -543,7 +543,7 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 			FROM SHOPLINKER_ORDER A
-				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
+				INNER JOIN TB_EXTMALL_ORDER_UPLOAD B
 					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
 					AND A.MALL_ORDER_ID = B.EXTMALL_ORDER_ID
 			WHERE A.SKU_MATCH_CODE IS NOT NULL
@@ -551,7 +551,7 @@
 		) A
 		WHERE 1=1
 		<include refid="getSlkOrderListCondition_sql"/>
-
+		ORDER BY REG_DT DESC
 		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
 
 	</select>
@@ -618,7 +618,7 @@
 	        AND MALL_ORDER_ID = #{mallOrderId}
 	        </if>
 	        <if test="ordNo != null and ordNo != ''">
-	        AND ORDER_NO = #{ordNo}
+	        AND ORD_NO = #{ordNo}
 	        </if>
 	</sql>
 
@@ -798,7 +798,7 @@
 
 	<!-- 재고전송-목록 건수 -->
 	<select id="getStockListCount" parameterType="ShoplinkerSearch" resultType="int">
-		/* ShoplinkerGoods.getShoplinkerOrderListCount */
+		/* ShoplinkerGoods.getStockListCount */
 		select count(1) from (
 			SELECT
 				A.GOODS_CD
@@ -821,7 +821,7 @@
 
 	<!-- 재고전송-목록 -->
 	<select id="getStockListList" parameterType="ShoplinkerSearch" resultType="ShoplinkerGoods">
-		/* ShoplinkerGoods.getShoplinkerOrderList */
+		/* ShoplinkerGoods.getStockListList */
 		SELECT * FROM
 		(
 			SELECT

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

@@ -89,7 +89,7 @@ shoplinker:
     customer_id : a0024007
     shoplinker_id : istyle1
     xml:
-        path: //ts5000.ipdisk.co.kr:8999/shoplinker
+        path: /TSIT/servers/files/data/style24/shoplinker
         view: //ts5000.ipdisk.co.kr:8999/shoplinker
     url:
         option : /Product/attribute_insert.php?iteminfo_url=

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

@@ -91,7 +91,7 @@
 						<button type="button" class="btn btn-primary btn-lg" id="btnGoodsUpload">엑셀업로드</button>
 						<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnGoodsExcelDownLoad('');">샵링커상품 엑셀다운로드</button> -->
 						<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnGoodsExcelDownLoad('');">테스트</button> -->
-						<button type="button" class="btn btn-default btn-lg" onclick="fnTest();">테스트</button>
+						<button th:if="${sessionInfo.userId == 'jmh'}" type="button" class="btn btn-default btn-lg" onclick="fnTest();">테스트</button>
 					</li>
 				</ul>
 

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

@@ -39,7 +39,7 @@
 						<td colspan="7">
 							<input name="apiStDate" id="apiStDate" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="주문수집일" />
 							&nbsp;&nbsp;&nbsp;&nbsp;
-							<button type="button" class="btn btn-primary btn-lg" id="btnCollection">주문수집</button>
+							<button th:if="${sessionInfo.userId == 'jmh'}" type="button" class="btn btn-primary btn-lg" id="btnCollection">주문수집</button>
 							&nbsp;<span class="runable_info"></span>
 						</td>
 					</tr>
@@ -363,8 +363,8 @@
 		}
 
 		var testDate = Number($("#orderCollectionForm input[name=apiStDate]").val().replaceAll("-", ""));
-		if( 20210510 < testDate ){
-			mcxDialog.alert("※ 테스트 주문수집시 ※<br>실제운영 주문건을 가져오므로 5/10 이전 날짜로 조회해주세요.");
+		if( testDate < 20210401 || 20210510 < testDate){
+			mcxDialog.alert("※ 테스트 주문수집시 ※<br>실제운영 주문건을 가져오므로 4월부터 ~ 5/10 사이 날짜로 조회해주세요.");
 			return;
 		}