개발중

style24.admin/src/main/java/com/style24/admin/biz/dao/TsaOrderDao.java

@@ -399,6 +399,26 @@ public interface TsaOrderDao {
 	 */
 	int createOrderDetailItemHst(Order order);
 	
+	/**
+	 * 주문상세 > 주문취소신청 > 주문상세정보 수정
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2020. 12. 22
+	 */
+	int updateOrderDetail(Order order);
+	
+	/**
+	 * 주문상세 > 주문취소신청 > 주문상세정보 수정
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2020. 12. 22
+	 */
+	int createOrderDetailhst(Order order);
+	
 	
 }
 

style24.admin/src/main/java/com/style24/admin/biz/service/TsaOrderService.java

@@ -738,7 +738,6 @@ public class TsaOrderService {
 				cancelDelvRefundList.add(delvObj);
 			}
 			
-			
 			spanSumRealOrdAmt	+= oneData.getRealOrdAmt();
 			spanPntDcAmt		+= orderObj.getPntDcAmt();
 			spanPrePntDcAmt		+= orderObj.getPrePntDcAmt();
@@ -886,12 +885,18 @@ public class TsaOrderService {
 				// 4.2.2 주문변경상세정보 등록
 				orderDao.createOrderChangeDetail(po);
 				
-				// 4.2.3 주문상세단품정보 변경
+				// 4.2.3 주문상세단품정보 수정
 				orderDao.updateOrderDetailItem(vo);
 				
 				// 4.2.4 주문상세단품정보 이력 등록
 				orderDao.createOrderDetailItemHst(vo);
 				
+				// 4.2.5 주문변경상세정보 수정
+				orderDao.updateOrderDetail(vo);
+				
+				// 4.2.6 주문변경상세정보 이력 등록
+				orderDao.createOrderDetailhst(vo);
+				
 				int a = 100/0;
 			}
 		}

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -1795,24 +1795,24 @@
 	<update id="updateOrderDetailItem" parameterType="Order">
 		/* Order.updateOrderDetailItem */
 		UPDATE TB_ORDER_DETAIL_ITEM
-		SET    ORD_AMT = ORD_AMT - #{cnclRtnAmt}
-		     , CNCL_RTN_AMT = CNCL_RTN_AMT + #{cnclRtnAmt}
-		     , CPN1_DC_AMT = CPN1_DC_AMT - #{cpn1DcAmt}
-		     , TMTB1_DC_AMT = TMTB1_DC_AMT - #{tmtb1DcAmt}
-		     , TMTB2_DC_AMT = TMTB1_DC_AMT - #{tmtb2DcAmt}
-		     , GOODS_CPN_DC_AMT = GOODS_CPN_DC_AMT - #{goodsCpnDcAmt}
-		     , CART_CPN_DC_AMT = CART_CPN_DC_AMT - #{cartCpnDcAmt}
-		     , PNT_DC_AMT = PNT_DC_AMT - #{pntDcAmt}
-		     , PRE_PNT_DC_AMT = PRE_PNT_DC_AMT - #{prePntDcAmt}
-		     , SAVE_PNT_AMT = SAVE_PNT_AMT - #{savePntAmt}
-		     , REAL_ORD_AMT = REAL_ORD_AMT - #{realOrdAmt}
-		     , GFCD_USE_AMT = GFCD_USE_AMT - #{gfcdUseAmt}
-		     , UPD_NO = #{updNo}
-		     , UPD_DT = SYSDATE()
+		SET    ORD_AMT 				= ORD_AMT 				- #{cnclRtnAmt}
+		     , CNCL_RTN_AMT 		= CNCL_RTN_AMT 			+ #{cnclRtnAmt}
+		     , CPN1_DC_AMT 			= CPN1_DC_AMT 			- #{cpn1DcAmt}
+		     , TMTB1_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb1DcAmt}
+		     , TMTB2_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb2DcAmt}
+		     , GOODS_CPN_DC_AMT 	= GOODS_CPN_DC_AMT 		- #{goodsCpnDcAmt}
+		     , CART_CPN_DC_AMT 		= CART_CPN_DC_AMT 		- #{cartCpnDcAmt}
+		     , PNT_DC_AMT 			= PNT_DC_AMT 			- #{pntDcAmt}
+		     , PRE_PNT_DC_AMT 		= PRE_PNT_DC_AMT 		- #{prePntDcAmt}
+		     , SAVE_PNT_AMT 		= SAVE_PNT_AMT 			- #{savePntAmt}
+		     , REAL_ORD_AMT 		= REAL_ORD_AMT 			- #{realOrdAmt}
+		     , GFCD_USE_AMT 		= GFCD_USE_AMT 			- #{gfcdUseAmt}
+		     , UPD_NO 				= #{updNo}
+		     , UPD_DT 				= SYSDATE()
 		WHERE  1=1
-		AND    ORD_NO = #{ordNo} 
-		AND    ORD_DTL_NO = #{ordDtlNo} 
-		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
+		AND    ORD_NO 				= #{ordNo} 
+		AND    ORD_DTL_NO 			= #{ordDtlNo} 
+		AND    ORD_DTL_ITEM_SQ 		= #{ordDtlItemSq}
 	</update>
 	
 	<!-- 주문상세 > 주문취소신청 > 주문상세단품정보 이력 등록 -->
@@ -1888,6 +1888,30 @@
 		AND    ORD_DTL_NO = #{ordDtlNo} 
 		AND    ORD_DTL_ITEM_SQ = #{ordDtlItemSq}
 	</insert>
+	
+	<!-- 주문상세 > 주문취소신청 > 주문상세정보 수정 -->
+	<update id="updateOrderDetail" parameterType="Order">
+		/* Order.updateOrderDetail */
+		UPDATE TB_ORDER_DETAIL
+		SET    ORD_AMT 				= ORD_AMT 				- #{cnclRtnAmt}
+		     , CNCL_RTN_AMT 		= CNCL_RTN_AMT 			+ #{cnclRtnAmt}
+		     , CPN1_DC_AMT 			= CPN1_DC_AMT 			- #{cpn1DcAmt}
+		     , TMTB1_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb1DcAmt}
+		     , TMTB2_DC_AMT 		= TMTB1_DC_AMT 			- #{tmtb2DcAmt}
+		     , GOODS_CPN_DC_AMT 	= GOODS_CPN_DC_AMT 		- #{goodsCpnDcAmt}
+		     , CART_CPN_DC_AMT 		= CART_CPN_DC_AMT 		- #{cartCpnDcAmt}
+		     , PNT_DC_AMT 			= PNT_DC_AMT 			- #{pntDcAmt}
+		     , PRE_PNT_DC_AMT 		= PRE_PNT_DC_AMT 		- #{prePntDcAmt}
+		     , SAVE_PNT_AMT 		= SAVE_PNT_AMT 			- #{savePntAmt}
+		     , REAL_ORD_AMT 		= REAL_ORD_AMT 			- #{realOrdAmt}
+		     , GFCD_USE_AMT 		= GFCD_USE_AMT 			- #{gfcdUseAmt}
+		     , UPD_NO 				= #{updNo}
+		     , UPD_DT 				= SYSDATE()
+		WHERE  1=1
+		AND    ORD_NO 				= #{ordNo} 
+		AND    ORD_DTL_NO 			= #{ordDtlNo} 
+		AND    ORD_DTL_ITEM_SQ 		= #{ordDtlItemSq}
+	</update>
 	
 </mapper>