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

src/main/java/com/style24/core/biz/dao/TscOrderDao.java

@@ -420,6 +420,14 @@ public interface TscOrderDao {
 	 */
 	void insertPaymentCancel(Payment param);
 
+	/**
+	 * 주문 상세 상품 이력 정보 저장(ordDtlNo)
+	 * @param param
+	 * @author xodud1202
+	 * @since 2021. 06. 18
+	 */
+	void createOrderDetailItemHstFromDtlNo(Order param);
+
 	/**
 	 * PAYMENT INSERT
 	 * @param param

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

@@ -468,7 +468,7 @@ public class TscOrderService {
 			}
 		}
 
-		resultMsg = "출고완료 : " + totalCount + "건 / 실패 : " + failedCount + "건 / 성공 : " + successCount + "건 <br/>" + "실패 목록 : " + failedGoodCdStr;
+		resultMsg = "배송준비중 : " + totalCount + "건 / 실패 : " + failedCount + "건 / 성공 : " + successCount + "건 <br/>" + "실패 목록 : " + failedGoodCdStr;
 
 		return resultMsg;
 	}
@@ -2389,6 +2389,8 @@ public class TscOrderService {
 					scmDao.createOrderDetailInvoice(param);
 					// 주문 변경 이력 저장
 					orderDao.createOrderDetailHst(param);
+					// 주문 상세 아이템 이력 저장
+					orderDao.createOrderDetailItemHstFromDtlNo(param);
 
 					boolean isOther = true;
 					for(Order delv : delvStartList) {

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -257,6 +257,7 @@ public class TscConstants {
 		CHANGE_CUSTOMER("G686_10"),		// 고객변심
 		ADMIN_CANCEL("G686_20"),			// 관리자취소
 		DELAY_ORDER("G686_13"),			// 상품이 늦게 배송됨
+		INCORRECT_INFO("G686_16"),		// 상품정보와 상이함
 		SOLDOUT_CANCEL("G686_30"),		// 품절
 		ETC("G686_90");					// 기타
 

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

@@ -1304,9 +1304,80 @@
 		 WHERE ORD_DTL_NO = #{ordDtlNo}
 	</insert>
 
+	<!-- 주문상세아이템 이력 정보 등록 -->
+	<insert id="createOrderDetailItemHstFromDtlNo" parameterType="Order">
+		/* TscOrder.createOrderDetailItemHstFromDtlNo */
+		INSERT INTO TB_ORDER_DETAIL_ITEM_HST (
+			   ORD_DTL_ITEM_SQ
+			 , ORD_DTL_NO
+			 , ORD_NO
+			 , ORD_DTL_STAT
+			 , ITEM_CD
+			 , OPT_CD
+			 , OPT_CD1
+			 , OPT_CD2
+			 , SKU_MODEL_NO
+			 , PRODUCT_NO
+			 , PRODUCT_CODE
+			 , ITEM_QTY
+			 , ITEM_PRICE
+			 , OPT_ADD_PRICE
+			 , DISP_ORD
+			 , ORD_AMT
+			 , CNCL_RTN_AMT
+			 , CPN1_DC_AMT
+			 , TMTB1_DC_AMT
+			 , TMTB2_DC_AMT
+			 , GOODS_CPN_DC_AMT
+			 , CART_CPN_DC_AMT
+			 , PNT_DC_AMT
+			 , PRE_PNT_DC_AMT
+			 , SAVE_PNT_AMT
+			 , REAL_ORD_AMT
+			 , GFCD_USE_AMT
+			 , REG_NO
+			 , REG_DT
+			 , UPD_NO
+			 , UPD_DT
+		)
+		SELECT ORD_DTL_ITEM_SQ
+			 , ORD_DTL_NO
+			 , ORD_NO
+			 , #{ordDtlStat}
+			 , ITEM_CD
+			 , OPT_CD
+			 , OPT_CD1
+			 , OPT_CD2
+			 , SKU_MODEL_NO
+			 , PRODUCT_NO
+			 , PRODUCT_CODE
+			 , ITEM_QTY
+			 , ITEM_PRICE
+			 , OPT_ADD_PRICE
+			 , DISP_ORD
+			 , ORD_AMT
+			 , CNCL_RTN_AMT
+			 , CPN1_DC_AMT
+			 , TMTB1_DC_AMT
+			 , TMTB2_DC_AMT
+			 , GOODS_CPN_DC_AMT
+			 , CART_CPN_DC_AMT
+			 , PNT_DC_AMT
+			 , PRE_PNT_DC_AMT
+			 , SAVE_PNT_AMT
+			 , REAL_ORD_AMT
+			 , GFCD_USE_AMT
+			 , #{regNo}
+			 , NOW()
+			 , #{updNo}
+			 , NOW()
+		FROM TB_ORDER_DETAIL_ITEM
+		WHERE ORD_DTL_NO = #{ordDtlNo}
+	</insert>
+
 	<!-- 주문상세 > 주문메오 > 주문메모정보조회 -->
 	<select id="getOrderMemoInfo" parameterType="Order" resultType="Order">
-		/* order.getOrderMemoInfo */
+		/* TscOrder.getOrderMemoInfo */
 		SELECT ORD_MEMO_SQ
 		     , OM.ORD_NO
 		     , OM.MEMO