Merge branch 'style' into develop

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

@@ -46,6 +46,7 @@ public class GoodsSettle extends TscBaseDomain {
 	private int sellPrice;				// 판매가(정산용)
 	private int sellQty;				// 판매수량
 	private int sellAmt;				// 판매금액(CPN1_DC_AMT가 빠진 금액이 들어가 있음)
+	private int cpnDcAmt;				// 쿠폰할인금액(즉시사용쿠폰금액+상품쿠폰사용금액+주문서쿠폰사용금액)
 	private int cpn1DcAmt;				// 즉시사용쿠폰금액
 	private int goodsCpnDcAmt;			// 상품쿠폰사용금액
 	private int cartCpnDcAmt;			// 주문서쿠폰사용금액

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

@@ -5,62 +5,65 @@
 	<!-- 상품정산 목록 -->
 	<select id="getGoodsSettleList" parameterType="GoodsSettle" resultType="GoodsSettle">
 		/* TsaSettle.getGoodsSettleList */
-		SELECT ODIH.ORD_NO                                                                /*주문번호*/
-		     , ODIH.ORD_DTL_NO                                                            /*주문상세번호*/
-		     , ODIH.MALL_GB                                                               /*몰구분*/
-		     , ODIH.MALL_GB_NM                                                            /*몰구분명*/
-		     , ODIH.EXTMALL_ORDER_ID                                                      /*제휴몰주문번호*/
-		     , ODIH.EXTMALL_ID                                                            /*제휴몰ID*/
-		     , ODIH.EXTMALL_NM                                                            /*제휴몰명*/
-		     , ODIH.SUPPLY_VENDOR_CD                                                      /*공급벤더코드*/
-		     , ODIH.SUPPLY_VENDOR_NM                                                      /*공급벤더명*/
-		     , ODIH.SUPPLY_COMP_CD                                                        /*공급업체코드*/
-		     , ODIH.SUPPLY_COMP_NM                                                        /*공급업체명*/
-		     , ODIH.DISTRIBUTION_GB                                                       /*유통구분*/
-		     , ODIH.DISTRIBUTION_GB_NM                                                    /*유통구분명*/
-		     , ODIH.SETTLE_DAY                                                            /*정산주기*/
-		     , ODIH.SETTLE_DAY_NM                                                         /*정산주기명*/
-		     , ODIH.ORD_DT                                                                /*주문일시*/
-		     , ODIH.SETTLE_GB                                                             /*정산구분*/
-		     , ODIH.SETTLE_GB_NM                                                          /*정산구분명*/
-		     , ODIH.OCCUR_DT                                                              /*발생일시*/
-		     , ODIH.GOODS_CD                                                              /*상품코드*/
-		     , ODIH.GOODS_NM                                                              /*상품명*/
-		     , ODIH.BRAND_CD                                                              /*브랜드코드*/
-		     , ODIH.BRAND_ENM                                                             /*브랜드명*/
-		     , ODIH.MD_NM                                                                 /*담당MD*/
-		     , ODIH.ITEM_CD                                                               /*단품코드*/
-		     , ODIH.OPT_CD1                                                               /*옵션코드1*/
-		     , ODIH.OPT_CD2                                                               /*옵션코드2*/
-		     , ODIH.MALL_PRICE                                                            /*몰판매가*/
-		     , ODIH.SELL_PRICE                                                            /*판매가*/
-		     , ODIH.SELL_QTY                                                              /*판매수량*/
-		     , ODIH.SELL_AMT                                                              /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
-		     , ODIH.CPN1_DC_AMT                                                           /*즉시사용쿠폰금액*/
-		     , ODIH.GOODS_CPN_DC_AMT                                                      /*상품쿠폰사용금액*/
-		     , ODIH.CART_CPN_DC_AMT                                                       /*주문서쿠폰사용금액*/
-		     , ODIH.PNT_DC_AMT                                                            /*포인트사용금액*/
-		     , ODIH.TMTB_DC_AMT                                                           /*다다익선할인금액*/
-		     , ODIH.SELF_TMTB_DC_AMT                                                      /*자사다다익선분담액*/
-		     , ODIH.SUPPLY_COMP_TMTB_DC_AMT                                               /*입점다다익선분담액*/
-		     , ODIH.GFCD_USE_AMT                                                          /*상품권사용금액*/
-		     , ODIH.SELF_CPN_DC_AMT                                                       /*자사쿠폰분담액*/
-		     , ODIH.SUPPLY_COMP_CPN_DC_AMT                                                /*입점쿠폰분담액*/
+		SELECT ODIH.ORD_NO                                                                                     /*주문번호*/
+		     , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
+		     , ODIH.MALL_GB                                                                                    /*몰구분*/
+		     , ODIH.MALL_GB_NM                                                                                 /*몰구분명*/
+		     , ODIH.EXTMALL_ORDER_ID                                                                           /*제휴몰주문번호*/
+		     , ODIH.EXTMALL_ID                                                                                 /*제휴몰ID*/
+		     , ODIH.EXTMALL_NM                                                                                 /*제휴몰명*/
+		     , ODIH.SUPPLY_VENDOR_CD                                                                           /*공급벤더코드*/
+		     , ODIH.SUPPLY_VENDOR_NM                                                                           /*공급벤더명*/
+		     , ODIH.SUPPLY_COMP_CD                                                                             /*공급업체코드*/
+		     , ODIH.SUPPLY_COMP_NM                                                                             /*공급업체명*/
+		     , ODIH.DISTRIBUTION_GB                                                                            /*유통구분*/
+		     , ODIH.DISTRIBUTION_GB_NM                                                                         /*유통구분명*/
+		     , ODIH.SETTLE_DAY                                                                                 /*정산주기*/
+		     , ODIH.SETTLE_DAY_NM                                                                              /*정산주기명*/
+		     , ODIH.ORD_DT                                                                                     /*주문일시*/
+		     , ODIH.SETTLE_GB                                                                                  /*정산구분*/
+		     , ODIH.SETTLE_GB_NM                                                                               /*정산구분명*/
+		     , ODIH.OCCUR_DT                                                                                   /*발생일시*/
+		     , ODIH.GOODS_CD                                                                                   /*상품코드*/
+		     , ODIH.GOODS_NM                                                                                   /*상품명*/
+		     , ODIH.BRAND_CD                                                                                   /*브랜드코드*/
+		     , ODIH.BRAND_ENM                                                                                  /*브랜드명*/
+		     , ODIH.MD_NM                                                                                      /*담당MD*/
+		     , ODIH.ITEM_CD                                                                                    /*단품코드*/
+		     , ODIH.OPT_CD1                                                                                    /*옵션코드1*/
+		     , ODIH.OPT_CD2                                                                                    /*옵션코드2*/
+		     , ODIH.MALL_PRICE                                                                                 /*몰판매가*/
+		     , ODIH.SELL_PRICE                                                                                 /*판매가*/
+		     , ODIH.SELL_QTY                                                                                   /*판매수량*/
+		     , ODIH.SELL_AMT                                                                                   /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
+		     , IF(ODIH.CPN1_DC_AMT = -0,0,ODIH.CPN1_DC_AMT)
+		       + IF(ODIH.GOODS_CPN_DC_AMT = -0,0,ODIH.GOODS_CPN_DC_AMT)
+		       + IF(ODIH.CART_CPN_DC_AMT = -0,0,ODIH.CART_CPN_DC_AMT)               AS CPN_DC_AMT              /*쿠폰할인금액*/
+		     , IF(ODIH.CPN1_DC_AMT = -0,0,ODIH.CPN1_DC_AMT)                         AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
+		     , IF(ODIH.GOODS_CPN_DC_AMT = -0,0,ODIH.GOODS_CPN_DC_AMT)               AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액*/
+		     , IF(ODIH.CART_CPN_DC_AMT = -0,0,ODIH.CART_CPN_DC_AMT)                 AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/
+		     , IF(ODIH.PNT_DC_AMT = -0,0,ODIH.PNT_DC_AMT)                           AS PNT_DC_AMT              /*포인트사용금액*/
+		     , IF(ODIH.TMTB_DC_AMT = -0,0,ODIH.TMTB_DC_AMT)                         AS TMTB_DC_AMT             /*다다익선할인금액*/
+		     , IF(ODIH.SELF_TMTB_DC_AMT = -0,0,ODIH.SELF_TMTB_DC_AMT)               AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		     , IF(ODIH.SUPPLY_COMP_TMTB_DC_AMT = -0,0,ODIH.SUPPLY_COMP_TMTB_DC_AMT) AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		     , IF(ODIH.GFCD_USE_AMT = -0,0,ODIH.GFCD_USE_AMT)                       AS GFCD_USE_AMT            /*상품권사용금액*/
+		     , IF(ODIH.SELF_CPN_DC_AMT = -0,0,ODIH.SELF_CPN_DC_AMT)                 AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		     , IF(ODIH.SUPPLY_COMP_CPN_DC_AMT = -0,0,ODIH.SUPPLY_COMP_CPN_DC_AMT)   AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
 		     , CASE WHEN ODIH.SELL_QTY = 0 THEN 0
 		            ELSE
 		                (ODIH.SELL_AMT
 		                 - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		                 - ODIH.TMTB_DC_AMT
 		                ) / ODIH.SELL_QTY
-		       END                                              AS REAL_SELL_PRICE        /*실판매가*/
+		       END                                                                  AS REAL_SELL_PRICE         /*실판매가*/
 		     , 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          /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
-		     , ODIH.SELL_FEE_RATE                                                         /*판매수수료율*/
+		       - ODIH.TMTB_DC_AMT                                                   AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
+		     , ODIH.SELL_FEE_RATE                                                                              /*판매수수료율*/
 		     , 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            /*수수료*/
 		     , (ODIH.SELL_AMT
 		        - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		        - ODIH.TMTB_DC_AMT)
@@ -68,55 +71,55 @@
 		                - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		                - ODIH.TMTB_DC_AMT
 		               ) * (ODIH.SELL_FEE_RATE / 100),0)
-		       + (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) AS SETTLE_AMT             /*정산대상액(실판매금액 - 수수료 + 자사다다익선분담액 + 자사쿠폰분담액)*/
+		       + (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)                     AS SETTLE_AMT              /*정산대상액(실판매금액 - 수수료 + 자사다다익선분담액 + 자사쿠폰분담액)*/
 		FROM   (
-		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                        /*주문상세단품이력일련번호*/
-		             , ODIH.ORD_NO                                                                                     /*주문번호*/
-		             , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
-		             , 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                                                                                    /*제휴몰명*/
-		             , SC.SUPPLY_VENDOR_CD                                                                             /*공급벤더코드*/
-		             , SV.SUPPLY_VENDOR_NM                                                                             /*공급벤더명*/
-		             , OD.SUPPLY_COMP_CD                                                                               /*공급업체코드*/
-		             , SC.SUPPLY_COMP_NM                                                                               /*공급업체명*/
-		             , SC.DISTRIBUTION_GB                                                                              /*유통구분*/
-		             , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB)                            AS DISTRIBUTION_GB_NM      /*유통구분명*/
-		             , SV.SETTLE_DAY                                                                                   /*정산주기*/
-		             , FN_GET_CODE_NM('G075',SV.SETTLE_DAY)                                 AS SETTLE_DAY_NM           /*정산주기명*/
-		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                            AS ORD_DT                  /*주문일시*/
-		             , ODIH.ORD_DTL_STAT                                                    AS SETTLE_GB               /*정산구분*/
-		             , FN_GET_CODE_NM('G720',ODIH.ORD_DTL_STAT)                             AS SETTLE_GB_NM            /*정산구분명*/
-		             , DATE_FORMAT(ODIH.REG_DT,'%Y-%m-%d %H:%i:%S')                         AS OCCUR_DT                /*발생일시*/
-		             , OD.GOODS_CD                                                                                     /*상품코드*/
-		             , G.GOODS_NM                                                                                      /*상품명*/
-		             , G.BRAND_CD                                                                                      /*브랜드코드*/
-		             , B.BRAND_ENM                                                                                     /*브랜드명*/
+		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                                    /*주문상세단품이력일련번호*/
+		             , ODIH.ORD_NO                                                                                                 /*주문번호*/
+		             , ODIH.ORD_DTL_NO                                                                                             /*주문상세번호*/
+		             , 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                                                                                                /*제휴몰명*/
+		             , SC.SUPPLY_VENDOR_CD                                                                                         /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM                                                                                         /*공급벤더명*/
+		             , OD.SUPPLY_COMP_CD                                                                                           /*공급업체코드*/
+		             , SC.SUPPLY_COMP_NM                                                                                           /*공급업체명*/
+		             , SC.DISTRIBUTION_GB                                                                                          /*유통구분*/
+		             , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB)                                        AS DISTRIBUTION_GB_NM      /*유통구분명*/
+		             , SV.SETTLE_DAY                                                                                               /*정산주기*/
+		             , FN_GET_CODE_NM('G075',SV.SETTLE_DAY)                                             AS SETTLE_DAY_NM           /*정산주기명*/
+		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                                        AS ORD_DT                  /*주문일시*/
+		             , ODIH.ORD_DTL_STAT                                                                AS SETTLE_GB               /*정산구분*/
+		             , FN_GET_CODE_NM('G720',ODIH.ORD_DTL_STAT)                                         AS SETTLE_GB_NM            /*정산구분명*/
+		             , DATE_FORMAT(ODIH.REG_DT,'%Y-%m-%d %H:%i:%S')                                     AS OCCUR_DT                /*발생일시*/
+		             , OD.GOODS_CD                                                                                                 /*상품코드*/
+		             , G.GOODS_NM                                                                                                  /*상품명*/
+		             , G.BRAND_CD                                                                                                  /*브랜드코드*/
+		             , B.BRAND_ENM                                                                                                 /*브랜드명*/
 		             , (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*/
-		             , ODIH.ITEM_CD                                                                                    /*단품코드*/
-		             , ODIH.OPT_CD1                                                                                    /*옵션코드1*/
-		             , ODIH.OPT_CD2                                                                                    /*옵션코드2*/
-		             , ODIH.ITEM_PRICE                                                      AS MALL_PRICE              /*몰판매가*/
+		                LIMIT 1)                                                                        AS MD_NM                   /*담당MD*/
+		             , ODIH.ITEM_CD                                                                                                /*단품코드*/
+		             , ODIH.OPT_CD1                                                                                                /*옵션코드1*/
+		             , ODIH.OPT_CD2                                                                                                /*옵션코드2*/
+		             , 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_20' THEN 1 ELSE -1 END)
 		               *
 		               CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20'/*판매-배송중*/ 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_20' THEN 1 ELSE -1 END)
 		               *
 		               CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20'/*판매-배송중*/ THEN
@@ -131,28 +134,32 @@
 		                                                        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_20',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.GOODS_CPN_DC_AMT                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.PNT_DC_AMT                         AS PNT_DC_AMT              /*포인트사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * (ODIH.TMTB1_DC_AMT + ODIH.TMTB2_DC_AMT) AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',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_20',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_20',1,-1) * ODIH.GFCD_USE_AMT                       AS GFCD_USE_AMT            /*상품권사용금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_20',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_20',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           /*판매수수료율*/
 		        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
@@ -241,17 +248,33 @@
 		     , SUM(ODIH.TMTB_DC_AMT)                   AS TMTB_DC_AMT             /*다다익선할인금액*/
 		     , SUM(ODIH.SELF_TMTB_DC_AMT)              AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
 		     , SUM(ODIH.SUPPLY_COMP_TMTB_DC_AMT)       AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
-		     , SUM(CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
-		                ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
-		           END)                                AS BILL_AMT               /*계산서발행금액*/
-		     , TRUNCATE(SUM(CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
+		     , SUM(CASE WHEN ODIH.SELL_FEE_AMT > 0 THEN
+		                    CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
 		                         ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		                    END
+		                ELSE
+		                    ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		           END)                                AS BILL_AMT               /*계산서발행금액*/
+		     , TRUNCATE(SUM(CASE WHEN ODIH.SELL_FEE_AMT > 0 THEN
+		                             CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
+		                                  ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		                             END
+		                         ELSE
+		                             ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
 		                    END) / 1.1,0)              AS SUPPLY_AMT             /*공급가액*/
-		     , SUM(CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
-		                ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
-		           END) - (TRUNCATE(SUM(CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
-		                                     ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
-		                                END) / 1.1,0)) AS TAX_AMT                /*세액*/
+		     , SUM(CASE WHEN ODIH.SELL_FEE_AMT > 0 THEN
+		                    CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
+		                         ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		                    END
+		                ELSE
+		                    ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		           END) - TRUNCATE(SUM(CASE WHEN ODIH.SELL_FEE_AMT > 0 THEN
+		                                        CASE WHEN ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) <![CDATA[<]]> 0 THEN 0
+		                                             ELSE ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		                                        END
+		                                    ELSE
+		                                        ODIH.SELL_FEE_AMT - (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)
+		                               END) / 1.1,0)   AS TAX_AMT                /*세액*/
 		     , SUM(ODIH.DELV_FEE)                      AS DELV_FEE               /*배송비*/
 		     , #{regNo}                                AS REG_NO
 		     , NOW()                                   AS REG_DT
@@ -261,7 +284,7 @@
 		             , SUM(ODIH.SELL_QTY)                           AS SELL_QTY                /*판매수량*/
 		             , 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 /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
+		                   - ODIH.TMTB_DC_AMT)                      AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
 		             , ROUND(SUM((ODIH.SELL_AMT
 		                          - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		                          - ODIH.TMTB_DC_AMT
@@ -276,15 +299,15 @@
 		             , SUM(ODIH.SUPPLY_COMP_TMTB_DC_AMT)            AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
 		             , 0                                            AS DELV_FEE                /*배송비*/
 		        FROM   (
-		                SELECT ODIH.REG_DT                                                          AS OCCUR_DT                /*발생일시*/
-		                     , OD.SUPPLY_COMP_CD                                                                               /*공급업체코드*/
+		                SELECT ODIH.REG_DT                                                                      AS OCCUR_DT                /*발생일시*/
+		                     , OD.SUPPLY_COMP_CD                                                                                           /*공급업체코드*/
 		                     , (CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20' THEN 1 ELSE -1 END)
 		                       *
 		                       CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20'/*판매-배송중*/ 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_20' THEN 1 ELSE -1 END)
 		                       *
 		                       CAST(CASE WHEN ODIH.ORD_DTL_STAT = 'G720_20'/*판매-배송중*/ THEN
@@ -299,27 +322,31 @@
 		                                                                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 /*입점다다익선분담액*/
-		                     , ((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_20',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
+		                     , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.GOODS_CPN_DC_AMT                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액*/
+		                     , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/
+		                     , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * ODIH.PNT_DC_AMT                         AS PNT_DC_AMT              /*포인트사용금액*/
+		                     , IF(ODIH.ORD_DTL_STAT = 'G720_20',1,-1) * (ODIH.TMTB1_DC_AMT + ODIH.TMTB2_DC_AMT) AS TMTB_DC_AMT             /*다다익선할인금액*/
+		                     , IF(ODIH.ORD_DTL_STAT = 'G720_20',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_20',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_20',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_20',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           /*판매수수료율*/
 		                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
@@ -698,8 +725,7 @@
 		                      , -1 * SUM(CASE WHEN OCCUR_GB IN ('G074_12','G074_19') THEN GFCD_AMT ELSE 0 END) AS USE_GFCD_AMT  /*사용금액*/
 		                      , SUM(CASE WHEN OCCUR_GB IN ('G074_13','G074_18') THEN GFCD_AMT ELSE 0 END)      AS CNCL_GFCD_AMT /*취소금액*/
 		                 FROM   TB_CUST_GIFTCARD_HST
-		                 WHERE  CUST_GFCD_SQ = 16
-		                 AND    REG_DT <![CDATA[>=]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
+		                 WHERE  REG_DT <![CDATA[>=]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
 		                 AND    REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
 		                 GROUP  BY CUST_NO, CUST_GFCD_SQ
 		                ) CGH1 ON CG.CUST_NO = CGH1.CUST_NO
@@ -710,8 +736,7 @@
 		                      , CUST_GFCD_SQ
 		                      , -1 * SUM(GFCD_AMT) AS PREV_USE_GFCD_AMT
 		                 FROM   TB_CUST_GIFTCARD_HST
-		                 WHERE  CUST_GFCD_SQ = 16
-		                 AND    REG_DT <![CDATA[<]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
+		                 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

src/main/webapp/WEB-INF/views/order/CnclCompleteView.html

@@ -438,21 +438,6 @@ $(document).ready(function() {
 	// 2.1 TOTAL ROWS 없애기
 	gagaAgGrid.hideStatusBar('gridCnclRtnCompleteList');
 
-	// 3. 무통장입금아닌경우 환불계좌 그리드 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
-	} else {
-		// 2021.08.04 무통장입금전 취소이면 미노출
-		if (payStat == 'G016_10') {
-			$('#refundAccount').addClass("off");
-		} else {
-			$("#refundAccount .bankNm").text(raBankNm);
-			$("#refundAccount .bankCd").text(raBank);
-			$("#refundAccount .accountNo").text(raNo);
-			$("#refundAccount .accountNm").text(raNm);
-		}
-	}
-	
 	// 2021.08.04 AS-IS 데이타 처리
 	if (cnclRtnCompleteList != null) {
 		addPayCost				= cnclRtnCompleteList[0].addPayCost;		// 추가배송비
@@ -603,6 +588,21 @@ $(document).ready(function() {
 		$("#gridCnclRtnCompleteList").hide();
 	}
 	
+	// 3. 무통장입금아닌경우 환불계좌 그리드 숨김처리
+	if (payMeans !== 'G014_20') {
+		$('#refundAccount').addClass("off");
+	} else {
+		// 2021.08.04 무통장입금전 취소이면 미노출
+		if (payStat == 'G016_10') {
+			$('#refundAccount').addClass("off");
+		} else {
+			$("#refundAccount .bankNm").text(raBankNm);
+			$("#refundAccount .bankCd").text(raBank);
+			$("#refundAccount .accountNo").text(raNo);
+			$("#refundAccount .accountNm").text(raNm);
+		}
+	}
+	
 	// 4. 변경사유설정
 	$("#chgReasonNm").text(chgReasonNm);
 	$("#chgMemo").text(chgMemo);

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -39,8 +39,10 @@
 					<!-- 2021.07.22 선발송 처리 시 교환철회 불가 처리 -->
 					<th:block th:if="${wdBfSendYn == 'N'}">
 						<!-- 2021.07.22 택배사 회수 불가 시 회수요청상태에서 교환철회 처리 -->
+						<!-- 2021.10.01 card007 CS 요청으로 상품검수중까지 교환철회 오픈 처리 -->
 						<!-- <button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (recallExceptionInfo != null and (chgStat == 'G685_30' or chgStat == 'G685_31'))}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button> -->
-						<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or chgStat == 'G685_22' or (chgStat == 'G685_30' and (canRequestCancelYn == 'Y' or recallExceptionInfo != null)) or (chgStat == 'G685_31' and recallExceptionInfo != null)}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
+						<!-- <button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or chgStat == 'G685_22' or (chgStat == 'G685_30' and (canRequestCancelYn == 'Y' or recallExceptionInfo != null)) or (chgStat == 'G685_31' and recallExceptionInfo != null)}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button> -->
+						<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or chgStat == 'G685_22' or chgStat == 'G685_30' or chgStat == 'G685_31'}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
 					</th:block>
 					<th:block th:if="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}">
 						<!-- 선발송 처리 시 교TO교 접수 불가 처리 -->

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -1770,6 +1770,7 @@ $(document).ready(function() {
 	// 5. 반품신청, 반품철회 버튼 제어
 	if (ordChgSq > 0) {
 		$("#rtnReqBtn").css("display", "none");
+		$("#rtnReqCancelBtn").css("display", "none");
 		
 		// 2021.05.25 반품접수, 반품대기 상태에서만 철회가능
 		// 2021.07.13 회수예외정보가 있고 회수요청, 상품검수중 상태에서 철회 가능 처리
@@ -1782,12 +1783,17 @@ $(document).ready(function() {
 		//}
 		
 		// 회수요청 상태에서 택배사 회수 불가 or 회수예외정보 존재 시 반품철회 가능
-		if (chgStat == 'G685_30' && (recallExceptionInfo != null || canRequestCancelYn == 'Y')) {
-			$("#rtnReqCancelBtn").css("display", "");
-		}
+		//if (chgStat == 'G685_30' && (recallExceptionInfo != null || canRequestCancelYn == 'Y')) {
+		//	$("#rtnReqCancelBtn").css("display", "");
+		//}
 		
 		// 상품검수중 상태에서 회수예외정보 존재 시 반품철회 가능
-		if (chgStat == 'G685_31' && recallExceptionInfo != null) {
+		//if (chgStat == 'G685_31' && recallExceptionInfo != null) {
+		//	$("#rtnReqCancelBtn").css("display", "");
+		//}
+		
+		// 2021.10.01 card007 CS요청으로 반품접수, 반품대기, 회수요청, 상품검수중 상태에서 반품철회 가능
+		if (chgStat == 'G685_50' || chgStat == 'G685_51' || chgStat == 'G685_30' || chgStat == 'G685_31') {
 			$("#rtnReqCancelBtn").css("display", "");
 		}
 		

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

@@ -206,47 +206,58 @@
 		},
 		{
 			headerName: "쿠폰할인금액", field: "cpnDcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.data.cpn1DcAmt + params.data.goodsCpnDcAmt + params.data.cartCpnDcAmt); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "즉시사용쿠폰금액", field: "cpn1DcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "상품쿠폰사용금액", field: "goodsCpnDcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "주문서쿠폰사용금액", field: "cartCpnDcAmt", width: 130, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "포인트사용금액", field: "pntDcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "다다익선할인금액", field: "tmtbDcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "자사다다익선분담액", field: "selfTmtbDcAmt", width: 150, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "입점다다익선분담액", field: "supplyCompTmtbDcAmt", width: 150, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "상품권사용금액", field: "gfcdUseAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},	
 		{
 			headerName: "자사쿠폰분담액", field: "selfCpnDcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "입점쿠폰분담액", field: "supplyCompCpnDcAmt", width: 120, cellClass: 'text-right',
-			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
 			headerName: "실판매가", field: "realSellPrice", width: 100, cellClass: 'text-right',