주문완료 메일보내기 개발 작업중

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

@@ -1,6 +1,7 @@
 package com.style24.core.biz.service;
 
 import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -2958,7 +2959,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);
 
@@ -3239,9 +3244,21 @@ public class TscOrderChangeService {
 			sb.append("																							<span>");
 			sb.append(orderChange.getChgQty());
 			sb.append("개</span>\n");
-			// sb.append("																							<span style=\"width: 12px;padding-left:12px;\"></span>\n");
-			// sb.append("																							<span style=\"display: inline-block; vertical-align: middle; width: 1px; height: 14px; background: #ddd;\"></span>\n");
-			// sb.append("																							<span style=\"width: 12px;padding-right:12px;\"></span>\n");
+			
+			// 2021.06.24 주문완료메일에서 사용하기위해서 적용
+			if (orderChange.getListPrice() > 0) {
+				sb.append("																							<span style=\"width: 12px;padding-left:12px;\"></span>\n");
+				sb.append("																							<span style=\"display: inline-block; vertical-align: middle; width: 1px; height: 14px; background: #ddd;\"></span>\n");
+				sb.append("																							<span style=\"width: 12px;padding-right:12px;\"></span>\n");
+				
+				sb.append("<span style=\"text-decoration: line-through;color: #888888;\"><span>");
+				sb.append(NumberFormat.getInstance().format(orderChange.getListPrice()));
+				sb.append("</span>원</span>");
+				sb.append("&nbsp;&nbsp;<span style=\"font-weight: 500;\"><span>");
+				sb.append(NumberFormat.getInstance().format(orderChange.getOrdAmt()));
+				sb.append("</span>원</span>");
+			}
+			
 			sb.append("																						</td>\n");
 			sb.append("																					</tr>\n");
 			sb.append("																					<tr>\n");

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

@@ -1881,6 +1881,7 @@ public class TscOrderService {
 				
 				order.setGiftPackCloseYn(orderInfo.getGiftPackCloseYn());
 				order.setGiftPackCloseDt(orderInfo.getGiftPackCloseDt());
+				order.setOrdDt(orderInfo.getOrdDt());
 			}
 			index++;
 		}
@@ -1891,6 +1892,7 @@ public class TscOrderService {
 		for (Order deliveryAddrInfo : deliveryAddrInfoList) {
 			if (index == 0) {
 				order.setRecipNm(deliveryAddrInfo.getRecipNm());
+				order.setRecipZipcode(deliveryAddrInfo.getRecipZipcode());
 				order.setRecipBaseAddr(deliveryAddrInfo.getRecipBaseAddr());
 				order.setRecipDtlAddr(deliveryAddrInfo.getRecipDtlAddr());
 				order.setRecipPhnno(deliveryAddrInfo.getRecipPhnno());
@@ -1904,7 +1906,7 @@ public class TscOrderService {
 		
 		// 3. 상품정보조회
 		Collection<Order> orderDetailList 			= orderDao.getOrderDetailOrdAmtList(order);
-		Collection<Order> orderDetailDelvFeeCdGrp 	= orderDao.getOrderDetailDelvFeeCdGrp(order);
+		//Collection<Order> orderDetailDelvFeeCdGrp 	= orderDao.getOrderDetailDelvFeeCdGrp(order);
 		
 		int listSumAmt 			= 0; // 상품금액합계(정상가)
 		int goodsSumAmt 		= 0; // 상품금액합계(판매가)
@@ -2067,8 +2069,13 @@ public class TscOrderService {
 			orderChange.setGoodsType(orderDetail.getGoodsType());
 			orderChange.setSysImgNm(orderDetail.getSysFileNm());
 			orderChange.setSupplyCompNm(orderDetail.getSupplyCompNm());
-			orderChange.setDelvFeeCd(orderDetail.getCartDelvFeeCd());
+			orderChange.setDelvFeeCd(orderDetail.getDelvFeeCd());
 			orderChange.setOrdNo(order.getOrdNo());
+			orderChange.setChgQty(orderDetail.getOrdQty());
+			
+			orderChange.setListPrice((orderDetail.getListPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty());
+			int ordAmt = ((orderDetail.getCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getOrdQty()) - orderDetail.getCpn1DcAmt() - (orderDetail.getTmtb1DcAmt() + orderDetail.getTmtb2DcAmt());
+			orderChange.setOrdAmt(ordAmt);
 
 			cancelList.add(orderChange);
 		}

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

@@ -3876,6 +3876,7 @@
 		     , A.DELV_FEE_CD_GRP
 		     , A.DELV_FEE_CD_GRP_SORT
 		     , A.SUPPLY_COMP_CD
+		     , A.SUPPLY_COMP_NM
 		     , A.DELV_FEE_CD
 		     , A.SELF_GOODS_YN
 		     , SUM(A.OPT_ADD_PRICE) AS OPT_ADD_PRICE
@@ -3936,6 +3937,9 @@
 		         , OD.DELV_ADDR_SQ
 		         , OD.GIFT_PACK_YN
 		         , OD.SUPPLY_COMP_CD
+		         , (SELECT SUPPLY_COMP_NM
+		            FROM   TB_SUPPLY_COMPANY SC
+		            WHERE  SC.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
 		         , OD.DELV_FEE_CD
 		         , G1.SELF_GOODS_YN
 		    FROM   TB_ORDER_DETAIL OD
@@ -3971,6 +3975,7 @@
 		     , A.DELV_FEE_CD_GRP
 		     , A.DELV_FEE_CD_GRP_SORT
 		     , A.SUPPLY_COMP_CD
+		     , A.SUPPLY_COMP_NM
 		     , A.SYS_IMG_NM
 		     , A.DELV_FEE_CD
 		     , A.SELF_GOODS_YN