Merge remote-tracking branch 'origin/xodud1202' into develop

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

@@ -283,6 +283,7 @@ public class TscKcpService {
 	 */
 	@Transactional("shopTxnManager")
 	public void kcpCancel(Payment param) {
+		int ordChgSq = param.getOrdChgSq();
 		// try {	request.setCharacterEncoding("euc-kr");	} catch(Exception e) {e.printStackTrace();}
 
 		// 일반 취소의 모듈 실행 mf_do_tx 에는 값이 안들어가고, 무통장입금 환불계좌 취소에는 custIp가 들어가도록 되어있어 계좌취소용 변수 따로 사용
@@ -357,6 +358,7 @@ public class TscKcpService {
 					payment.setRegNo(param.getRegNo() == null ? 0 : param.getRegNo());
 					payment.setUpdNo(param.getUpdNo() == null ? 0 : param.getUpdNo());
 					payment.setPayGb(param.getPayGb());
+					payment.setOrdChgSq(ordChgSq);
 					payment.setPayStat(param.getPayStat());
 					payment.setPgTradeNo(c_PayPlus.mf_get_res("tno"));		// 환불 요청건의 KCP 거래번호
 

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

@@ -239,7 +239,6 @@ public class TscOrderService {
 		// 1. 임시테이블 삭제
 		Order deleteOrder = new Order();
 		deleteOrder.setRegNo(userNo);
-		scmDao.deleteEntryExcelDownTmp(deleteOrder);
 
 		for (Order oneData : orderList) {
 
@@ -269,13 +268,6 @@ public class TscOrderService {
 					scmDao.updateOrderDetailItemStat(updateData);
 				}
 			}
-
-			// 4. 엑셀 다운로드용 임시테이블 데이타 체크
-			result = scmDao.getEntryUploadExcelCheck(updateData);
-			if (result < 1) {
-				// 5. 엑셀 다운로드용 임시테이블 저장
-				scmDao.createEntryExcelDownTmp(updateData);
-			}
 		}
 	}
 
@@ -289,7 +281,7 @@ public class TscOrderService {
 	 */
 	public void geSellerUnorderExcelList(Order order, String excelFilenameWithPath) {
 
-		// 헤더 title 설정 (25)
+		// 헤더 title 설정 (27)
 		String[] listTitles = {
 			  "입점업체"
 			, "브랜드"
@@ -316,10 +308,11 @@ public class TscOrderService {
 			, "취소금액"
 			, "할인금액"
 			, "실결제금액"
+			, "배송비"
 			, "송장"
 		};
 
-		// DB 처리 시 사용되는 파라미터명(셀명) 설정 (25)
+		// DB 처리 시 사용되는 파라미터명(셀명) 설정 (27)
 		String[] cellNames = {
 			  "supplyCompNm"
 			, "brandKnm"
@@ -346,6 +339,7 @@ public class TscOrderService {
 			, "cnclRtnAmt"
 			, "totDcAmt"
 			, "realOrdAmt"
+			, "realDelvAmt"
 			, "invoiceNo"
 		};
 
@@ -376,6 +370,7 @@ public class TscOrderService {
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
+			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 		};
 
 		GagaExcelResultHandler<Order> handler = new GagaExcelResultHandler<>(excelFilenameWithPath, "출고배송목록(입점)", listTitles, cellNames, cellTypes);

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

@@ -2482,6 +2482,7 @@
 			, VA_BANK
 			, VA_DEADLINE
 			, TELECOM
+			, ORD_CHG_SQ
 			, REG_NO
 			, REG_DT
 			, UPD_NO
@@ -2511,6 +2512,7 @@
 			 , VA_BANK
 			 , VA_DEADLINE
 			 , TELECOM
+		     , CASE WHEN #{ordChgSq} = 0 THEN NULL ELSE #{ordChgSq} END
 			 , #{regNo}
 			 , NOW()
 			 , #{updNo}
@@ -2587,7 +2589,7 @@
 			, #{telecom}
 			, #{cashAuthNo}
 			, #{cashTradeNo}
-			, #{ordChgSq}
+			, CASE WHEN #{ordChgSq} = 0 THEN NULL ELSE #{ordChgSq} END
 			, #{regNo}
 			, NOW()
 			, #{updNo}

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

@@ -164,36 +164,38 @@
 	<select id="getSellerUnorderList" parameterType="Order" resultType="Order">
 		/* tscScm.getSellerUnorderList */
 		SELECT (SELECT SC.SUPPLY_COMP_NM
-		FROM   TB_SUPPLY_COMPANY SC
-		WHERE  SC.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
-		, (SELECT B.BRAND_KNM
-		FROM   TB_BRAND B
-		WHERE  B.BRAND_CD = G.BRAND_CD) AS BRAND_KNM
-		, OD.ORD_NO
-		, OD.ORD_DTL_NO
-		, FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT ) AS ORD_DTL_STAT_NM
-		, O.ORD_NM
-		, DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
-		, FN_GET_CODE_NM('G014', P.PAY_MEANS  ) AS PAY_MEANS_NM
-		, O.ORD_PHNNO
-		, DA.RECIP_NM
-		, DA.RECIP_PHNNO
-		, DA.RECIP_ZIPCODE
-		, DA.RECIP_BASE_ADDR
-		, DA.RECIP_DTL_ADDR
-		, G.SUPPLY_GOODS_CD
-		, G.GOODS_CD
-		, G.GOODS_NM
-		, ODI.OPT_CD1
-		, ODI.OPT_CD2
-		, CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
-		, OD.ORD_QTY
-		, OD.CNCL_RTN_QTY
-		, OD.ORD_AMT
-		, OD.CNCL_RTN_AMT
-		, OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
-		, OD.REAL_ORD_AMT
-		, OD.INVOICE_NO
+		        FROM   TB_SUPPLY_COMPANY SC
+		        WHERE  SC.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+		     , (SELECT B.BRAND_KNM
+		        FROM   TB_BRAND B
+		        WHERE  B.BRAND_CD = G.BRAND_CD) AS BRAND_KNM
+		     , OD.ORD_NO
+		     , OD.ORD_DTL_NO
+		     , CASE WHEN DF.REAL_DELV_AMT IS NULL THEN 0 ELSE DF.REAL_DELV_AMT END AS REAL_DELV_AMT
+		     , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT ) AS ORD_DTL_STAT_NM
+		     , O.ORD_NM
+		     , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
+		     , FN_GET_CODE_NM('G014', P.PAY_MEANS  ) AS PAY_MEANS_NM
+		     , O.ORD_PHNNO
+		     , DA.RECIP_NM
+		     , DA.RECIP_PHNNO
+		     , DA.RECIP_ZIPCODE
+		     , DA.RECIP_BASE_ADDR
+		     , DA.RECIP_DTL_ADDR
+		     , G.SUPPLY_GOODS_CD
+		     , G.GOODS_CD
+		     , G.GOODS_NM
+		     , ODI.OPT_CD1
+		     , ODI.OPT_CD2
+		     , CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
+		     , DF.REAL_DELV_AMT
+		     , OD.ORD_QTY
+		     , OD.CNCL_RTN_QTY
+		     , OD.ORD_AMT
+		     , OD.CNCL_RTN_AMT
+		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
+		     , OD.REAL_ORD_AMT
+		     , OD.INVOICE_NO
 		FROM   TB_ORDER O
 		INNER  JOIN TB_ORDER_DETAIL OD
 		ON     O.ORD_NO = OD.ORD_NO
@@ -208,9 +210,27 @@
 		ON     OD.GOODS_CD = G.GOODS_CD
 		INNER  JOIN TB_DELIVERY_ADDR DA
 		ON     OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
-		INNER  JOIN TB_ENTRY_UPLOAD_EXCEL X
-		ON     OD.ORD_NO = X.ORD_NO
-		AND    OD.ORD_DTL_NO = X.ORD_DTL_NO
+		LEFT   OUTER JOIN ( SELECT OD.ORD_NO
+		                         , DF.ORD_CHG_SQ
+		                         , DF.DELV_FEE_GB
+		                         , DF.DELV_FEE_CD
+		                         , IF(DF.ORD_CHG_SQ IS NULL, MIN(OD.ORD_DTL_NO), MIN(OCD.CHG_ORD_DTL_NO)) AS ORD_DTL_NO
+		                         , MAX(IF(DF.REAL_DELV_AMT IS NULL, 0, DF.REAL_DELV_AMT)) AS REAL_DELV_AMT
+		                    FROM   TB_ORDER O
+		                    INNER  JOIN TB_ORDER_DETAIL OD
+		                    ON     O.ORD_NO = OD.ORD_NO
+		                    INNER  JOIN TB_DELIVERY_FEE DF
+		                    ON     O.ORD_NO = DF.ORD_NO
+		                    AND    DF.DELV_FEE_CD = OD.DELV_FEE_CD
+		                    LEFT   OUTER JOIN TB_ORDER_CHANGE OC
+		                    ON     DF.ORD_CHG_SQ = OC.ORD_CHG_SQ
+		                    LEFT   OUTER JOIN TB_ORDER_CHANGE_DETAIL OCD
+		                    ON     OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
+		                    AND    OD.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
+		                    WHERE  OD.ORD_QTY - CNCL_RTN_QTY > 0
+		                    AND    DF.DELV_FEE_GB IN ('G018_10', 'G018_30')
+		                    GROUP  BY OD.ORD_NO, OD.DELV_FEE_CD, DF.ORD_CHG_SQ, DF.DELV_FEE_CD, DF.DELV_FEE_GB) DF
+		ON     DF.ORD_DTL_NO = OD.ORD_DTL_NO
 		WHERE  1=1
 		AND    DA.RECIP_BASE_ADDR IS NOT NULL
 		<if test='supplyCompCd != null and supplyCompCd != ""'>