Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.core into develop

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

@@ -875,4 +875,13 @@ public interface TscOrderDao {
 	 * @since 2021. 05. 26
 	 */
 	Order getCustPaymeans(Order order);
+	
+	/**
+	 * 추가결제시 업체명 목록 조회
+	 * @param Order
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 05. 27
+	 */
+	Collection<Order> getDelvFeeCdSupplyCompNmList(Order order);
 }

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

@@ -1860,6 +1860,7 @@ public class TscOrderService {
 				order.setVaNo(orderInfo.getVaNo());
 				order.setCustNo(orderInfo.getCustNo());
 				order.setPgGb(orderInfo.getPgGb());
+				order.setCustId(orderInfo.getCustId());
 			}
 			index++;
 		}
@@ -2000,6 +2001,7 @@ public class TscOrderService {
 		resultMap.set("mileageDcAmt"		, mileageDcAmt);		// 마일리지사용합계
 		resultMap.set("allianceDcAmt"		, allianceDcAmt);		// 제휴할인합계
 		resultMap.set("delvAddrSq"          , delvAddrSq);			// 배송지번호
+		resultMap.set("orderDetailList"     , orderDetailList);		// 주문목록
 		
 		return resultMap;
 	}
@@ -2191,6 +2193,9 @@ public class TscOrderService {
 			index++;
 		}
 		
+		// 추가결제시 업체명 목록 조회
+		Collection<Order> delvFeeCdList =  orderDao.getDelvFeeCdSupplyCompNmList(order);
+		
 		resultMap.set("orderAddPayGoodsList"	, orderAddPayGoodsList);	// 주문목록정보
 		resultMap.set("ordNo"					, ordNo);					// 주문번호
 		resultMap.set("refundAmt"				, refundAmt);				// 상품환불금액
@@ -2202,6 +2207,8 @@ public class TscOrderService {
 		resultMap.set("chgerPhnno"				, chgerPhnno);				// 변경신청핸드폰번호
 		resultMap.set("goodsNm"					, goodsNm);					// 상품명
 		resultMap.set("ordNm"					, ordNm);					// 주문자
+		resultMap.set("delvCnt"					, delvFeeCdList.size());	// 업체명카운트
+		resultMap.set("delvFeeCdList"			, delvFeeCdList);			// 추가결제시 업체명 목록 조회
 		
 		return resultMap;
 	}

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

@@ -558,6 +558,10 @@
 		            END GIFT_PACK_CLOSE_YN
 		     , DATE_ADD(O.PAY_DT, INTERVAL 3 DAY) AS GIFT_PACK_CLOSE_DT
 		     , P.PG_GB
+		     , CASE WHEN C.CUST_ID IS NULL
+		            THEN 'GUEST'
+		            ELSE C.CUST_ID
+		            END  CUST_ID
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON O.ORD_NO = OD.ORD_NO
@@ -3709,7 +3713,8 @@
 	<!-- 44. 주문상세 결제금액 목록 조회 -->
 	<select id="getOrderDetailOrdAmtList"  parameterType="Order" resultType="Order">
 		/* TscOrder.getOrderDetailOrdAmtList */
-		SELECT OD.ORD_DTL_NO
+		SELECT OD.GOODS_CD
+		     , OD.ORD_DTL_NO
 		     , OD.LIST_PRICE
 		     , OD.CURR_PRICE
 		     , SUM(ODI.OPT_ADD_PRICE) AS OPT_ADD_PRICE
@@ -3731,7 +3736,8 @@
 		AND    OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 		WHERE  1=1
 		AND    OD.ORD_NO = #{ordNo}
-		GROUP  BY OD.ORD_DTL_NO 
+		GROUP  BY OD.GOODS_CD 
+		     , OD.ORD_DTL_NO 
 		     , OD.CURR_PRICE
 		     , OD.ORD_QTY
 		     , OD.CPN1_DC_AMT 
@@ -4201,6 +4207,25 @@
 		ORDER  BY REG_DT DESC
 		LIMIT  1
 	</select>
+	
+	<!-- 추가결제시 업체명 목록 조회 -->
+	<select id="getDelvFeeCdSupplyCompNmList" parameterType="Order" resultType="Order">
+		/* TscOrder.getDelvFeeCdSupplyCompNmList : 추가결제시 업체명 목록 조회 */
+		SELECT OD.DELV_FEE_CD
+		     , SC.SUPPLY_COMP_NM 
+		FROM   TB_ORDER_DETAIL OD
+		INNER  JOIN TB_ORDER_CHANGE_DETAIL OCD
+		ON     OD.ORD_DTL_NO = OCD.ORD_DTL_NO
+		INNER  JOIN TB_SUPPLY_COMPANY SC
+		ON     OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD 
+		INNER  JOIN TB_GOODS G
+		ON     OD.GOODS_CD = G.GOODS_CD
+		WHERE  1=1
+		AND    OCD.ORD_CHG_SQ = #{ordChgSq}
+		AND    G.SELF_GOODS_YN = 'N'
+		GROUP  BY OD.DELV_FEE_CD
+		     , SC.SUPPLY_COMP_NM 
+	</select>
 </mapper>