주문서수정

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

@@ -54,7 +54,6 @@ public class TscFreegiftService {
 			
 			Collection<Order> freegiftGoodsApplyAmtList = new ArrayList<Order>();
 			int tempFreegiftSq 		= 0;
-			int tempGoodsApplyAmt 	= 0;
 			int index				= 0;
 			boolean	temp			 = false;
 			
@@ -120,15 +119,10 @@ public class TscFreegiftService {
 						int freegiftSectionSq 	= freegiftGoodsApplySection.getFreegiftSectionSq();
 						int sectionVal 			= freegiftGoodsApplySection.getSectionVal();
 						
-						log.info("freegiftGoodsApplyAmt.getFreegiftSq() ::: {}", freegiftGoodsApplyAmt.getFreegiftSq());
-						log.info("freegiftGoodsApplySection.getFreegiftSq() ::: {}", freegiftGoodsApplySection.getFreegiftSq());
-						log.info("freegiftAmt ::: {}", freegiftAmt);
-						log.info("sectionVal ::: {}", sectionVal);
-						log.info("freegiftSectionSq ::: {}", freegiftSectionSq);
-						
 						// 같은 사은품 프로모션끼리 등록
 						if (freegiftGoodsApplyAmt.getFreegiftSq() == freegiftGoodsApplySection.getFreegiftSq()) {
-							if (freegiftAmt > sectionVal) {
+							// 2021.05.07 금액체크는 이상일때 수정
+							if (freegiftAmt >= sectionVal) {
 								tempFreegiftSectionSq = freegiftSectionSq;
 							}
 						}

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

@@ -1657,6 +1657,7 @@ public class TscOrderService {
 					custPointInfo.setPntAmt(usPntAmt * -1);
 					custPointInfo.setOrdNo(orderDetail.getOrdNo());
 					custPointInfo.setOrdDtlNo(orderDetail.getOrdDtlNo());
+					custPointInfo.setPntUploadStat(TscConstants.PntUploadStat.APPLY_COMPLETE.value());
 					
 					// 8.2 포인트이력정보등록
 					orderDao.createCustPointHst(custPointInfo);
@@ -1741,6 +1742,7 @@ public class TscOrderService {
 				orderDetail.setOccurGb(TscConstants.PointOccurGb.EXPECT_POINT.value());
 				orderDetail.setOccurDtlDesc("예정포인트적립");
 				orderDetail.setPntAmt(orderDetail.getSavePntAmt());
+				orderDetail.setPntUploadStat(TscConstants.PntUploadStat.APPLY_EXPECT.value());
 				
 				// 12.2 포인트이력정보등록
 				orderDao.createCustPointHst(orderDetail);
@@ -1906,6 +1908,9 @@ public class TscOrderService {
 				order.setPayMeansNm(orderPayment.getPayMeansNm());
 				order.setCardNm(orderPayment.getCardNm());
 				order.setPayType(payType);
+				// 2021.05.07 현금영수증정보
+				order.setCashAuthNo(orderPayment.getCashAuthNo());
+				order.setCashTradeNo(orderPayment.getCashTradeNo());
 				
 				if (orderPayment.getCardMips() != null && !"".equals(orderPayment.getCardMips())) {
 					if ("00".equals(orderPayment.getCardMips())) {

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

@@ -688,6 +688,8 @@
 		     , DATE_FORMAT(P.VA_DEADLINE, '%Y%m%d%H%i%S') AS VA_DEADLINE
 		     , CARD_MIPS
 		     , CARD_TYPE
+		     , CASH_AUTH_NO
+		     , CASH_TRADE_NO
 		  FROM TB_PAYMENT P
 		 WHERE 1 = 1
 		   AND P.ORD_NO = #{ordNo}
@@ -3182,7 +3184,7 @@
 		    , #{ordDtlNo}
 		    , #{reviewSq}
 		    , NULL
-		    , 'G070_10'
+		    , #{pntUploadStat}
 		    , NULL
 		    , #{custNo}
 		    , NOW()