수정

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

@@ -5,67 +5,68 @@
 	<!-- 상품정산 목록 -->
 	<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_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_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                                                /*입점쿠폰분담액*/
 		     , 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)
 		       - 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 SETTLE_AMT             /*정산대상액(실판매금액 - 수수료)*/
+		               ) * (ODIH.SELL_FEE_RATE / 100),0)
+		       + (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT) AS SETTLE_AMT             /*정산대상액(실판매금액 - 수수료 + 자사다다익선분담액 + 자사쿠폰분담액)*/
 		FROM   (
 		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                        /*주문상세단품이력일련번호*/
 		             , ODIH.ORD_NO                                                                                     /*주문번호*/
@@ -115,9 +116,19 @@
 		             , (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_AMT - ODIH.CNCL_RTN_AMT + ODIH.CPN1_DC_AMT
+		                             ((ODIH.ORD_QTY - ODIH.CNCL_RTN_QTY) * (CASE WHEN O.MALL_GB = 'G011_20' /*제휴몰*/ THEN
+		                                                                             IFNULL(EUP.USAC_PRICE,ODIH.ITEM_PRICE)
+		                                                                         ELSE
+		                                                                             ODIH.ITEM_PRICE
+		                                                                    END))
+		                             + ODIH.CPN1_DC_AMT
 		                         ELSE /*환입-반품완료,환입-교환완료*/
-		                             ODIH.CNCL_RTN_AMT + ODIH.CPN1_DC_AMT
+		                             (ODIH.CNCL_RTN_QTY * (CASE WHEN O.MALL_GB = 'G011_20' /*제휴몰*/ THEN
+		                                                            IFNULL(EUP.USAC_PRICE,ODIH.ITEM_PRICE)
+		                                                        ELSE
+		                                                            ODIH.ITEM_PRICE
+		                                                   END))
+		                             + ODIH.CPN1_DC_AMT
 		                    END AS SIGNED INT)                                              AS SELL_AMT                /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
 		             , ODIH.CPN1_DC_AMT                                                                                /*즉시사용쿠폰금액*/
 		             , ODIH.GOODS_CPN_DC_AMT                                                                           /*상품쿠폰사용금액*/

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

@@ -125,9 +125,10 @@
 					<div class="iconTooltip marL10">
 						<i class="fa fa-info" aria-hidden="true"></i>
 						<span class="left" style="width: 600px;">
-							<strong>1.쿠폰할인금액</strong>: 즉시할인쿠폰금액 + 상품쿠폰할인금액 + 장바구니쿠폰할인금액<br/>
-							<strong>2.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/>
-							<strong>3.정산대상액</strong>: 상품총액 - 수수료
+							<strong>1.판매총액</strong>: 몰판매가 * 판매수량<br/>
+							<strong>2.쿠폰할인금액</strong>: 즉시할인쿠폰금액 + 상품쿠폰할인금액 + 장바구니쿠폰할인금액<br/>
+							<strong>3.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/>
+							<strong>4.정산대상액</strong>: 상품총액 - 수수료 + 자사쿠폰분담액 + 자사다다익선분담액
 						</span>
 					</div>
 					<!-- //아이콘 툴팁 -->
@@ -201,6 +202,10 @@
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
+		{
+			headerName: "쿠폰할인금액", field: "cpnDcAmt", width: 120, cellClass: 'text-right',
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.data.cpn1DcAmt + params.data.goodsCpnDcAmt + params.data.cartCpnDcAmt); }
+		},
 		{
 			headerName: "즉시사용쿠폰금액", field: "cpn1DcAmt", width: 120, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
@@ -217,10 +222,10 @@
 			headerName: "포인트사용금액", field: "pntDcAmt", width: 120, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
-// 		{
-// 			headerName: "다다익선할인금액", field: "tmtbDcAmt", width: 120, cellClass: 'text-right',
-// 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
-// 		},
+		{
+			headerName: "다다익선할인금액", field: "tmtbDcAmt", width: 120, cellClass: 'text-right',
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
+		},
 		{
 			headerName: "자사다다익선분담액", field: "selfTmtbDcAmt", width: 150, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }

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

@@ -71,7 +71,7 @@
 					<div class="iconTooltip marL10">
 						<i class="fa fa-info" aria-hidden="true"></i>
 						<span class="left" style="width: 600px;">
-							<strong>1.계산서발행금액</strong>: ROUND(수수료 - 자사쿠폰분담액, 0) (< 0 인 경우 0으로 표기)<br/>
+							<strong>1.계산서발행금액</strong>: ROUND(수수료 - (자사쿠폰분담액 + 자사다다익선분담액), 0) (< 0 인 경우 0으로 표기)<br/>
 							<strong>2.공급가액</strong>: INT(계산서발행금액 / 1.1)<br/>
 							<strong>3.세액</strong>: 계산서발행금액 - 공급가액<br/>
 							<strong>4.지급금액</strong>: 계산서발행금액 + 배송비 - 기타차감<br/>
@@ -128,7 +128,7 @@
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
-			headerName: "판매총액", field: "realSellAmt", width: 100, cellClass: 'text-right',
+			headerName: "상품총액", field: "realSellAmt", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
@@ -153,17 +153,17 @@
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
-			headerName: "다다익선할인금액", field: "tmtbDcAmt", width: 100, cellClass: 'text-right',
+			headerName: "다다익선할인금액", field: "tmtbDcAmt", width: 120, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
-			headerName: "자사다다익선분담액", field: "selfTmtbDcAmt", width: 100, cellClass: 'text-right',
+			headerName: "자사다다익선분담액", field: "selfTmtbDcAmt", width: 150, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
 		{
-			headerName: "입점다다익선분담액", field: "supplyCompTmtbDcAmt", width: 120, cellClass: 'text-right',
+			headerName: "입점다다익선분담액", field: "supplyCompTmtbDcAmt", width: 150, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},