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

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

@@ -701,9 +701,10 @@ public class TscKakaotalkService {
 		try {
 			// 고객접촉이력 정보
 			CustContactHst custContactHst = new CustContactHst();
-			custContactHst.setContactType(TscConstants.ContactType.ORDER_INFO.value()); 		// 접촉유형:임시비밀번호발급(공통코드G054)
+			custContactHst.setContactType(TscConstants.ContactType.GIFT.value()); 		// 접촉유형:임시비밀번호발급(공통코드G054)
 			custContactHst.setContactMethod(TscConstants.ContactMethod.KAKAOTALK.value()); 		// 접촉방법:알림톡+문자(공통코드G055)
-			custContactHst.setContactContents("주문안내");
+			custContactHst.setContactContents("선물하기");
+			custContactHst.setContactMemo(String.valueOf(order.getOrdNo()));
 			custContactHst.setReceiverNo(order.getCustNo());
 			custContactHst.setSenderNo(senderNo);
 			custContactHst.setRegNo(senderNo);

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

@@ -681,7 +681,7 @@ public class TscOrderChangeService {
 					vo.setOrdDtlStat(ordDtlStat);
 					
 					// 배송정책코드 별 주문상세 처리
-					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd())) {
+					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd()) && vo.getOrdCanChgQty() > 0) {
 						// 주문상세 별 전체취소여부 설정
 						int leftQty = vo.getOrdQty() - vo.getCnclRtnQty() - vo.getOrdCanChgQty();
 
@@ -945,6 +945,7 @@ public class TscOrderChangeService {
 
 				Payment pg = new Payment();
 				pg.setOrdNo(ordNo);
+				pg.setOrdChgSq(ordChgSq);
 				pg.setPayStat(TscConstants.PaymentStat.PAYMENT_CANCEL.value());
 				pg.setPayGb("O");
 				pg.setPgTid(pgTid);
@@ -1589,7 +1590,7 @@ public class TscOrderChangeService {
 				orderChange.setChgerBaseAddr(chgerBaseAddr);
 				orderChange.setChgerDtlAddr(chgerDtlAddr);
 				orderChange.setWdGb(wdGb);
-				orderChange.setWdTargetYn("D".equals(wdGb) ? "N" : "Y");
+				// orderChange.setWdTargetYn("D".equals(wdGb) ? "N" : "Y");
 				orderChange.setWdInvoiceNo(wdInvoiceNo);
 				orderChange.setAddPayCost(addDelvFee);
 				orderChange.setAddPayAmt(0);
@@ -1618,7 +1619,7 @@ public class TscOrderChangeService {
 				for (Order vo : cancelOrderDetailList) {
 					
 					// 배송정책코드 별 주문상세 처리
-					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd())) {
+					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd()) && vo.getOrdCanChgQty() > 0) {
 						// 3-2-2. 주문변경상세정보 및 이력 등록
 						OrderChange changeDetailPo = new OrderChange();
 						changeDetailPo.setOrdChgSq(ordChgSq);
@@ -1818,7 +1819,7 @@ public class TscOrderChangeService {
 				orderChange.setChgReason(excReq.getChgReason());
 				orderChange.setChgMemo(excReq.getChgMemo());
 				orderChange.setWdGb(wdGb);
-				orderChange.setWdTargetYn("D".equals(wdGb) ? "N" : "Y");
+				// orderChange.setWdTargetYn("D".equals(wdGb) ? "N" : "Y");
 				orderChange.setWdInvoiceNo(wdInvoiceNo);
 				orderChange.setChgerNm(excReq.getChgerNm());
 				orderChange.setChgerPhnno(excReq.getChgerPhnno());
@@ -2687,6 +2688,7 @@ public class TscOrderChangeService {
 		// 11. PG 연동
 		Payment pg = new Payment();
 		pg.setOrdNo(ordNo);
+		pg.setOrdChgSq(ordChgSq);
 		pg.setPayGb("O");
 		pg.setPgTid(payment.getPgTid());
 		pg.setPayAmt(refundAmt);
@@ -3232,7 +3234,7 @@ public class TscOrderChangeService {
 					vo.setOrdDtlStat(ordDtlStat);
 					
 					// 배송정책코드 별 주문상세 처리
-					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd())) {
+					if (obj.getDelvFeeCd().equals(vo.getDelvFeeCd()) && vo.getOrdCanChgQty() > 0) {
 						// 주문상세 별 전체취소여부 설정
 						int leftQty = vo.getOrdQty() - vo.getCnclRtnQty() - vo.getOrdCanChgQty();
 

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -69,24 +69,25 @@ public class TscConstants {
 		CERT_NO_SEND("G054_202"),				// 회원/마케팅 -휴대전화인증
 		TEMP_PASSWD("G054_203"), 				// 회원/마케팅 -고객비밀번호발송
 		ONE_TO_ONE_ANSWER("G054_204"),			// 회원/마케팅 -1:1문의답변
-		SECEDE_CUST("G054_205"),					// 회원/마케팅 -가입탈퇴안내
+		SECEDE_CUST("G054_205"),				// 회원/마케팅 -가입탈퇴안내
 		BASIC_LMS("G054_206"),					// 회원/마케팅 -기본LMS안내발송
 		DORMANT_EXPECTED("G054_207"),			// 회원/마케팅 -휴면계정전환예정
 		PRIVACY_POLICY("G054_208"),				// 회원/마케팅 -개인정보 이용내역
-		MARKETING_AGREE("G054_209"),				// 회원/마케팅 -마케팅 정보 수신동의 내역
-		BIRTH_COUPON_NOTICE("G054_210"),			// 회원/마케팅 -생일쿠폰다운로드안내
+		MARKETING_AGREE("G054_209"),			// 회원/마케팅 -마케팅 정보 수신동의 내역
+		BIRTH_COUPON_NOTICE("G054_210"),		// 회원/마케팅 -생일쿠폰다운로드안내
 		GRADE_NOTICE("G054_211"),				// 회원/마케팅 -이달의 등급 혜택 안내
 		DORMANT_EXPECT_COMBACK("G054_212"),		// 회원/마케팅 -휴면/미접속자 방어쿠폰
 		GIFTCARD_EXTNC_EXPECT("G054_213"),		// 회원/마케팅 - 상품권 소멸 예정 안내
-		COUPON_EXTNC_EXPECT("G054_214"),			// 회원/마케팅 - 쿠폰 소멸 예정안내
+		COUPON_EXTNC_EXPECT("G054_214"),		// 회원/마케팅 - 쿠폰 소멸 예정안내
 		POINT_EXTNC_EXPECT("G054_215"),			// 회원/마케팅 - 포인트 소멸 예정안내
 		ORDER_INFO("G054_301"),					// 주문-주문안내
 		BANK_DEPOSIT_INFO("G054_302"),			// 주문-무통장입금안내
 		SOLDOUT_EXPECTED_INFO("G054_303"),		// 주문-결품예정안내
 		SOLDOUT_INFO("G054_304"),				// 주문-결품안내
-		CANCEL_INFO("G054_305"),					// 주문-취소안내
+		CANCEL_INFO("G054_305"),				// 주문-취소안내
 		REPAYMENT_INFO("G054_306"),				// 주문-재결제안내
-		BUY_CONFIRM("G054_307"),					// 주문-구매확정
+		BUY_CONFIRM("G054_307"),				// 주문-구매확정
+		GIFT("G054_308"),						// 주문-선물하기
 		SHIPPING_INFO("G054_401"),				// 배송-주문상품배송안내
 		EXCHANGE_SHIPPING_INFO("G054_402"),		// 배송-교환상품배송안내
 		RETURN_RECEIPT("G054_501"),				// 반품-반품접수완료

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

@@ -19,6 +19,7 @@ public class CustContactHst extends TscBaseDomain {
 	private String contactType;		// 접촉유형(공통코드G054)
 	private String contactMethod;	// 접촉방법(공통코드G055)
 	private String contactContents;	// 접촉내용
+	private String contactMemo;		// 접촉메모
 	private Integer senderNo;		// 발송자NO(고객, 사용자)
 	private String senderNm;		// 발송자명
 	private String sendDt;			// 발송일시

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

@@ -99,6 +99,7 @@
 		      CONTACT_TYPE
 		    , CONTACT_METHOD
 		    , CONTACT_CONTENTS
+		    , CONTACT_MEMO
 		    , SENDER_NO
 		    , SEND_DT
 		    , RECEIVER_NO
@@ -109,6 +110,7 @@
 		      #{contactType}
 		    , #{contactMethod}
 		    , #{contactContents}
+		    , #{contactMemo}
 		    , IFNULL(#{senderNo}, 0)
 		    , NOW()
 		    , #{receiverNo}

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

@@ -347,6 +347,7 @@
 		     , 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
@@ -414,7 +415,7 @@
 		AND    O.ORD_NO = #{ordNo}
 		</if>
 		<if test="chgerNm != null and chgerNm != ''">
-		AND    OC.ORD_NM = #{chgerNm}
+		AND    OC.CHGER_NM = #{chgerNm}
 		</if>
 		<if test='goodsCd != null and goodsCd != ""'>
 		AND    G.GOODS_CD = #{goodsCd}
@@ -428,6 +429,7 @@
 		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')
 		ORDER  BY OC.REG_DT ASC
 	</select>