Merge remote-tracking branch 'origin/order' into jsh77b

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

@@ -71,6 +71,7 @@ public class Coupon extends TscBaseDomain {
 
     private Integer limitCpnId;         // 선착순쿠폰일련번호
     private String delYn;
+    private String cpnDesc;             // 쿠폰설명
 
     // 그리드 파라미터
     List<CouponRefval> supplyCompList;          // 공급업체 리스트

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

@@ -408,7 +408,8 @@ public class Order extends TscBaseDomain {
 	private int delvCnt;
 	private int delvTotCnt;
 	private int delvFeeTotCnt;
-	
+
+	Collection<Order> cartGoodsList;
 	Collection<Order> wmsCartList;
 	Collection<Order> resCartList;
 	Collection<Order> delvCartList;
@@ -478,6 +479,7 @@ public class Order extends TscBaseDomain {
 	private String selfGoodsYn;
 	private String brandNm;
 	private String ordDtlStatBanner;
+	private String ordDtlStatLastBanner;
 	private String expiredSoon;
 	private int purchaseConfirmDay;
 	private String giftLimitDt;
@@ -488,4 +490,13 @@ public class Order extends TscBaseDomain {
 	private String vaDeadlineHms;
 	private int totalDcAmt;
 	private int custPntSq;
+	private int orderReceiptCount;
+	private int paymentCompleteCount;
+	private int goodsPrepareCount;
+	private int shipPrepareCount;
+	private int shippingCount;
+	private int shipCompleteCount;
+	private int cancelCount;
+	private int exchangeCount;
+	private int returnCount;
 }

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

@@ -11,6 +11,7 @@
         SELECT SITE_CD
         , CPN_ID
         , CPN_NM
+        , CPN_DESC
         , CPN_TYPE
         , DC_WAY
         , DC_PVAL
@@ -55,6 +56,7 @@
         GROUP BY  T.SITE_CD
         , T.CPN_ID
         , T.CPN_NM
+        , T.CPN_DESC
         , T.CPN_TYPE
         , T.DC_WAY
         , T.DC_PVAL
@@ -114,6 +116,7 @@
         /* TscCoupon.getCouponDetail */
         SELECT B.CPN_ID
         , B.CPN_NM
+        , B.CPN_DESC
         , B.SITE_CD
         , B.AF_LINK_CD
         , B.CPN_TYPE
@@ -308,6 +311,7 @@
         /* TscCoupon.updateCouponMstInfo */
         UPDATE	TB_COUPON	SET
         CPN_NM = #{cpnNm}
+        , CPN_DESC = #{cpnDesc}
         , SITE_CD = #{siteCd}
         , AF_LINK_CD = #{afLinkCd}
         , CPN_TYPE = #{cpnType}
@@ -422,6 +426,7 @@
         INSERT INTO TB_COUPON (
         CPN_ID
         , CPN_NM
+        , CPN_DESC
         , SITE_CD
         , AF_LINK_CD
         , CPN_TYPE
@@ -461,6 +466,7 @@
         ) VALUES (
         #{cpnId}
         , #{cpnNm}
+        , #{cpnDesc}
         , #{siteCd}
         , #{afLinkCd}
         , #{cpnType}
@@ -524,6 +530,7 @@
         , #{newCustYn}
         ) ON DUPLICATE KEY UPDATE
         CPN_NM = #{cpnNm}
+        , CPN_DESC = #{cpnDesc}
         , SITE_CD = #{siteCd}
         , AF_LINK_CD = #{afLinkCd}
         , CPN_TYPE = #{cpnType}
@@ -921,6 +928,7 @@
         /* TscCoupon.getCouponRetrieveList */
         SELECT A.CPN_ID                                               /*쿠폰ID*/
         , A.CPN_NM                                               /*쿠폰명*/
+        , A.CPN_DESC                                             /*쿠폰설명*/
         , A.SITE_CD                                              /*사이트코드(공통코드G000)*/
         , A.CPN_TYPE                                             /*쿠폰유형(공통코드G230)*/
         , A.DC_WAY                                               /*할인방식(공통코드G240)*/