Merge branch 'develop' into card007

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

@@ -746,6 +746,15 @@ public interface TscOrderDao {
 	 * @since 2021. 03. 09
 	 */
 	Collection<Order> getOrderDetailOrdAmtList(Order order);
+	
+	/**
+	 * 44.1 주문상세 결제금액 목록 배송그룹 조회
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 03. 09
+	 */
+	Collection<Order> getOrderDetailDelvFeeCdGrp(Order order);
 
 	/**
 	 * 주문 상태 별 수량 조회

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

@@ -3002,7 +3002,11 @@ public class TscOrderChangeService {
 		DeliveryFee deliveryFee = new DeliveryFee();
 		deliveryFee.setOrdNo(ordNo);
 		deliveryFee.setDelvFeeCd(delvFeeCd);
-		deliveryFee.setOrdChgSq(ordChgSq);
+		
+		// 2021.06.23 주문완료에서 같이 사용하려고 추가 하였음
+		if (ordChgSq != null) {
+			deliveryFee.setOrdChgSq(ordChgSq);
+		}
 
 		Collection<DeliveryFee> deliveryFeeList = deliveryService.getDeliveryFee(deliveryFee);
 
@@ -3027,7 +3031,14 @@ public class TscOrderChangeService {
 		sb.append("													</tr>\n");
 		sb.append("													<tr>\n");
 		sb.append("														<th colspan=\"2\" style=\"text-align: left;font-size: 18px;color: #222222;\" align=\"left\">\n");
-		sb.append("															주문취소 상품정보\n");
+		
+		// 2021.06.23 주문완료에서 같이 사용하려고 추가 하였음
+		if (ordChgSq != null) {
+			sb.append("															주문취소 상품정보\n");
+		} else {
+			sb.append("															상품정보\n");
+		}
+		
 		sb.append("														</th>\n");
 		sb.append("													</tr>\n");
 

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

@@ -22,6 +22,7 @@ import com.style24.core.biz.dao.TscScmDao;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.support.util.CryptoUtils;
+import com.style24.persistence.domain.DeliveryFee;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.Payment;
@@ -1902,7 +1903,9 @@ public class TscOrderService {
 		}
 		
 		// 3. 상품정보조회
-		Collection<Order> orderDetailList = orderDao.getOrderDetailOrdAmtList(order);
+		Collection<Order> orderDetailList 			= orderDao.getOrderDetailOrdAmtList(order);
+		Collection<Order> orderDetailDelvFeeCdGrp 	= orderDao.getOrderDetailDelvFeeCdGrp(order);
+		
 		int listSumAmt 			= 0; // 상품금액합계(정상가)
 		int goodsSumAmt 		= 0; // 상품금액합계(판매가)
 		int goodsDcSumAmt		= 0; // 상품할인금액(정상가 - 판매가)
@@ -2048,140 +2051,41 @@ public class TscOrderService {
 		resultMap.set("delvMemo"			, order.getDelvMemo());			// 받는사람배송메모
 		resultMap.set("pgGbNm"				, payType);						// 결제방법
 		
-		// 주문목록
-		StringBuffer orderListInfo = new StringBuffer();
-		orderListInfo.append("<table style=\"width:100%;margin:0;padding:0;font-size: 14px;\" cellspacing=\"0\" cellpadding=\"0\">");
-		orderListInfo.append("	<tbody>");
-		orderListInfo.append("		<tr>");
-		orderListInfo.append("			<td height=\"50px;\" style=\"height: 50px;\"></td>");
-		orderListInfo.append("		</tr>");
-		orderListInfo.append("		<tr>");
-		orderListInfo.append("			<th colspan=\"2\" style=\"text-align: left;font-size: 18px;color: #222222;\" align=\"left\">주문 상품 정보</th>");
-		orderListInfo.append("		</tr>");
-		orderListInfo.append("		<tr>");
-		orderListInfo.append("			<td height=\"30px;\" style=\"height: 30px;\"></td>");
-		orderListInfo.append("		</tr>");
-		orderListInfo.append("		<tr>");
-		orderListInfo.append("			<td>");
-		
-		// 배송단위 START
-		orderListInfo.append("				<table style=\"border: 1px; border-color: #dddddd; border-style: solid; box-sizing: border-box; width:100%;margin:0;padding:0\" cellspacing=\"0\" cellpadding=\"0\">");
-		orderListInfo.append("					<tbody>");
-		orderListInfo.append("						<tr>");
-		orderListInfo.append("							<td colspan=\"5\" height=\"20px;\" style=\"height: 20px;\"></td>");
-		orderListInfo.append("						</tr>");
-		orderListInfo.append("						<tr>");
-		orderListInfo.append("							<td width=\"40px;\"></td>");
-		orderListInfo.append("							<td colspan=\"3\" style=\"text-align: left;font-size: 18px;font-family:\"Apple SD Gothic Neo\",\"나눔고딕\",NanumGothic,\"맑은고딕\",Malgun Gothic, Helvetica, sans-serif;font-weight:600;color: #222222;\" align=\"left\">").append("STYLE24 총알배송").append("</td>");
-		orderListInfo.append("							<td width=\"40px;\"></td>");
-		orderListInfo.append("						</tr>");
-		orderListInfo.append("						<tr>");
-		orderListInfo.append("							<td colspan=\"5\" height=\"20px;\" style=\"height: 20px;border:0; border-bottom: 1px; border-color: #dddddd; border-style: solid; box-sizing: border-box;\"></td>");
-		orderListInfo.append("						</tr>");
-		orderListInfo.append("						<tr>");
-		orderListInfo.append("							<td colspan=\"5\" style=\"text-align: left;font-size: 18px;font-family:\"Apple SD Gothic Neo\",\"나눔고딕\",NanumGothic,\"맑은고딕\",Malgun Gothic, Helvetica, sans-serif;color: #222222;\">");
-		
-		// 상품단위 START
-		orderListInfo.append("								<table style=\"width:100%;height:100%;margin:0;padding:0;font-size: 14px;\" cellspacing=\"0\" cellpadding=\"0\">");
-		orderListInfo.append("									<tbody>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"30px;\" style=\"height: 30px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td width=\"40px;\" rowspan=\"10\"></td>");
-		orderListInfo.append("											<td width=\"100px;\" height=\"150px;\" rowspan=\"10\" valign=\"top\" style=\"margin:0;padding:0\">");
-		orderListInfo.append("												<a href=\"#none\" target=\"_blank\" style=\"margin:0;padding:0\">");
-		orderListInfo.append("													<span style=\"background: #f5f5f5;width: 100px;height: 150px;margin:0;padding:0\">");
-		orderListInfo.append("														<img src=\"").append("이미지경로").append("\" alt=\"이미지\" style=\"width: 100px;height: 150px;margin:0;padding:0\">");
-		orderListInfo.append("													</span>");
-		orderListInfo.append("												</a>");
-		orderListInfo.append("											</td>");
-		orderListInfo.append("											<td width=\"30px;\" rowspan=\"10\"></td>");
-		orderListInfo.append("											<td width=\"370px;\" height=\"10px;\"></td>");
-		orderListInfo.append("											<td width=\"40px;\" rowspan=\"10\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td style=\"font-family:\"Apple SD Gothic Neo\",verdana,Arial,\"나눔고딕\",NanumGothic,\"맑은고딕\",Malgun Gothic, Helvetica, sans-serif;\">").append("브랜드명");
-		orderListInfo.append("											</td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"10px;\" style=\"height: 10px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td style=\"color: #222222;font-size: 16px;font-weight: bold;letter-spacing: -0.05em;\">");
-		orderListInfo.append("												<a href=\"").append("링크").append("\" target=\"_blank\" style=\"display: block; color: #222222; font-size: 16px; font-weight: bold; letter-spacing: -0.025em; text-decoration: none;\">");
-		orderListInfo.append("상품명");
-		orderListInfo.append("												</a>");
-		orderListInfo.append("											</td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"10px;\" style=\"height: 10px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td>");
-		orderListInfo.append("												<p style=\"margin: 0; padding: 0; font-family:\"Apple SD Gothic Neo\",\"나눔고딕\",NanumGothic,\"맑은고딕\",Malgun Gothic, Helvetica, sans-serif;font-weight:200;color: #666666; line-height: 2;\">옵션 1</p>");
-		orderListInfo.append("												<p style=\"margin: 0; padding: 0; font-family:\"Apple SD Gothic Neo\",\"나눔고딕\",NanumGothic,\"맑은고딕\",Malgun Gothic, Helvetica, sans-serif;font-weight:200;color: #666666; line-height: 2;\">옵션 1</p>");
-		orderListInfo.append("												<p style=\"margin: 0; padding: 0; font-family:\"Apple SD Gothic Neo\",\"나눔고딕\",NanumGothic,\"맑은고딕\",Malgun Gothic, Helvetica, sans-serif;font-weight:200;color: #666666; line-height: 2;\">옵션 1</p>");
-		orderListInfo.append("											</td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"5px;\" style=\"height: 5px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"10px;\" style=\"height: 10px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td>");
-		orderListInfo.append("												<span>").append("1").append("개</span>");
-		orderListInfo.append("												<span style=\"width: 12px;padding-left:12px;\"></span>");
-		orderListInfo.append("												<span style=\"display: inline-block; vertical-align: middle; width: 1px; height: 14px; background: #ddd;\"></span>");
-		orderListInfo.append("												<span style=\"width: 12px;padding-right:12px;\"></span>");
-		orderListInfo.append("												<span style=\"text-decoration: line-through;color: #888888;\"><span>").append("19,990").append("</span>원</span>");
-		orderListInfo.append("												<span style=\"font-weight: 500;\"><span>").append("19,990").append("</span>원</span>");
-		orderListInfo.append("											</td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"10px;\" style=\"height: 10px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("										<tr>");
-		orderListInfo.append("											<td height=\"20px;\" style=\"height: 20px;\"></td>");
-		orderListInfo.append("										</tr>");
-		orderListInfo.append("									</tbody>");
-		orderListInfo.append("								</table>");
-		// 상품 END
-		
-		
-		orderListInfo.append("							</td>");
-		orderListInfo.append("						</tr>");
-		orderListInfo.append("						<tr>");
-		orderListInfo.append("							<td height=\"30px;\" style=\"height: 30px;\"></td>");
-		orderListInfo.append("						</tr>");
-		orderListInfo.append("						<tr>");
-		orderListInfo.append("							<td width=\"30px;\"></td>");
-		orderListInfo.append("							<td colspan=\"3\" height=\"1\" style=\"border: 1px; border-top-color: #ddd; border-top-style: dashed;\"></td>");
-		orderListInfo.append("							<td width=\"30px;\"></td>");
-		orderListInfo.append("						</tr>");
-		orderListInfo.append("					</tbody>");
-		orderListInfo.append("				</table>");
-		// 배송단위 END
-		
-		
-		
-		orderListInfo.append("			</td>");
-		orderListInfo.append("		</tr>");
-		orderListInfo.append("    </tbody>");
-		orderListInfo.append("</table>");
-		
-		log.info("orderListInfo ::: {} ", orderListInfo.toString());
-
+		// 취소 상세 정보 조회
+		Collection<OrderChange> cancelList = new ArrayList();
 		for (Order orderDetail : orderDetailList) {
-			
+			OrderChange orderChange = new OrderChange();
+			orderChange.setGoodsCd(orderDetail.getGoodsCd());
+			orderChange.setGoodsNm(orderDetail.getGoodsNm());
+			orderChange.setBrandNm(orderDetail.getBrandGroupNm());
+			orderChange.setShotDelvYn(orderDetail.getShotDelvYn());
+			orderChange.setSelfGoodsYn(orderDetail.getSelfGoodsYn());
+			orderChange.setItemNm(orderDetail.getItemNm());
+			orderChange.setColorNm(orderDetail.getColorNm());
+			orderChange.setOptCd1(orderDetail.getOptCd1());
+			orderChange.setOptCd2(orderDetail.getOptCd2());
+			orderChange.setGoodsType(orderDetail.getGoodsType());
+			orderChange.setSysImgNm(orderDetail.getSysFileNm());
+			orderChange.setSupplyCompNm(orderDetail.getSupplyCompNm());
+			orderChange.setDelvFeeCd(orderDetail.getCartDelvFeeCd());
+			orderChange.setOrdNo(order.getOrdNo());
+
+			cancelList.add(orderChange);
 		}
-		resultMap.set("orderListInfo"		, orderListInfo);				// 주문목록
+
+		// 상픔 정보 조회
+		String cancelInfo = orderChangeService.getMailOrderCancelInfo(cancelList);
+		resultMap.set("orderListInfo"		, cancelInfo);				// 주문목록
+		
+		log.info("cancelInfo ::: {}", cancelInfo);
 		
 		// 사은품목록
-		StringBuffer orderFreegiftInfo = new StringBuffer();
-		resultMap.set("orderFreegiftInfo"	, orderFreegiftInfo);			// 사은품목록
+		OrderChange oc = new OrderChange();
+		oc.setOrdNo(order.getOrdNo());
+		String freeGiftInfo = orderChangeService.getMailFreeGiftCancelInfo(oc);
+		resultMap.set("orderFreegiftInfo"	, freeGiftInfo);			// 사은품목록
+		
+		log.info("freeGiftInfo ::: {}", freeGiftInfo);
 
 		return resultMap;
 	}

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

@@ -3872,8 +3872,12 @@
 		     , A.GOODS_NM
 		     , A.BRAND_GROUP_NM
 		     , A.GOODS_TYPE
+		     , A.SYS_IMG_NM
 		     , A.DELV_FEE_CD_GRP
 		     , A.DELV_FEE_CD_GRP_SORT
+		     , A.SUPPLY_COMP_CD
+		     , A.DELV_FEE_CD
+		     , A.SELF_GOODS_YN
 		     , SUM(A.OPT_ADD_PRICE) AS OPT_ADD_PRICE
 		     , GROUP_CONCAT(A.ITEM_NM ORDER BY A.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		     , GROUP_CONCAT(A.ITEM_CD ORDER BY A.ORD_DTL_ITEM_SQ) AS ITEM_CD
@@ -3931,6 +3935,9 @@
 		         , OD.SAVE_PNT_AMT 
 		         , OD.DELV_ADDR_SQ
 		         , OD.GIFT_PACK_YN
+		         , OD.SUPPLY_COMP_CD
+		         , OD.DELV_FEE_CD
+		         , G1.SELF_GOODS_YN
 		    FROM   TB_ORDER_DETAIL OD
 		    INNER  JOIN TB_GOODS G1 
 		    ON     OD.GOODS_CD = G1.GOODS_CD
@@ -3963,7 +3970,41 @@
 		     , A.GOODS_TYPE
 		     , A.DELV_FEE_CD_GRP
 		     , A.DELV_FEE_CD_GRP_SORT
+		     , A.SUPPLY_COMP_CD
+		     , A.SYS_IMG_NM
+		     , A.DELV_FEE_CD
+		     , A.SELF_GOODS_YN
+		ORDER  BY DELV_FEE_CD_GRP_SORT ASC
+		     , A.SUPPLY_COMP_CD ASC
+	</select>
+	
+	<!-- 44. 주문상세 결제금액 목록 조회 -->
+	<select id="getOrderDetailDelvFeeCdGrp"  parameterType="Order" resultType="Order">
+		/* TscOrder.getOrderDetailDelvFeeCdGrp */
+		SELECT A.DELV_FEE_CD_GRP
+		FROM (
+		    SELECT CASE WHEN OD.SHOT_DELV_YN IN ('Y') AND G1.SELF_GOODS_YN IN ('Y') THEN 'SHOT'
+		                WHEN OD.SHOT_DELV_YN IN ('N') AND G1.SELF_GOODS_YN IN ('Y') THEN 'WMS'
+		                ELSE SC.SUPPLY_COMP_NM
+		                END  DELV_FEE_CD_GRP
+		         , CASE WHEN OD.SHOT_DELV_YN IN ('Y') AND G1.SELF_GOODS_YN IN ('Y') THEN 1
+		                WHEN OD.SHOT_DELV_YN IN ('N') AND G1.SELF_GOODS_YN IN ('Y') THEN 2
+		                ELSE 3
+		                END  DELV_FEE_CD_GRP_SORT
+		         , OD.SUPPLY_COMP_CD
+		    FROM   TB_ORDER_DETAIL OD
+		    INNER  JOIN TB_GOODS G1 
+		    ON     OD.GOODS_CD = G1.GOODS_CD
+		    INNER  JOIN TB_SUPPLY_COMPANY SC
+		    ON     OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		    WHERE  1=1
+		    AND    OD.ORD_NO = #{ordNo}
+		) A
+		GROUP  BY A.DELV_FEE_CD_GRP
+		     , A.DELV_FEE_CD_GRP_SORT
+		     , A.SUPPLY_COMP_CD
 		ORDER  BY DELV_FEE_CD_GRP_SORT ASC
+		     , A.SUPPLY_COMP_CD ASC
 	</select>
 
 	<!-- 마이페이지 주문 상태 별 수량 조회 -->