ST24PRJ-602 [결함][FRONT] 포인트 로우가 중복되어 노출됨

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

@@ -13,6 +13,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gagaframework.excel.env.GagaExcelConstants;
+import com.gagaframework.excel.xssf.GagaExcelResultHandler;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.dao.TscNaverPayDao;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.dao.TscOrderDao;
@@ -31,11 +35,6 @@ import com.usafe.guarantee.InsuranceManager;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.excel.env.GagaExcelConstants;
-import com.gagaframework.excel.xssf.GagaExcelResultHandler;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-
 /**
  * 주문관리 Service
  *
@@ -1823,6 +1822,7 @@ public class TscOrderService {
 						// 사은품사용포인트
 						else {
 							custPointInfo.setOccurGb(TscConstants.PointOccurGb.FREEGIFT_USE_POINT.value());
+							custPointInfo.setOrdFreegiftValSq(orderDetail.getOrdFreegiftValSq());
 							custPointInfo.setOccurDtlDesc("사은품포인트사용");
 						}
 						

src/main/java/com/style24/persistence/domain/Order.java

@@ -306,6 +306,7 @@ public class Order extends TscBaseDomain {
 
 	// 사은품칼럼
 	private Integer ordFreegiftSq;
+	private Integer ordFreegiftValSq;
 	private Integer freegiftSq;
 	private String freegiftNm;
 	private Integer freegiftValSq;

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

@@ -4733,6 +4733,7 @@
 		     , OD.ORD_DTL_NO
 		     , OD.GOODS_CPN_SQ
 		     , OD.CART_CPN_SQ
+		     , 0 AS ORD_FREEGIFT_VAL_SQ
 		     , OD.PNT_DC_AMT
 		     , OD.GFCD_USE_AMT
 		     , OD.SAVE_PNT_AMT
@@ -4745,6 +4746,7 @@
 		     , DF.DELV_FEE_SQ AS ORD_DTL_NO
 		     , 0 AS GOODS_CPN_SQ
 		     , 0 AS CART_CPN_SQ
+		     , 0 AS ORD_FREEGIFT_VAL_SQ
 		     , 0 AS PNT_DC_AMT
 		     , 0 AS GFCD_USE_AMT
 		     , 0 AS SAVE_PNT_AMT
@@ -4757,6 +4759,7 @@
 		     , 0 AS ORD_DTL_NO
 		     , 0 AS GOODS_CPN_SQ
 		     , 0 AS CART_CPN_SQ
+		     , OFV.ORD_FREEGIFT_VAL_SQ
 		     , OFV.USE_POINT AS PNT_DC_AMT
 		     , 0 AS GFCD_USE_POINT
 		     , 0 AS SAVE_PNT_AMT
@@ -4827,6 +4830,7 @@
 		    , OCCUR_DTL_DESC
 		    , PNT_AMT
 		    , CUST_PNT_SQ
+		    , ORD_FREEGIFT_VAL_SQ
 		    , ORD_NO
 		    , ORD_DTL_NO
 		    , REVIEW_SQ
@@ -4843,6 +4847,7 @@
 		    , #{occurDtlDesc}
 		    , #{pntAmt}
 		    , #{custPntSq}
+		    , #{ordFreegiftValSq}
 		    , #{ordNo}
 		    , #{ordDtlNo}
 		    , #{reviewSq}