Merge remote-tracking branch 'origin/style' into card007

src/main/java/com/style24/core/biz/service/TscShoplinkerService.java

@@ -252,8 +252,6 @@ public class TscShoplinkerService {
 			// 파일 권한확인 --------------------------------------------------
 		    File dir = new File(shoplinkerOrder.getXmlPath());
 		    if( null != dir) {
-		    	log.info("\n################### SHOPLINKER_CHECK 0-3  "+dir);
-		    	log.info("\n################### SHOPLINKER_CHECK 0-4  "+dir.canRead()+" / "+dir.canWrite());
 		    	if( !dir.canRead()) {
 		    		dir.setReadable(true);
 		    		chkPermission = "P";
@@ -262,21 +260,21 @@ public class TscShoplinkerService {
 					dir.setWritable(true);
 					chkPermission = "P";
 				}
-				log.info("\n################### SHOPLINKER_CHECK 0-5  "+dir.canRead()+" / "+dir.canWrite());
+				log.info("\n################### SHOPLINKER_CHECK 0-3  "+dir.canRead()+" / "+dir.canWrite());
 		    }
 		    // 파일 권한확인 끝 ------------------------------------------------
 		    log.info("\n################### SHOPLINKER_CHECK 1 ");
 		    
 		    shoplinkerUtil.makeRequestXmlFile(sbRequest.toString(), xmlPath);
 		    
-			log.info("\n################### SHOPLINKER_CHECK 2-1 : ");
+			log.info("\n################### SHOPLINKER_CHECK 2-1");
 			String xmlUrl = GagaFileUtil.getConcatenationPath(shoplinkerOrder.getDomainUrl(), xmlFileName.toString());
 			
 			if (!"locd".equals(shoplinkerOrder.getProfiles())) { // 로컬이 아닐때
 				try {
 					// API 호출
 					responseXmlData = shoplinkerUtil.callShoplinkerApiByGet(GagaShoplinkerConstants.API_DOMAIN+regMap.getApiSubUrl()+URLEncoder.encode(xmlUrl), "");
-					
+					log.info("\n################### SHOPLINKER_CHECK 3-1");
 					// 받은 내용 쌓음.(누락 데이터 확인용) 
 					try {
 						responseXmlPath = GagaFileUtil.getConcatenationPath(shoplinkerOrder.getXmlPath(), "rp_"+fileAddNm+"_"+shoplinkerOrder.getOrderPageNo()+".xml");
@@ -289,7 +287,7 @@ public class TscShoplinkerService {
 					shoplinkerResult = (com.gagaframework.shoplinker.domain.orderlist.Shoplinker)shoplinkerUtil.unmarshal(com.gagaframework.shoplinker.domain.orderlist.Shoplinker.class, responseXmlData);
 					rHeader = shoplinkerResult.getHeader();
 					rOrdList = shoplinkerResult.getOrder();
-
+					log.info("\n################### SHOPLINKER_CHECK 4-1");
 					// 수집정보 존재
 					if( null != rHeader ) {
 						totalCount = rHeader.getTotalCount();
@@ -348,7 +346,7 @@ public class TscShoplinkerService {
 						returnMap.setString("RESULT_TYPE", TscConstants.ShoplinkerApiStat.TRUE.value());
 
 						log.debug("Shoplinker API Call: success");
-						log.debug("responseXmlData {}", responseXmlData);
+						//log.debug("responseXmlData {}", responseXmlData);
 					}else {
 						// 수집정보 존재안함.
 						com.gagaframework.shoplinker.domain.goods.result.Shoplinker orderFailResult;

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

@@ -3620,9 +3620,9 @@
 		             , P.PAY_STAT
 		             , O.CUST_NO
 		             , O.ORD_DT
-		             , CA.ACCOUNT_NM
-		             , CA.ACCOUNT_NO
-		             , CA.BANK_CD
+		             , IFNULL(CA.ACCOUNT_NM, R.RA_NM) AS ACCOUNT_NM
+		             , IFNULL(CA.ACCOUNT_NO, R.RA_NO) AS ACCOUNT_NO
+		             , IFNULL(CA.BANK_CD, R.RA_BANK)  AS BANK_CD
 		             , COUNT(*) OVER (PARTITION BY OC.ORD_CHG_SQ) - 1                             AS GOODS_CNT
 		             , ROW_NUMBER() OVER (PARTITION BY OC.ORD_CHG_SQ ORDER BY OCD.ORD_DTL_NO)     AS RNUM
 		          FROM TB_ORDER_CHANGE OC
@@ -3645,7 +3645,7 @@
 		         WHERE OC.ORD_CHG_SQ = #{ordChgSq}
 		           AND OC.CHG_GB IN ('G680_10', 'G680_20')
 		         GROUP BY O.ORD_NO, OC.ORD_CHG_SQ, OC.CHG_REASON, OCD.ORD_DTL_NO, O.ORD_NM, O.ORD_PHNNO, O.MALL_GB, R.REFUND_AMT
-		                , R.RF_GFCD_USE_AMT ,R.RF_DELV_GFCD_USE_AMT ,R.RF_PNT_AMT, G.GOODS_NM, P.PAY_MEANS
+		                , R.RF_GFCD_USE_AMT ,R.RF_DELV_GFCD_USE_AMT ,R.RF_PNT_AMT, R.RA_NM ,R.RA_NO ,R.RA_BANK,  G.GOODS_NM, P.PAY_MEANS
 		                , PAY_MEANS_NM, P.PG_GB, O.CUST_NO, P.PAY_STAT, CA.ACCOUNT_NM, CA.ACCOUNT_NO, CA.BANK_CD, O.ORD_DT
 		        ) Z
 		 WHERE Z.RNUM = 1