Merge remote-tracking branch 'origin/jsh77b' into order

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

@@ -1543,7 +1543,10 @@ public class TscOrderService {
 					order.setSexGb("1");
 				}
 				
-				// orderDao.createInsurance(order);
+				// 2021.05.07 생년월일 + 성별구분
+				String birthYmd = order.getBirthYmd() + order.getSexGb();
+				order.setBirthYmd(birthYmd);
+				orderDao.createInsurance(order);
 
 				/*
 				 * temp.setItemNmArr(goodsNameArr);			// 상품명 배열
@@ -1657,6 +1660,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 +1745,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 +1911,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/domain/Lookbook.java

@@ -33,6 +33,7 @@ public class Lookbook extends TscBaseDomain {
 	private int dispOrd;        //표시순서
 	private String mainDispYn;     //메인노출여부
 	private String mode;			//신규,수정
+	private String frontYn;
 
 	private Integer lookbookbSq;	// 룩북배너일련번호
 	private String orgFileNm;		// 원본파일명

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

@@ -446,6 +446,7 @@ public class Order extends TscBaseDomain {
 	Collection<Order> resCartList;					// 자사예약배송목록
 	Collection<Order> delvCartList;					// 입점업체배송목록
 	Collection<Order> delvAllCartList;				// 배송전체목록 sort
+	Collection<Order> cartGoodsList;				// 다다익선적용장바구니목록
 	List<Order> goodsCpnList;
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private int[] cartCpnCartSqArr;

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

@@ -55,6 +55,9 @@
 		SELECT	COUNT(*) AS TOTCNT
 		FROM	TB_LOOKBOOK
 		WHERE	1=1
+		<if test='frontYn != null and frontYn != ""'>
+		AND DISP_YN = 'Y'
+		</if>
 		<if test="dispEddt != null and dispEddt !=''">
 		<![CDATA[
 		AND DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')
@@ -103,6 +106,9 @@
 		       ,UPD_DT
 		FROM	TB_LOOKBOOK
 		WHERE	1=1
+		<if test='frontYn != null and frontYn != ""'>
+			AND DISP_YN = 'Y'
+		</if>
 		<if test="dispEddt != null and dispEddt !=''">
 		<![CDATA[
 		AND DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')

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

@@ -685,6 +685,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}
@@ -3179,7 +3181,7 @@
 		    , #{ordDtlNo}
 		    , #{reviewSq}
 		    , NULL
-		    , 'G070_10'
+		    , #{pntUploadStat}
 		    , NULL
 		    , #{custNo}
 		    , NOW()