Просмотр исходного кода

입점업체정산 공급업체 -> 공급벤더로 변경

gagamel 4 лет назад
Родитель
Сommit
bef3160949

+ 1 - 0
src/main/java/com/style24/persistence/domain/SupplyCompFee.java

@@ -18,6 +18,7 @@ public class SupplyCompFee extends TscBaseDomain {
 	private Integer ordNo;				// 주문번호
 	private Integer ordDtlNo;			// 주문상세번호
 	private String supplyVendorCd;		// 공급벤더코드
+	private String supplyVendorNm;		// 공급벤더명
 	private String supplyCompCd;		// 공급업체코드
 	private String supplyCompNm;		// 공급업체명
 	private String settleDay;			// 정산주기

+ 54 - 26
src/main/java/com/style24/persistence/mybatis/shop/TssSettle.xml

@@ -72,6 +72,8 @@
 		/* TsaSettle.getSupplyCompanyGoodsFeeList */
 		SELECT ODIH.ORD_NO                                                                /*주문번호*/
 		     , ODIH.ORD_DTL_NO                                                            /*주문상세번호*/
+		     , ODIH.SUPPLY_VENDOR_CD                                                      /*공급벤더코드*/
+		     , ODIH.SUPPLY_VENDOR_NM                                                      /*공급벤더명*/
 		     , ODIH.SUPPLY_COMP_CD                                                        /*공급업체코드*/
 		     , ODIH.SUPPLY_COMP_NM                                                        /*공급업체명*/
 		     , ODIH.SETTLE_DAY                                                            /*정산주기*/
@@ -125,10 +127,12 @@
 		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                        /*주문상세단품이력일련번호*/
 		             , ODIH.ORD_NO                                                                                     /*주문번호*/
 		             , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
+		             , SC.SUPPLY_VENDOR_CD                                                                             /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM                                                                             /*공급벤더명*/
 		             , OD.SUPPLY_COMP_CD                                                                               /*공급업체코드*/
 		             , SC.SUPPLY_COMP_NM                                                                               /*공급업체명*/
-		             , SC.SETTLE_DAY                                                                                   /*정산주기*/
-		             , FN_GET_CODE_NM('G075',SC.SETTLE_DAY)                                 AS SETTLE_DAY_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            /*정산구분명*/
@@ -192,6 +196,7 @@
 		        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
 		        INNER JOIN TB_SUPPLY_COMPANY SC ON OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		        INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		        INNER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
@@ -222,6 +227,8 @@
 	<select id="getSupplyCompanyDeliveryFeeList" parameterType="SupplyCompFee" resultType="SupplyCompFee">
 		/* TsaSettle.getSupplyCompanyDeliveryFeeList */
 		SELECT DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d')       AS OCCUR_DT           /*발생(출고/회수)일시*/
+		     , OD.SUPPLY_VENDOR_CD                                             /*공급벤더코드*/
+		     , OD.SUPPLY_VENDOR_NM                                             /*공급벤더명*/
 		     , OD.SUPPLY_COMP_CD                                               /*공급업체코드*/
 		     , OD.SUPPLY_COMP_NM                                               /*공급업체명*/
 		     , DF.DELV_FEE_GB                                                  /*배송비구분*/
@@ -230,15 +237,18 @@
 		     , SUM(DF.DELV_FEE)                          AS DELV_FEE           /*배송비*/
 		FROM   (
 		        SELECT DISTINCT
-		               ODIH.REG_DT       AS OCCUR_DT  /*발생일시*/
-		             , OD.SUPPLY_COMP_CD              /*공급업체코드*/
-		             , SC.SUPPLY_COMP_NM              /*공급업체명*/
-		             , ODIH.ORD_NO                    /*주문번호*/
-		             , ODIH.ORD_DTL_STAT AS SETTLE_GB /*정산구분*/
+		               ODIH.REG_DT         AS OCCUR_DT  /*발생일시*/
+		             , SC.SUPPLY_VENDOR_CD              /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM              /*공급벤더명*/
+		             , OD.SUPPLY_COMP_CD                /*공급업체코드*/
+		             , SC.SUPPLY_COMP_NM                /*공급업체명*/
+		             , ODIH.ORD_NO                      /*주문번호*/
+		             , ODIH.ORD_DTL_STAT   AS SETTLE_GB /*정산구분*/
 		        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_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		        INNER JOIN TB_SUPPLY_COMPANY SC ON OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		        INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		        WHERE  1 = 1
 		        AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{salesStdt},'%Y-%m-%d')
 		        AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{salesEddt},'%Y-%m-%d'), INTERVAL 1 DAY)
@@ -247,25 +257,27 @@
 		        <if test="supplyCompCd != null and supplyCompCd != ''">
 		        AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		        </if>
-			   ) OD
-			 , TB_DELIVERY_FEE DF
+		       ) OD
+		     , TB_DELIVERY_FEE DF
 		WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
 		AND    OD.ORD_NO = DF.ORD_NO
 		AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
 		GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d')
+		        , OD.SUPPLY_VENDOR_CD
+		        , OD.SUPPLY_VENDOR_NM
 		        , OD.SUPPLY_COMP_CD
 		        , OD.SUPPLY_COMP_NM
 		        , DF.DELV_FEE_GB
 		        , OD.ORD_NO
-		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
+		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), OD.SUPPLY_VENDOR_CD, OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
 	</select>
 	
 	<!-- 입점업체 정산확정 목록 -->
 	<select id="getSupplyCompanyFeeConfirmList" parameterType="SupplyCompFee" resultType="SupplyCompFee">
 		/* TsaSettle.getSupplyCompanyFeeConfirmList */
 		SELECT U.USAC_YM                                                                                                 /*정산연월*/
-		     , U.SUPPLY_COMP_CD                                                                                          /*공급업체코드*/
-		     , SC.SUPPLY_COMP_NM                                                                                         /*공급업체명*/
+		     , U.SUPPLY_VENDOR_CD                                                                                        /*공급벤더코드*/
+		     , SV.SUPPLY_VENDOR_NM                                                                                       /*공급벤더명*/
 		     , U.SELL_QTY                                                                                                /*판매수량*/
 		     , U.REAL_SELL_AMT                                                                                           /*실판매금액(=상품총액)*/
 		     , U.SELL_FEE_AMT                                                                                            /*수수료*/
@@ -286,25 +298,41 @@
 		     , (U.REAL_SELL_AMT - U.SELL_FEE_AMT + U.SELF_CPN_DC_AMT + U.SELF_TMTB_DC_AMT)
 		       + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)
 		       - IFNULL(UR1.RECEIVABLE_AMT,0)                                                          AS TOT_GIVE_AMT   /*총지급금액*/
-		FROM   TB_USAC U
-		INNER JOIN TB_SUPPLY_COMPANY SC ON U.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
-		INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+		FROM   (
+		        SELECT DATE_FORMAT(U.USAC_DT,'%Y%m')                    AS USAC_YM                 /*정산연월*/
+		             , U.SUPPLY_VENDOR_CD                                                          /*공급벤더코드*/
+		             , SUM(U.SELL_QTY)                                  AS SELL_QTY                /*판매수량*/
+		             , 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              /*쿠폰할인금액*/
+		             , SUM(U.SELF_CPN_DC_AMT)                           AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , SUM(U.SUPPLY_COMP_CPN_DC_AMT)                    AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		             , SUM(U.TMTB_DC_AMT)                               AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , SUM(U.SELF_TMTB_DC_AMT)                          AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		             , SUM(U.SUPPLY_COMP_TMTB_DC_AMT)                   AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		             , SUM(U.BILL_AMT)                                  AS BILL_AMT                /*계산서발행금액*/
+		             , SUM(U.SUPPLY_AMT)                                AS SUPPLY_AMT              /*공급금액*/
+		             , SUM(U.TAX_AMT)                                   AS TAX_AMT                 /*세액*/
+		             , SUM(U.DELV_FEE)                                  AS DELV_FEE                /*배송비*/
+		        FROM   TB_USAC U
+		        WHERE  1 = 1
+		        AND    U.USAC_DT <![CDATA[>=]]> REPLACE(CONCAT(#{settleYm},'-01'),'-','')
+		        AND    U.USAC_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
+		        AND    U.SUPPLY_VENDOR_CD = #{supplyVendorCd}
+		        GROUP  BY DATE_FORMAT(U.USAC_DT,'%Y%m'), U.SUPPLY_VENDOR_CD
+		       ) U
+		INNER JOIN TB_SUPPLY_VENDOR SV ON U.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		LEFT OUTER JOIN TB_USAC_RECEIVE UR1 ON U.USAC_YM = UR1.USAC_YM
-		                                   AND U.SUPPLY_COMP_CD = UR1.SUPPLY_COMP_CD
+		                                   AND U.SUPPLY_VENDOR_CD = UR1.SUPPLY_VENDOR_CD
 		LEFT OUTER JOIN (
-		                 SELECT OCCUR_YM        AS USAC_YM
-		                      , SUPPLY_COMP_CD
-		                      , SUM(REWARD_AMT) AS ETC_DEDUCT_AMT
+		                 SELECT OCCUR_YM         AS USAC_YM
+		                      , SUPPLY_VENDOR_CD
+		                      , SUM(REWARD_AMT)  AS ETC_DEDUCT_AMT
 		                 FROM   TB_USAC_DEDUCT
 		                 WHERE  OCCUR_YM = REPLACE(#{settleYm},'-','')
-		                 GROUP  BY OCCUR_YM, SUPPLY_COMP_CD
+		                 GROUP  BY OCCUR_YM, SUPPLY_VENDOR_CD
 		                ) UR2 ON U.USAC_YM = UR2.USAC_YM
-		                     AND U.SUPPLY_COMP_CD = UR2.SUPPLY_COMP_CD
-		WHERE  U.USAC_YM = REPLACE(#{settleYm},'-','')
-		AND    SV.SUPPLY_VENDOR_CD = #{supplyVendorCd}
-		<if test="supplyCompCd != null and supplyCompCd != ''">
-		AND    U.SUPPLY_COMP_CD = #{supplyCompCd}
-		</if>
+		                     AND U.SUPPLY_VENDOR_CD = UR2.SUPPLY_VENDOR_CD
 	</select>
 
 </mapper>

+ 2 - 1
src/main/webapp/WEB-INF/views/settle/SupplyCompanyDelvFeeForm.html

@@ -78,7 +78,8 @@
 /*<![CDATA[*/
 	let columnDefs = [
 		{ headerName: "발생(출고/회수)일자", field: "occurDt", width: 150, cellClass: 'text-center' },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 200, cellClass: 'text-center' },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 200, cellClass: 'text-center' },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 200, cellClass: 'text-center' },
 		{ headerName: "배송비구분", field: "delvFeeGbNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
 		{

+ 13 - 11
src/main/webapp/WEB-INF/views/settle/SupplyCompanyFeeConfirmForm.html

@@ -31,8 +31,8 @@
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col style="width:10%;"/>
-						<col style="width:25%;"/>
-						<col style="width:10%;"/>
+<!-- 						<col style="width:25%;"/> -->
+<!-- 						<col style="width:10%;"/> -->
 						<col/>
 					</colgroup>
 					<tr>
@@ -41,13 +41,13 @@
 							<input type="text" class="schMonth w60" name="settleYm" id="settleYm" maxlength="7" required="required"/>
 							<button type="button" class="btn icn schBtn" data-id="settleYm"><i class="fa fa-calendar" aria-hidden="true"></i></button>
 						</td>
-						<th>공급업체</th>
-						<td>
-							<select name="supplyCompCd">
-								<option value="">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
+<!-- 						<th>공급업체</th> -->
+<!-- 						<td> -->
+<!-- 							<select name="supplyCompCd"> -->
+<!-- 								<option value="">[전체]</option> -->
+<!-- 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option> -->
+<!-- 							</select> -->
+<!-- 						</td> -->
 					</tr>
 				</table>
 				
@@ -96,8 +96,10 @@
 /*<![CDATA[*/
 	let columnDefs = [
 		{ headerName: "정산연월", field: "usacYm", width: 80, cellClass: 'text-center', hide: true },
-		{ headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center', hide: true },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 200 },
+		{ headerName: "공급벤더코드", field: "supplyVendorCd", width: 100, cellClass: 'text-center', hide: true },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 200 },
+// 		{ headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center', hide: true },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 200 },
 		{
 			headerName: "판매수량", field: "sellQty", width: 100, cellClass: 'text-center',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },

+ 2 - 1
src/main/webapp/WEB-INF/views/settle/SupplyCompanyGoodsFeeForm.html

@@ -92,7 +92,8 @@
 	let columnDefs = [
 		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
 		{ headerName: "주문상세번호", field: "ordDtlNo", width: 150, cellClass: 'text-center' },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 150, cellClass: 'text-center' },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "정산주기", field: "settleDayNm", width: 100, cellClass: 'text-center' },
 		{ headerName: "주문일시", field: "ordDt", width: 150, cellClass: 'text-center' },
 		{ headerName: "정산구분", field: "settleGbNm", width: 100, cellClass: 'text-center' },