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

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

@@ -285,10 +285,10 @@
 		             , SUM(ODIH.SELL_AMT
 		                   - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		                   - ODIH.TMTB_DC_AMT)                      AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
-		             , ROUND(SUM((ODIH.SELL_AMT
+		             , SUM(ROUND((ODIH.SELL_AMT
 		                          - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		                          - ODIH.TMTB_DC_AMT
-		                         ) * (ODIH.SELL_FEE_RATE / 100)),0) AS SELL_FEE_AMT            /*수수료*/
+		                         ) * (ODIH.SELL_FEE_RATE / 100),0)) AS SELL_FEE_AMT            /*수수료*/
 		             , SUM(ODIH.CPN1_DC_AMT +
 		                   ODIH.GOODS_CPN_DC_AMT +
 		                   ODIH.CART_CPN_DC_AMT)                    AS CPN_DC_AMT              /*쿠폰할인금액*/
@@ -713,9 +713,6 @@
 		     , CG.CHG_GFCD_AMT                                                                         /*전환금액(=최초등록금액)*/
 		     , IFNULL(CGH1.USE_GFCD_AMT,0)                                         AS USE_GFCD_AMT     /*정산월사용금액*/
 		     , IFNULL(CGH1.CNCL_GFCD_AMT,0)                                        AS CNCL_GFCD_AMT    /*정산월취소금액*/
-		     , CG.CHG_GFCD_AMT - IFNULL(CGH2.PREV_USE_GFCD_AMT,0)                  AS PREV_RM_GFCD_AMT /*전월기준잔액*/
-		     , (CG.CHG_GFCD_AMT - IFNULL(CGH2.PREV_USE_GFCD_AMT,0))
-		       - IFNULL(CGH1.USE_GFCD_AMT,0) + IFNULL(CGH1.CNCL_GFCD_AMT,0)        AS RM_GFCD_AMT      /*잔액(=최초등록금액 - 전월까지의누적사용금액 - 정산월사용금액 + 정산월취소금액)*/
 		FROM   TB_CUST_GIFTCARD CG
 		INNER JOIN TB_CUSTOMER C ON CG.CUST_NO = C.CUST_NO
 		LEFT OUTER JOIN (
@@ -730,16 +727,6 @@
 		                 GROUP  BY CUST_NO, CUST_GFCD_SQ
 		                ) CGH1 ON CG.CUST_NO = CGH1.CUST_NO
 		                      AND CG.CUST_GFCD_SQ = CGH1.CUST_GFCD_SQ
-		LEFT OUTER JOIN (
-		                 /*전월까지의 사용누적금액*/
-		                 SELECT CUST_NO
-		                      , CUST_GFCD_SQ
-		                      , -1 * SUM(GFCD_AMT) AS PREV_USE_GFCD_AMT
-		                 FROM   TB_CUST_GIFTCARD_HST
-		                 WHERE  REG_DT <![CDATA[<]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
-		                 GROUP  BY CUST_NO, CUST_GFCD_SQ
-		                ) CGH2 ON CG.CUST_NO = CGH2.CUST_NO
-		                      AND CG.CUST_GFCD_SQ = CGH2.CUST_GFCD_SQ
 		WHERE  1 = 1
 		<if test="availYn != null and availYn != ''">
 		AND    (CASE WHEN NOW() <![CDATA[<]]> CG.USE_EXP_DATE THEN 'Y' ELSE 'N' END) = #{availYn}

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

@@ -81,54 +81,54 @@
 		             ) * (ODIH.SELL_FEE_RATE / 100),0)          AS SELL_FEE_AMT           /*수수료*/
 		     , ODIH.MD_NM                                                                 /*담당MD*/
 		FROM   (
-		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                        /*주문상세단품이력일련번호*/
-		             , ODIH.ORD_NO                                                                                     /*주문번호*/
-		             , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
+		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                                    /*주문상세단품이력일련번호*/
+		             , ODIH.ORD_NO                                                                                                 /*주문번호*/
+		             , ODIH.ORD_DTL_NO                                                                                             /*주문상세번호*/
 		             , CASE WHEN ODIH.ORD_DTL_STAT = 'G720_10' THEN '판매'
 		                    WHEN ODIH.ORD_DTL_STAT = 'G720_30' THEN '취소'
 		                    WHEN ODIH.ORD_DTL_STAT = 'G720_40' THEN '품절취소'
 		                    WHEN ODIH.ORD_DTL_STAT = 'G720_50' THEN '반품'
 		                    WHEN ODIH.ORD_DTL_STAT = 'G720_60' THEN '교환'
-		               END                                                                  AS SELL_GB                 /*판매구분*/
-		             , O.MALL_GB                                                                                       /*몰구분*/
-		             , FN_GET_CODE_NM('G011',O.MALL_GB)                                     AS MALL_GB_NM              /*몰구분명*/
-		             , OD.EXTMALL_ORDER_ID                                                                             /*제휴몰주문번호*/
-		             , OD.EXTMALL_ID                                                                                   /*제휴몰ID*/
-		             , E.EXTMALL_NM                                                                                    /*제휴몰명*/
-		             , OD.AF_LINK_CD                                                                                   /*제휴링크코드*/
-		             , AL.AF_LINK_NM                                                                                   /*제휴링크명*/
-		             , AL.AF_CHANNEL                                                                                   /*제휴채널코드*/
-		             , FN_GET_CODE_NM('G053',AL.AF_CHANNEL)                                 AS AF_CHANNEL_NM           /*제휴채널명*/
-		             , SC.DISTRIBUTION_GB                                                                              /*유통구분*/
-		             , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB)                            AS DISTRIBUTION_GB_NM      /*유통구분명*/
-		             , OD.SUPPLY_COMP_CD                                                                               /*공급업체코드*/
-		             , SC.SUPPLY_COMP_NM                                                                               /*공급업체명*/
-		             , SC.SUPPLY_VENDOR_CD                                                                             /*공급벤더코드*/
-		             , SV.SUPPLY_VENDOR_NM                                                                             /*공급벤더명*/
-		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                            AS ORD_DT                  /*주문일시*/
-		             , DATE_FORMAT(ODIH.REG_DT,'%Y-%m-%d %H:%i:%S')                         AS OCCUR_DT                /*발생일시*/
-		             , G.BRAND_CD                                                                                      /*브랜드코드*/
-		             , B.BRAND_ENM                                                                                     /*브랜드명*/
-		             , OD.GOODS_CD                                                                                     /*상품코드*/
-		             , G.GOODS_NM                                                                                      /*상품명*/
-		             , ODIH.ITEM_CD                                                                                    /*단품코드*/
-		             , ODIH.OPT_CD1                                                                                    /*옵션코드1*/
-		             , ODIH.OPT_CD2                                                                                    /*옵션코드2*/
-		             , G.ITEMKIND_CD                                                                                   /*품목코드*/
-		             , I.ITEMKIND_NM                                                                                   /*품목명*/
-		             , ODIH.ITEM_PRICE                                                      AS MALL_PRICE              /*몰판매가*/
+		               END                                                                              AS SELL_GB                 /*판매구분*/
+		             , O.MALL_GB                                                                                                   /*몰구분*/
+		             , FN_GET_CODE_NM('G011',O.MALL_GB)                                                 AS MALL_GB_NM              /*몰구분명*/
+		             , OD.EXTMALL_ORDER_ID                                                                                         /*제휴몰주문번호*/
+		             , OD.EXTMALL_ID                                                                                               /*제휴몰ID*/
+		             , E.EXTMALL_NM                                                                                                /*제휴몰명*/
+		             , OD.AF_LINK_CD                                                                                               /*제휴링크코드*/
+		             , AL.AF_LINK_NM                                                                                               /*제휴링크명*/
+		             , AL.AF_CHANNEL                                                                                               /*제휴채널코드*/
+		             , FN_GET_CODE_NM('G053',AL.AF_CHANNEL)                                             AS AF_CHANNEL_NM           /*제휴채널명*/
+		             , SC.DISTRIBUTION_GB                                                                                          /*유통구분*/
+		             , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB)                                        AS DISTRIBUTION_GB_NM      /*유통구분명*/
+		             , OD.SUPPLY_COMP_CD                                                                                           /*공급업체코드*/
+		             , SC.SUPPLY_COMP_NM                                                                                           /*공급업체명*/
+		             , SC.SUPPLY_VENDOR_CD                                                                                         /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM                                                                                         /*공급벤더명*/
+		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                                        AS ORD_DT                  /*주문일시*/
+		             , DATE_FORMAT(ODIH.REG_DT,'%Y-%m-%d %H:%i:%S')                                     AS OCCUR_DT                /*발생일시*/
+		             , G.BRAND_CD                                                                                                  /*브랜드코드*/
+		             , B.BRAND_ENM                                                                                                 /*브랜드명*/
+		             , OD.GOODS_CD                                                                                                 /*상품코드*/
+		             , G.GOODS_NM                                                                                                  /*상품명*/
+		             , ODIH.ITEM_CD                                                                                                /*단품코드*/
+		             , ODIH.OPT_CD1                                                                                                /*옵션코드1*/
+		             , ODIH.OPT_CD2                                                                                                /*옵션코드2*/
+		             , G.ITEMKIND_CD                                                                                               /*품목코드*/
+		             , I.ITEMKIND_NM                                                                                               /*품목명*/
+		             , ODIH.ITEM_PRICE                                                                  AS MALL_PRICE              /*몰판매가*/
 		             , CASE WHEN O.MALL_GB = 'G011_20' /*제휴몰*/ THEN
 		                        IFNULL(EUP.USAC_PRICE,ODIH.ITEM_PRICE)
 		                    ELSE
 		                        ODIH.ITEM_PRICE
-		               END                                                                  AS SELL_PRICE              /*판매가(제휴몰정산가적용)*/
+		               END                                                                              AS SELL_PRICE              /*판매가(제휴몰정산가적용)*/
 		             , (CASE WHEN ODIH.ORD_DTL_STAT = 'G720_10' THEN 1 ELSE -1 END)
 		               *
 		               CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_10'/*판매-결제완료*/ THEN
 		                             ODIH.ORD_QTY - ODIH.CNCL_RTN_QTY
 		                         ELSE /*환입-반품완료,환입-교환완료*/
 		                             ODIH.CNCL_RTN_QTY
-		                    END AS SIGNED INT)                                              AS SELL_QTY                /*판매수량*/
+		                    END AS SIGNED INT)                                                          AS SELL_QTY                /*판매수량*/
 		             , (CASE WHEN ODIH.ORD_DTL_STAT = 'G720_10' THEN 1 ELSE -1 END)
 		               *
 		               CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_10'/*판매-결제완료*/ THEN
@@ -143,35 +143,39 @@
 		                                                        ELSE
 		                                                            ODIH.ITEM_PRICE
 		                                                   END))
-		                    END AS SIGNED INT)                                              AS SELL_AMT                /*판매금액*/
-		             , ODIH.CPN1_DC_AMT                                                                                /*즉시사용쿠폰금액*/
-		             , ODIH.GOODS_CPN_DC_AMT                                                                           /*상품쿠폰사용금액*/
-		             , ODIH.CART_CPN_DC_AMT                                                                            /*주문서쿠폰사용금액*/
-		             , ODIH.PNT_DC_AMT                                                                                 /*포인트사용금액*/
-		             , ODIH.TMTB1_DC_AMT + ODIH.TMTB2_DC_AMT                                AS TMTB_DC_AMT             /*다다익선할인금액*/
-		             , ((100 - IFNULL(TB1.TMTB_BURDEN_RATE,0)) / 100) * ODIH.TMTB1_DC_AMT
-		               + ((100 - IFNULL(TB2.TMTB_BURDEN_RATE,0)) / 100) * ODIH.TMTB2_DC_AMT AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
-		             , (IFNULL(TB1.TMTB_BURDEN_RATE,0) / 100) * ODIH.TMTB1_DC_AMT
-		               + (IFNULL(TB2.TMTB_BURDEN_RATE,0) / 100) * ODIH.TMTB2_DC_AMT         AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
-		             , ODIH.GFCD_USE_AMT                                                                               /*상품권사용금액*/
-		             , ((100 - IFNULL(CB1.BURDEN_RATE,0)) / 100) * ODIH.CPN1_DC_AMT
-		               + ((100 - IFNULL(CB2.BURDEN_RATE,0)) / 100) * ODIH.GOODS_CPN_DC_AMT
-		               + ((100 - IFNULL(CB3.BURDEN_RATE,0)) / 100) * ODIH.CART_CPN_DC_AMT   AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
-		             , (IFNULL(CB1.BURDEN_RATE,0) / 100) * ODIH.CPN1_DC_AMT
-		               + (IFNULL(CB2.BURDEN_RATE,0) / 100) * ODIH.GOODS_CPN_DC_AMT
-		               + (IFNULL(CB3.BURDEN_RATE,0) / 100) * ODIH.CART_CPN_DC_AMT           AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		                    END AS SIGNED INT)                                                          AS SELL_AMT                /*판매금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.GOODS_CPN_DC_AMT                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.PNT_DC_AMT                         AS PNT_DC_AMT              /*포인트사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * (ODIH.TMTB1_DC_AMT + ODIH.TMTB2_DC_AMT) AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) *
+		               (((100 - IFNULL(TB1.TMTB_BURDEN_RATE,0)) / 100) * ODIH.TMTB1_DC_AMT
+		                 + ((100 - IFNULL(TB2.TMTB_BURDEN_RATE,0)) / 100) * ODIH.TMTB2_DC_AMT)          AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) *
+		               ((IFNULL(TB1.TMTB_BURDEN_RATE,0) / 100) * ODIH.TMTB1_DC_AMT
+		                + (IFNULL(TB2.TMTB_BURDEN_RATE,0) / 100) * ODIH.TMTB2_DC_AMT)                   AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.GFCD_USE_AMT                       AS GFCD_USE_AMT            /*상품권사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) *
+		               (((100 - IFNULL(CB1.BURDEN_RATE,0)) / 100) * ODIH.CPN1_DC_AMT
+		                 + ((100 - IFNULL(CB2.BURDEN_RATE,0)) / 100) * ODIH.GOODS_CPN_DC_AMT
+		                 + ((100 - IFNULL(CB3.BURDEN_RATE,0)) / 100) * ODIH.CART_CPN_DC_AMT)            AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) *
+		               ((IFNULL(CB1.BURDEN_RATE,0) / 100) * ODIH.CPN1_DC_AMT
+		                + (IFNULL(CB2.BURDEN_RATE,0) / 100) * ODIH.GOODS_CPN_DC_AMT
+		                + (IFNULL(CB3.BURDEN_RATE,0) / 100) * ODIH.CART_CPN_DC_AMT)                     AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
 		             , CASE WHEN O.MALL_GB = 'G011_10' /*자사몰*/ THEN
 		                        OD.SELL_FEE_RATE
 		                    ELSE /*제휴몰*/
 		                        IFNULL(E.SELL_FEE_RATE,0)
-		               END                                                                  AS SELL_FEE_RATE           /*판매수수료율*/
+		               END                                                                              AS SELL_FEE_RATE           /*판매수수료율*/
 		             , (SELECT U.USER_NM
 		                FROM   TB_BRAND_MD BM
 		                     , TB_USER U
 		                WHERE  BM.MD_NO = U.USER_NO
 		                AND    BM.BRAND_CD = G.BRAND_CD
 		                AND    BM.FORMAL_GB = G.FORMAL_GB
-		                LIMIT 1)                                                            AS MD_NM                   /*담당MD*/
+		                LIMIT 1)                                                                        AS MD_NM                   /*담당MD*/
 		        FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		        INNER JOIN TB_ORDER_DETAIL OD ON ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
 		        INNER JOIN TB_ORDER O ON ODIH.ORD_NO = O.ORD_NO

src/main/webapp/WEB-INF/views/settle/GiftcardSettleForm.html

@@ -125,7 +125,7 @@
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{
-			headerName: "잔액", field: "rmGfcdAmt", width: 150, cellClass: 'text-right',
+			headerName: "잔액", field: "rmGfcdAmt", width: 150, cellClass: 'text-right', hide: true,
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		}
 	];
@@ -216,10 +216,12 @@
 			gagaAgGrid.showOrHideColumn(gridOptions, 'usGfcdAmt', false);
 			gagaAgGrid.showOrHideColumn(gridOptions, 'useGfcdAmt', true);
 			gagaAgGrid.showOrHideColumn(gridOptions, 'cnclGfcdAmt', true);
+			gagaAgGrid.showOrHideColumn(gridOptions, 'rmGfcdAmt', false);
 		} else {
 			gagaAgGrid.showOrHideColumn(gridOptions, 'usGfcdAmt', true);
 			gagaAgGrid.showOrHideColumn(gridOptions, 'useGfcdAmt', false);
 			gagaAgGrid.showOrHideColumn(gridOptions, 'cnclGfcdAmt', false);
+			gagaAgGrid.showOrHideColumn(gridOptions, 'rmGfcdAmt', true);
 		}
 	}