Merge branch 'develop' into card007

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

@@ -60,7 +60,7 @@ public class GoodsSettle extends TscBaseDomain {
 	private int realSellPrice;			// 실판매가
 	private int realSellAmt;			// 실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)
 	private double sellFeeRate;			// 판매수수료율
-	private int sellFeeAmt;				// 수수료(실판매금액 * 판매수수료율)
+	private int sellFeeAmt;				// 수수료(판매금액 * 판매수수료율)
 	private int settleAmt;				// 정산대상액(실판매금액 - 수수료)
 
 	// 검색조건

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

@@ -25,8 +25,9 @@ public class SettleConfirm extends TscBaseDomain {
 	private String settleDay;			// 정산일(매월)
 	private String settleDayNm;			// 정산주기명
 	private int sellQty;				// 판매수량
-	private int realSellAmt;			// 판매금액(CPN1_DC_AMT가 빠진 금액이 들어가 있음)
-	private int sellFeeAmt;				// 수수료(실판매금액 * 판매수수료율)
+	private int sellAmt;				// 판매금액(=판매총액)
+	private int realSellAmt;			// 실판매금액(=상품총액)
+	private int sellFeeAmt;				// 수수료(판매금액 * 판매수수료율)
 	private int cpnDcAmt;				// 쿠폰할인금액
 	private int selfCpnDcAmt;			// 자사쿠폰분담액
 	private int supplyCompCpnDcAmt;		// 입점쿠폰분담액

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

@@ -60,17 +60,11 @@
 		       - (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                                                                              /*판매수수료율*/
-		     , 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            /*수수료*/
+		     , ROUND(ODIH.SELL_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)
+		       - ROUND(ODIH.SELL_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                                                                                    /*주문상세단품이력일련번호*/
@@ -222,6 +216,7 @@
 		       USAC_DT
 		     , SUPPLY_VENDOR_CD
 		     , SELL_QTY
+		     , SELL_AMT
 		     , REAL_SELL_AMT
 		     , SELL_FEE_AMT
 		     , CPN_DC_AMT
@@ -240,6 +235,7 @@
 		SELECT ODIH.USAC_DT                                                       /*정산일*/
 		     , SC.SUPPLY_VENDOR_CD                                                /*공급벤더코드*/
 		     , SUM(ODIH.SELL_QTY)                      AS SELL_QTY                /*판매수량*/
+		     , SUM(ODIH.SELL_AMT)                      AS SELL_AMT                /*판매금액(=판매총액)*/
 		     , SUM(ODIH.REAL_SELL_AMT)                 AS REAL_SELL_AMT           /*실판매금액(=상품총액)*/
 		     , SUM(ODIH.SELL_FEE_AMT)                  AS SELL_FEE_AMT            /*수수료*/
 		     , SUM(ODIH.CPN_DC_AMT)                    AS CPN_DC_AMT              /*쿠폰할인금액*/
@@ -279,25 +275,23 @@
 		     , #{regNo}                                AS REG_NO
 		     , NOW()                                   AS REG_DT
 		FROM   (
-		        SELECT DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m%d')          AS USAC_DT                 /*정산일*/
-		             , ODIH.SUPPLY_COMP_CD                                                     /*공급업체코드*/
-		             , SUM(ODIH.SELL_QTY)                           AS SELL_QTY                /*판매수량*/
+		        SELECT DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m%d')                      AS USAC_DT                 /*정산일*/
+		             , ODIH.SUPPLY_COMP_CD                                                                 /*공급업체코드*/
+		             , SUM(ODIH.SELL_QTY)                                       AS SELL_QTY                /*판매수량*/
+		             , SUM(ODIH.SELL_AMT)                                       AS SELL_AMT                /*판매금액(=판매총액)*/
 		             , 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           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
-		             , 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.TMTB_DC_AMT)                                  AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
+		             , SUM(ROUND(ODIH.SELL_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              /*쿠폰할인금액*/
-		             , SUM(ODIH.SELF_CPN_DC_AMT)                    AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
-		             , SUM(ODIH.SUPPLY_COMP_CPN_DC_AMT)             AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
-		             , 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 /*입점다다익선분담액*/
-		             , 0                                            AS DELV_FEE                /*배송비*/
+		                   ODIH.CART_CPN_DC_AMT)                                AS CPN_DC_AMT              /*쿠폰할인금액*/
+		             , SUM(ODIH.SELF_CPN_DC_AMT)                                AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , SUM(ODIH.SUPPLY_COMP_CPN_DC_AMT)                         AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		             , 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 /*입점다다익선분담액*/
+		             , 0                                                        AS DELV_FEE                /*배송비*/
 		        FROM   (
 		                SELECT ODIH.REG_DT                                                                      AS OCCUR_DT                /*발생일시*/
 		                     , OD.SUPPLY_COMP_CD                                                                                           /*공급업체코드*/
@@ -376,6 +370,7 @@
 		        SELECT DATE_FORMAT(OD.OCCUR_DT,'%Y%m%d') AS USAC_DT                 /*정산일*/
 		             , OD.SUPPLY_COMP_CD                                            /*공급업체코드*/
 		             , 0                                 AS SELL_QTY                /*판매수량*/
+		             , 0                                 AS SELL_AMT                /*판매금액(=판매총액)*/
 		             , 0                                 AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
 		             , 0                                 AS SELL_FEE_AMT            /*수수료*/
 		             , 0                                 AS CPN_DC_AMT              /*쿠폰할인금액*/
@@ -486,6 +481,7 @@
 		     , SV.SETTLE_DAY                                                                                             /*정산주기*/
 		     , FN_GET_CODE_NM('G075',SV.SETTLE_DAY)                                                     AS SETTLE_DAY_NM /*정산주기명*/
 		     , U.SELL_QTY                                                                                                /*판매수량*/
+		     , U.SELL_AMT                                                                                                /*판매금액(=판매총액)*/
 		     , U.REAL_SELL_AMT                                                                                           /*실판매금액(=상품총액)*/
 		     , U.SELL_FEE_AMT                                                                                            /*수수료*/
 		     , U.CPN_DC_AMT                                                                                              /*쿠폰할인금액*/
@@ -522,6 +518,7 @@
 		        SELECT DATE_FORMAT(U.USAC_DT,'%Y%m')                    AS USAC_YM                 /*정산연월*/
 		             , U.SUPPLY_VENDOR_CD                                                          /*공급벤더코드*/
 		             , SUM(U.SELL_QTY)                                  AS SELL_QTY                /*판매수량*/
+		             , SUM(U.SELL_AMT)                                  AS SELL_AMT                /*판매금액(=판매총액)*/
 		             , SUM(U.REAL_SELL_AMT)                             AS REAL_SELL_AMT           /*실판매금액(=상품총액)*/
 		             , SUM(U.SELL_FEE_AMT)                              AS SELL_FEE_AMT            /*수수료*/
 		             , SUM(U.CPN_DC_AMT)                                AS CPN_DC_AMT              /*쿠폰할인금액*/

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

@@ -127,16 +127,12 @@
 						<span class="left" style="width: 600px;">
 							<strong>1.판매총액</strong>: 정산판매가 * 판매수량<br/>
 							<strong>2.쿠폰할인금액</strong>: 즉시할인쿠폰금액 + 상품쿠폰할인금액 + 장바구니쿠폰할인금액<br/>
-							<strong>3.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/>
+<!-- 							<strong>3.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/> -->
+							<strong>3.수수료</strong>: 판매총액 * 판매수수료율(%)<br/>
 							<strong>4.정산대상액</strong>: 상품총액 - 수수료 + 자사쿠폰분담액 + 자사다다익선분담액
 						</span>
 					</div>
 					<!-- //아이콘 툴팁 -->
-<!-- 					<span class="infoTxt cBlue"> -->
-<!-- 						<i class="fa fa-info-circle" aria-hidden="true"></i><strong>1.상품총액</strong>: 실판매가 * 판매수량<br/> -->
-<!-- 						<i class="fa fa-info-circle" aria-hidden="true"></i><strong>2.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/> -->
-<!-- 						<i class="fa fa-info-circle" aria-hidden="true"></i><strong>3.정산대상액</strong>: 상품총액 - 수수료 -->
-<!-- 					</span> -->
 				</li>
 				<li class="right">
 					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
@@ -187,11 +183,11 @@
 		{ headerName: "옵션1", field: "optCd1", width: 100, cellClass: 'text-center' },
 		{ headerName: "옵션2", field: "optCd2", width: 100, cellClass: 'text-center' },
 		{
-			headerName: "정산판매가", field: "mallPrice", width: 100, cellClass: 'text-right',
+			headerName: "판매가", field: "mallPrice", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{
-			headerName: "판매가", field: "sellPrice", width: 100, cellClass: 'text-right',
+			headerName: "정산판매가", field: "sellPrice", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{

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

@@ -134,6 +134,11 @@
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
+		{
+			headerName: "판매총액", field: "sellAmt", width: 100, cellClass: 'text-right',
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
+		},
 		{
 			headerName: "상품총액", field: "realSellAmt", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },