Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -119,6 +119,16 @@ public interface TscScmDao {
 	 */
 	void createOrderDetailInvoice(Order param);
 	
+	/**
+	 * 입점클레임목록건수(교환,반품접수)ㄵ
+	 *
+	 * @param Order - 주문 정보
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 05. 17
+	 */
+	int getOrderSellerClaimCount(Order order);
+	
 	/**
 	 * 입점클레임목록조회(교환,반품접수)ㄵ
 	 *

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

@@ -93,7 +93,8 @@ public class TscDeliveryService {
 					OrderChange change = new OrderChange();
 					change.setOrdNo(param.getOrdNo());
 					change.setCustNo(param.getCustNo());
-					change.setOrderNm(param.getOrdNm());
+					change.setOrdNm(param.getOrdNm());
+					change.setOrdPhnno(param.getOrdPhnno());
 					change.setPgGb(param.getPgGb());
 					change.setPayMeans(param.getPayMeans());
 					change.setBankCd(param.getBankCd());

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

@@ -2534,6 +2534,17 @@ public class TscOrderService {
 		return result;
 	}
 	
+	/**
+	 * 입점클레임목록건수(교환,반품접수)
+	 * @param Order
+	 * @return Collection<Order>
+	 * @author jsh77b
+	 * @since 2021. 05. 17
+	 */
+	public int getOrderSellerClaimCount(Order order) {
+		return scmDao.getOrderSellerClaimCount(order);
+	}
+	
 	/**
 	 * 입점클레임목록조회(교환,반품접수)
 	 * @param Order

src/main/java/com/style24/core/biz/thirdparty/SsgKakaoSender.java

@@ -151,6 +151,7 @@ public class SsgKakaoSender {
 		dm.setFkkosubject(ansPhase.getAnsTitle());
 		dm.setFtemplatekey(ansPhase.getKakaoCd());
 		dm.setFmessage(ansPhase.getAnsContent());
+		dm.setFcallback(callbackTelNo);
 
 		// kkoresendtype(재발송유형)이 "SMS"일 때만 kkoresendmsg(재발송메시지)에 값 설정
 		// "LMS"일 때는 fmessage(메시지본문) 값으로 발송되며 kkoresendmsg(재발송메시지)에는 값을 넣으면 안 된다.
@@ -160,13 +161,8 @@ public class SsgKakaoSender {
 			}
 		}
 
-		dm.setFcallback(callbackTelNo);
-
 		// 버튼생성
 		if (StringUtils.isNotBlank(ansPhase.getButtonNm())) {
-			
-			ansPhase.setButtonUrl(GagaStringUtil.replace(this.mergeData(ansPhase.getButtonUrl(), replaceInfo), ">", ">"));
-			
 			Button button = new Button();
 			button.setName(ansPhase.getButtonNm());
 			button.setType("WL");
@@ -178,6 +174,11 @@ public class SsgKakaoSender {
 
 			Gson gson = new Gson();
 			dm.setFkkobutton("\"button\":" + gson.toJson(buttonList));
+
+			// LMS도 SMS처럼 kkoresendmsg(재발송메시지)에 값을 설정해 처리할 수 있게 변경되었음.
+			if (dm.getFkkoresendtype().equals("LMS")) {
+				dm.setFkkoresendmsg(ansPhase.getAnsContent() + "\n" + ansPhase.getButtonNm() + "\n" + ansPhase.getButtonUrl());
+			}
 		}
 
 		// 카카오 알림톡 발송
@@ -245,6 +246,7 @@ public class SsgKakaoSender {
 	public AnswerPhase getAnswerPhase(Integer ansSq, GagaMap replaceInfo) {
 		AnswerPhase ansPhase = ansPhaseDao.getAnswerPhase(ansSq);
 		ansPhase.setAnsContent(GagaStringUtil.replace(this.mergeData(ansPhase.getAnsContent(), replaceInfo), ">", ">"));
+		ansPhase.setButtonUrl(GagaStringUtil.replace(this.mergeData(ansPhase.getButtonUrl(), replaceInfo), ">", ">"));
 		return ansPhase;
 	}
 

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

@@ -368,49 +368,9 @@
 	</insert>
 	
 	<!-- 입점클레임목록조회(교환,반품접수) -->
-	<select id="getOrderSellerClaimList" parameterType="Order" resultType="Order">
-		/* tscScm.getOrderSellerClaimList */
-		SELECT OD.SUPPLY_COMP_CD
-		     , OCD.ORD_CHG_SQ
-		     , (SELECT X.SUPPLY_COMP_NM
-		        FROM   TB_SUPPLY_COMPANY X
-		        WHERE  X.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
-		     , G.BRAND_CD
-		     , (SELECT X.BRAND_KNM
-		        FROM   TB_BRAND X
-		        WHERE  X.BRAND_CD = G.BRAND_CD) AS BRAND_KNM
-		     , OD.ORD_NO
-		     , OCD.ORD_DTL_NO
-		     , OC.CHG_GB
-		     , FN_GET_CODE_NM('G680', OC.CHG_GB) AS CHG_GB_NM
-		     , OCD.CHG_STAT
-		     , FN_GET_CODE_NM('G685', OCD.CHG_STAT) AS CHG_STAT_NM
-		     , OC.REG_DT
-		     , OC.CHGER_NM
-		     , OC.CHGER_PHNNO 
-		     , OC.CHGER_ZIPCODE 
-		     , OC.CHGER_BASE_ADDR 
-		     , OC.CHGER_DTL_ADDR
-		     , G.SUPPLY_GOODS_CD 
-		     , OD.GOODS_CD
-		     , G.GOODS_NM
-		     , ODI.OPT_CD1 
-		     , ODI.OPT_CD2
-		     , OCD.CHG_QTY
-		     , OCD.CHG_ORD_DTL_NO AS EXCHANGE_ORD_DTL_NO
-		     , ODI2.OPT_CD1 AS OPT_CD11 
-		     , ODI2.OPT_CD2 AS OPT_CD12
-		     , OC.WD_INVOICE_NO 
-		     , OC.WD_INVOICE_SEND_YN 
-		     , OD.DELV_FEE_CD
-		     , CASE WHEN G.SELF_GOODS_YN = 'Y'
-		            THEN 'WMS'
-		            ELSE OD.DELV_FEE_CD
-		            END  DELV_FEE_CD_GRP
-		     , OC.WD_GB
-		     , OC.CHG_REASON
-		     , OC.CHG_MEMO
-		     , OCD.WH_MEMO
+	<select id="getOrderSellerClaimCount" parameterType="Order" resultType="int">
+		/* tscScm.getOrderSellerClaimCount */
+		SELECT COUNT(1)
 		FROM   TB_ORDER_CHANGE_DETAIL OCD
 		INNER  JOIN TB_ORDER_CHANGE OC
 		ON     OCD.ORD_CHG_SQ = OC.ORD_CHG_SQ
@@ -465,7 +425,120 @@
 			</if>
 		</if>
 		AND    OCD.CHG_STAT NOT IN ('G685_19', 'G685_49', 'G685_69')
-		ORDER  BY OC.REG_DT ASC
+		AND    OCD.CHG_QTY > 0
+	</select>
+	
+	<!-- 입점클레임목록조회(교환,반품접수) -->
+	<select id="getOrderSellerClaimList" parameterType="Order" resultType="Order">
+		/* tscScm.getOrderSellerClaimList */
+		SELECT X.*
+		FROM (
+			SELECT @rownum := @rownum + 1 AS RNUM
+			     , Z.*
+			FROM (
+				SELECT OD.SUPPLY_COMP_CD
+				     , OCD.ORD_CHG_SQ
+				     , (SELECT X.SUPPLY_COMP_NM
+				        FROM   TB_SUPPLY_COMPANY X
+				        WHERE  X.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
+				     , G.BRAND_CD
+				     , (SELECT X.BRAND_KNM
+				        FROM   TB_BRAND X
+				        WHERE  X.BRAND_CD = G.BRAND_CD) AS BRAND_KNM
+				     , OD.ORD_NO
+				     , OCD.ORD_DTL_NO
+				     , OC.CHG_GB
+				     , FN_GET_CODE_NM('G680', OC.CHG_GB) AS CHG_GB_NM
+				     , OCD.CHG_STAT
+				     , FN_GET_CODE_NM('G685', OCD.CHG_STAT) AS CHG_STAT_NM
+				     , OC.REG_DT
+				     , OC.CHGER_NM
+				     , OC.CHGER_PHNNO 
+				     , OC.CHGER_ZIPCODE 
+				     , OC.CHGER_BASE_ADDR 
+				     , OC.CHGER_DTL_ADDR
+				     , G.SUPPLY_GOODS_CD 
+				     , OD.GOODS_CD
+				     , G.GOODS_NM
+				     , ODI.OPT_CD1 
+				     , ODI.OPT_CD2
+				     , OCD.CHG_QTY
+				     , OCD.CHG_ORD_DTL_NO AS EXCHANGE_ORD_DTL_NO
+				     , ODI2.OPT_CD1 AS OPT_CD11 
+				     , ODI2.OPT_CD2 AS OPT_CD12
+				     , OC.WD_INVOICE_NO 
+				     , OC.WD_INVOICE_SEND_YN 
+				     , OD.DELV_FEE_CD
+				     , CASE WHEN G.SELF_GOODS_YN = 'Y'
+				            THEN 'WMS'
+				            ELSE OD.DELV_FEE_CD
+				            END  DELV_FEE_CD_GRP
+				     , OC.WD_GB
+				     , OC.CHG_REASON
+				     , OC.CHG_MEMO
+				     , OCD.WH_MEMO
+				FROM   TB_ORDER_CHANGE_DETAIL OCD
+				INNER  JOIN TB_ORDER_CHANGE OC
+				ON     OCD.ORD_CHG_SQ = OC.ORD_CHG_SQ
+				INNER  JOIN TB_ORDER_DETAIL OD
+				ON     OCD.ORD_DTL_NO = OD.ORD_DTL_NO
+				INNER  JOIN TB_ORDER O
+				ON     OD.ORD_NO = O.ORD_NO
+				INNER  JOIN TB_GOODS G
+				ON     OD.GOODS_CD = G.GOODS_CD
+				INNER  JOIN TB_ORDER_DETAIL_ITEM ODI
+				ON     OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+				LEFT   OUTER JOIN TB_ORDER_DETAIL OD2
+				ON     OCD.CHG_ORD_DTL_NO = OD2.ORD_DTL_NO
+				LEFT   OUTER JOIN TB_ORDER_DETAIL_ITEM ODI2
+				ON     OD2.ORD_DTL_NO = ODI2.ORD_DTL_NO
+				WHERE  1=1
+				AND    G.SELF_GOODS_YN = 'N'
+				<if test='supplyCompCd != null and supplyCompCd != ""'>
+				AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
+				</if>
+				<if test="multiBrand != null and multiBrand != ''">
+				AND    G.BRAND_CD IN
+					<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
+						#{item}
+					</foreach>
+				</if>
+				<if test='chgGb != null and chgGb != ""'>
+				AND    OC.CHG_GB = #{chgGb}
+				</if>
+				<if test="multiChgStat != null and multiChgStat != ''">
+				AND    OCD.CHG_STAT IN
+					<foreach collection="multiChgStat" item="item" index="index"  open="(" close=")" separator=",">
+						#{item}
+					</foreach>
+				</if>
+				<if test="ordNo != null and ordNo != ''">
+				AND    O.ORD_NO = #{ordNo}
+				</if>
+				<if test="chgerNm != null and chgerNm != ''">
+				AND    OC.CHGER_NM = #{chgerNm}
+				</if>
+				<if test='goodsCd != null and goodsCd != ""'>
+				AND    G.GOODS_CD = #{goodsCd}
+				</if>
+				<if test='ordChgSq != null and ordChgSq != ""'>
+				AND    OCD.ORD_CHG_SQ = #{ordChgSq}
+				</if>
+				<if test='stDate != null and stDate != ""'>
+					<if test='searchDateGb != null and searchDateGb == "ordDt"'>
+				AND    OC.REG_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+				AND    OC.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+					</if>
+				</if>
+				AND    OCD.CHG_STAT NOT IN ('G685_19', 'G685_49', 'G685_69')
+				AND    OCD.CHG_QTY > 0
+			) Z
+			JOIN (SELECT @rownum := 0) R
+			ORDER  BY Z.REG_DT ASC
+		) X
+		WHERE  1=1
+		AND    X.RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
+		ORDER  BY X.REG_DT ASC
 	</select>
 	
 	<!-- 입점상품 변경사유 체크 -->