Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-497(입점클레임반품배송비)

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

@@ -13,6 +13,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gagaframework.excel.env.GagaExcelConstants;
+import com.gagaframework.excel.xssf.GagaExcelResultHandler;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.dao.TscNaverPayDao;
 import com.style24.core.biz.dao.TscOrderChangeDao;
 import com.style24.core.biz.dao.TscOrderDao;
@@ -31,11 +35,6 @@ import com.usafe.guarantee.InsuranceManager;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.excel.env.GagaExcelConstants;
-import com.gagaframework.excel.xssf.GagaExcelResultHandler;
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-
 /**
  * 주문관리 Service
  *
@@ -1823,6 +1822,7 @@ public class TscOrderService {
 						// 사은품사용포인트
 						else {
 							custPointInfo.setOccurGb(TscConstants.PointOccurGb.FREEGIFT_USE_POINT.value());
+							custPointInfo.setOrdFreegiftValSq(orderDetail.getOrdFreegiftValSq());
 							custPointInfo.setOccurDtlDesc("사은품포인트사용");
 						}
 						

src/main/java/com/style24/core/support/text/TscHtmlCharacterEscapes.java

@@ -25,23 +25,27 @@ public class TscHtmlCharacterEscapes extends CharacterEscapes {
 		asciiEscapes = CharacterEscapes.standardAsciiEscapesForJSON();
 		asciiEscapes['<'] = CharacterEscapes.ESCAPE_CUSTOM;
 		asciiEscapes['>'] = CharacterEscapes.ESCAPE_CUSTOM;
-		asciiEscapes['&'] = CharacterEscapes.ESCAPE_CUSTOM;
-		asciiEscapes['\"'] = CharacterEscapes.ESCAPE_CUSTOM;
+//		asciiEscapes['&'] = CharacterEscapes.ESCAPE_CUSTOM;
+//		asciiEscapes['\"'] = CharacterEscapes.ESCAPE_CUSTOM;
 //		asciiEscapes['('] = CharacterEscapes.ESCAPE_CUSTOM;
 //		asciiEscapes[')'] = CharacterEscapes.ESCAPE_CUSTOM;
 //		asciiEscapes['#'] = CharacterEscapes.ESCAPE_CUSTOM;
-		asciiEscapes['\''] = CharacterEscapes.ESCAPE_CUSTOM;
+//		asciiEscapes['\''] = CharacterEscapes.ESCAPE_CUSTOM;
 
 		Map<CharSequence, CharSequence> lookupMap = new HashMap<>();
-		lookupMap.put("(", "&#40");
-		lookupMap.put(")", "&#41");
-		lookupMap.put("#", "&#35");
-		lookupMap.put("\\", "&#39");
+//		lookupMap.put("(", "&#40");
+//		lookupMap.put(")", "&#41");
+//		lookupMap.put("#", "&#35");
+//		lookupMap.put("\\", "&#39");
+//		lookupMap.put("\"", "&quot;");
+//		lookupMap.put("&", "&amp;");
+		lookupMap.put("<", "&lt;");
+		lookupMap.put(">", "&gt;");
 		Map<CharSequence, CharSequence> CUSTOM_ESCAPE = Collections.unmodifiableMap(lookupMap);
 
 		// XSS 방지 처리 특수문자 인코딩 값 지정
 		this.translator = new AggregateTranslator(
-			new LookupTranslator(EntityArrays.BASIC_ESCAPE), // <, >, &, "는 여기에 포함
+//			new LookupTranslator(EntityArrays.BASIC_ESCAPE), // <, >, &, "는 여기에 포함
 			new LookupTranslator(EntityArrays.ISO8859_1_ESCAPE),
 			new LookupTranslator(EntityArrays.HTML40_EXTENDED_ESCAPE),
 			new LookupTranslator(CUSTOM_ESCAPE));

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

@@ -1,6 +1,5 @@
 package com.style24.persistence.domain;
 
-import java.time.Clock;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -198,4 +197,6 @@ public class Coupon extends TscBaseDomain {
     private String supplyCompNm;
     private String supplyCompCd;
     private String brandGroupNm;
+    
+    private String regId;
 }

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

@@ -306,6 +306,7 @@ public class Order extends TscBaseDomain {
 
 	// 사은품칼럼
 	private Integer ordFreegiftSq;
+	private Integer ordFreegiftValSq;
 	private Integer freegiftSq;
 	private String freegiftNm;
 	private Integer freegiftValSq;

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

@@ -950,32 +950,37 @@
                  )
     </insert>
 
-    <!-- 쿠폰발급받은회원 조회-->
-    <select id="getCpnPubCustList" parameterType="Integer" resultType="Coupon">
-        /* TscCoupon.getCpnPubCustList */
-        SELECT	A.CUST_NO
-             ,B.CUST_NM
-             ,B.CUST_GB
-             ,FN_GET_CODE_NM('G100',B.CUST_GB) AS CUST_GB_NM
-             ,B.CUST_GRADE
-             ,FN_GET_CODE_NM('G110',B.CUST_GRADE) AS CUST_GRADE_NM
-             ,A.AVAIL_STDT
-             ,A.AVAIL_EDDT
-             ,CASE WHEN A.USED_DT IS NOT NULL THEN 'Y'
-                   ELSE 'N' END USE_YN
-             ,A.USED_DT
-             ,A.PUB_REASON
-             ,FN_GET_CODE_NM('G068',A.PUB_REASON) AS PUB_REASON_NM
-             ,A.PUB_REASON_DTL
-             ,A.REG_NO
-             ,CASE WHEN FN_GET_USER_NM(A.REG_NO) = '본인' THEN '본인발급' ELSE FN_GET_USER_NM(A.REG_NO) END AS REG_NM
-             ,A.REG_DT
-        FROM 	TB_CUST_COUPON A
-                    LEFT OUTER JOIN TB_CUSTOMER B
-                                    ON		A.CUST_NO = B.CUST_NO
-        WHERE 1=1
-          AND A.CPN_ID = #{cpnId}
-    </select>
+	<!-- 쿠폰발급받은회원 조회-->
+	<select id="getCpnPubCustList" parameterType="Integer" resultType="Coupon">
+		/* TscCoupon.getCpnPubCustList */
+		SELECT A.CUST_NO
+		     , FN_DEC_AES(B.CUST_NM)               AS CUST_NM
+		     , B.CUST_GB
+		     , FN_GET_CODE_NM('G100',B.CUST_GB)    AS CUST_GB_NM
+		     , B.CUST_GRADE
+		     , FN_GET_CODE_NM('G110',B.CUST_GRADE) AS CUST_GRADE_NM
+		     , A.AVAIL_STDT
+		     , A.AVAIL_EDDT
+		     , CASE WHEN A.USED_DT IS NOT NULL THEN 'Y'
+		            ELSE 'N' END USE_YN
+		     , A.USED_DT
+		     , A.PUB_REASON
+		     , FN_GET_CODE_NM('G068',A.PUB_REASON) AS PUB_REASON_NM
+		     , A.PUB_REASON_DTL
+		     , A.REG_NO
+		     , CASE WHEN A.REG_NO > 100000 THEN (SELECT CUST_ID FROM TB_CUSTOMER WHERE CUST_NO = A.REG_NO)
+		            WHEN A.REG_NO = 99999 THEN 'BATCH'
+		            ELSE (SELECT USER_ID FROM TB_USER WHERE USER_NO = A.REG_NO)
+		        END AS REG_ID
+		     , CASE WHEN A.REG_NO > 100000 THEN '본인발급' ELSE FN_GET_USER_NM(A.REG_NO)
+		        END AS REG_NM
+		     , A.REG_DT
+		FROM   TB_CUST_COUPON A
+		LEFT   OUTER JOIN TB_CUSTOMER B
+		ON     A.CUST_NO = B.CUST_NO
+		WHERE  1=1
+		AND    A.CPN_ID = #{cpnId}
+	</select>
 
     <!-- 선착순쿠폰 삭제 -->
     <update id="updateLimitedTimeCouponList" parameterType="CouponLimitedTime" >

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

@@ -11,6 +11,7 @@
 		     , MAILF_SQ     /*메일푸터일련번호*/
 		     , MAILT_NM     /*메일템플릿명*/
 		     , MAIL_CONTENT /*메일내용*/
+		     , USE_YN
 		FROM   TB_MAILT
 		WHERE  MAILT_SQ = #{mailtSq}
 	</select>

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

@@ -4733,6 +4733,7 @@
 		     , OD.ORD_DTL_NO
 		     , OD.GOODS_CPN_SQ
 		     , OD.CART_CPN_SQ
+		     , 0 AS ORD_FREEGIFT_VAL_SQ
 		     , OD.PNT_DC_AMT
 		     , OD.GFCD_USE_AMT
 		     , OD.SAVE_PNT_AMT
@@ -4745,6 +4746,7 @@
 		     , DF.DELV_FEE_SQ AS ORD_DTL_NO
 		     , 0 AS GOODS_CPN_SQ
 		     , 0 AS CART_CPN_SQ
+		     , 0 AS ORD_FREEGIFT_VAL_SQ
 		     , 0 AS PNT_DC_AMT
 		     , 0 AS GFCD_USE_AMT
 		     , 0 AS SAVE_PNT_AMT
@@ -4757,6 +4759,7 @@
 		     , 0 AS ORD_DTL_NO
 		     , 0 AS GOODS_CPN_SQ
 		     , 0 AS CART_CPN_SQ
+		     , OFV.ORD_FREEGIFT_VAL_SQ
 		     , OFV.USE_POINT AS PNT_DC_AMT
 		     , 0 AS GFCD_USE_POINT
 		     , 0 AS SAVE_PNT_AMT
@@ -4827,6 +4830,7 @@
 		    , OCCUR_DTL_DESC
 		    , PNT_AMT
 		    , CUST_PNT_SQ
+		    , ORD_FREEGIFT_VAL_SQ
 		    , ORD_NO
 		    , ORD_DTL_NO
 		    , REVIEW_SQ
@@ -4843,6 +4847,7 @@
 		    , #{occurDtlDesc}
 		    , #{pntAmt}
 		    , #{custPntSq}
+		    , #{ordFreegiftValSq}
 		    , #{ordNo}
 		    , #{ordDtlNo}
 		    , #{reviewSq}