모바일 주문서 개발중

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

@@ -779,4 +779,14 @@ public interface TscOrderDao {
 	 * @since 2021. 04. 15
 	 */
 	Collection<Order> getOrderGiftGoodsList(Order order);
+	
+	/**
+	 * 선물주문배송신청완료
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 04. 15
+	 */
+	int updateOrderDetailGiftAddrInpYn(Order order);
+	
 }

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

@@ -615,6 +615,7 @@ public class TscOrderService {
 	 * @author jsh77b
 	 * @since 2021. 02. 02
 	 */	
+	@Transactional("shopTxnManager")
 	public void updateCustDeliveryAddr(Order order) {
 		
 		// 기본배송지로 설정되면 기존의 기본배송지 정보는 N 처리
@@ -633,6 +634,7 @@ public class TscOrderService {
 	 * @author jsh77b
 	 * @since 2021. 02. 02
 	 */	
+	@Transactional("shopTxnManager")
 	public void createCustDeliveryAddr(Order order) {
 		
 		// 기본배송지로 설정되면 기존의 기본배송지 정보는 N 처리
@@ -1874,6 +1876,8 @@ public class TscOrderService {
 				order.setOrdPhnno(orderInfo.getOrdPhnno());
 				order.setVaNo(orderInfo.getVaNo());
 				order.setCustNo(orderInfo.getCustNo());
+				order.setGiftPackCloseYn(orderInfo.getGiftPackCloseYn());
+				order.setGiftPackCloseDt(orderInfo.getGiftPackCloseDt());
 			}
 			index++;
 		}
@@ -1887,6 +1891,7 @@ public class TscOrderService {
 				order.setRecipBaseAddr(deliveryAddrInfo.getRecipBaseAddr());
 				order.setRecipDtlAddr(deliveryAddrInfo.getRecipDtlAddr());
 				order.setRecipPhnno(deliveryAddrInfo.getRecipPhnno());
+				order.setRecipZipcode(deliveryAddrInfo.getRecipZipcode());
 				order.setDelvMemo(deliveryAddrInfo.getDelvMemo());
 				order.setGiftMsg(deliveryAddrInfo.getGiftMsg());
 				order.setDelvAddrSq(deliveryAddrInfo.getDelvAddrSq());
@@ -1921,14 +1926,43 @@ public class TscOrderService {
 			index++;
 		}
 
+		String delvRegYn = "Y";
+		if (order.getRecipZipcode() == null || "".equals(order.getRecipZipcode())) {
+			delvRegYn = "N";
+		}
+
 		// 4. 화면전송변수설정
 		resultMap.set("orderInfo"			, order);				// 주문기본정보
 		resultMap.set("orderList"			, orderList);			// 주문목록정보
 		resultMap.set("orderListCnt"		, orderList.size());	// 주문목록갯수
 		resultMap.set("giftAddrInpYn"		, giftAddrInpYn);		// 선물받기배송지등록여부
+		resultMap.set("delvRegYn"			, delvRegYn);			// 배송지등록여부
 		
 		return resultMap;
 	}
+	
+	/**
+	 * 선물주문배송신청완료
+	 *
+	 * @param Order
+	 * @return Order
+	 * @author jsh77b
+	 * @since 2021. 04. 15
+	 */
+	@Transactional("shopTxnManager")
+	public int updateOrderDetailGiftAddrInpYn(Order order) {
+		
+		order.setCustNo(0);
+
+		// 선물주문배송신청완료
+		
+		int rtn = orderDao.updateOrderDetailGiftAddrInpYn(order);
+		
+		// 주문상세 이력 등록
+		rtn = orderDao.createOrderDetailAllHst(order);
+		
+		return rtn;
+	}
 
 
 	/**

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

@@ -643,4 +643,6 @@ public class Order extends TscBaseDomain {
 	private String orderGiftYn;			// 선물여부
 	private String giftMsg;				// 선물메세지
 	private String giftAddrInpYn;		// 선물배송지등록여부
+	private String giftPackCloseYn;		// 선물받기 배송기한 지남
+	private String giftPackCloseDt;		// 선물받기 배송기한 날짜
 }

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

@@ -455,6 +455,11 @@
 			 , FN_GET_CODE_NM('G016', P.PAY_STAT)         AS PAY_STAT_NM
 			 , P.PAY_AMT
 			 , P.VA_DEADLINE
+		     , CASE WHEN NOW() <![CDATA[<]]> DATE_ADD(O.PAY_DT, INTERVAL 3 DAY)
+		            THEN 'N'
+		            ELSE 'Y'
+		            END GIFT_PACK_CLOSE_YN
+		     , DATE_FORMAT(DATE_ADD(O.PAY_DT, INTERVAL 3 DAY), '%Y%m%d%H%i%S') AS GIFT_PACK_CLOSE_DT
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON O.ORD_NO = OD.ORD_NO
@@ -3594,6 +3599,7 @@
 	
 	<!-- 선물받기 주문상품 목록 조회 -->
 	<select id="getOrderGiftGoodsList" parameterType="Order" resultType="Order">
+		/* TscOrder.getOrderGiftGoodsList */
 		SELECT Z.ORD_NO
 		     , Z.ORD_DTL_NO
 		     , Z.BRAND_ENM
@@ -3653,6 +3659,16 @@
 		     , Z.GIFT_ADDR_INP_YN
 	</select>
 	
+	<!-- 선물주문배송신청완료 -->
+	<update id="updateOrderDetailGiftAddrInpYn" parameterType="Order">
+		/* TscOrder.updateOrderDetailGiftAddrInpYn */
+		UPDATE TB_ORDER_DETAIL
+		SET    GIFT_ADDR_INP_YN = 'Y'
+		     , UPD_NO = #{custNo}
+		     , UPD_DT = NOW()
+		WHERE  ORD_NO = #{ordNo}
+	</update>
+	
 </mapper>