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

Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch into develop

LMC 4 лет назад
Родитель
Сommit
6ec1b4ce8d

+ 4 - 4
src/main/java/com/style24/batch/biz/job/statistics/TsbPayStaticsJob.java

@@ -29,8 +29,8 @@ public class TsbPayStaticsJob extends TsbAbstractJob<String, String, String> {
 	public String process(String result) throws Exception {
 
 		// 기간
-		/*String startDay = "20210601";
-		String endDay = "20210731";
+		/*String startDay = "20180701";
+		String endDay = "20210915";
 		int days = GagaDateUtil.getOffsetDays(endDay, startDay) + 1;
 
 		System.out.println("term === " + days);
@@ -40,8 +40,8 @@ public class TsbPayStaticsJob extends TsbAbstractJob<String, String, String> {
 			System.out.println(currDay);
 
 			statisticsService.createStatPay(currDay);
-		}
-*/
+		}*/
+
 		String toDay = GagaDateUtil.getToday();
 		String currDay = GagaDateUtil.getOffsetDate(toDay, -1, "yyyyMMdd");
 

+ 5 - 5
src/main/java/com/style24/batch/biz/job/statistics/TsbSubPayStaticsJob.java

@@ -29,8 +29,8 @@ public class TsbSubPayStaticsJob extends TsbAbstractJob<String, String, String>
 	public String process(String result) throws Exception {
 
 		// 기간
-		String startDay = "20200101";
-		String endDay = "20210731";
+		/*String startDay = "20180701";
+		String endDay = "20210915";
 		int days = GagaDateUtil.getOffsetDays(endDay, startDay) + 1;
 
 		System.out.println("days === " + days);
@@ -40,12 +40,12 @@ public class TsbSubPayStaticsJob extends TsbAbstractJob<String, String, String>
 			System.out.println(currDay);
 
 			statisticsService.createStatSubPay(currDay);
-		}
+		}*/
 
-		/*String toDay = GagaDateUtil.getToday();
+		String toDay = GagaDateUtil.getToday();
 		String currDay = GagaDateUtil.getOffsetDate(toDay, -1, "yyyyMMdd");
 
-		statisticsService.createStatSubPay(currDay);*/
+		statisticsService.createStatSubPay(currDay);
 
 		return result;
 	}

+ 4 - 4
src/main/java/com/style24/batch/biz/task/TsbStatisticsTask.java

@@ -122,8 +122,8 @@ public class TsbStatisticsTask {
 	@Scheduled(cron = "${cron.statistics.pay.create}")
 	@Async
 	public void payStaticsJob() throws Exception {
-		payStaticsJob.run("payStaticsJob");
-		//payStaticsJob.runById("cron.statistics.pay.create");
+		//payStaticsJob.run("payStaticsJob");
+		payStaticsJob.runById("cron.statistics.pay.create");
 	}
 
 	/**
@@ -133,8 +133,8 @@ public class TsbStatisticsTask {
 	@Scheduled(cron = "${cron.statistics.pay.sub.create}")
 	@Async
 	public void subPayStaticsJob() throws Exception {
-		subPayStaticsJob.run("subPayStaticsJob");
-		//payStaticsJob.runById("cron.statistics.pay.sub.create");
+		//subPayStaticsJob.run("subPayStaticsJob");
+		payStaticsJob.runById("cron.statistics.pay.sub.create");
 	}
 
 	/**

+ 2 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsbDelivery.xml

@@ -1238,7 +1238,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-반품 /',FN_GET_CODE_NM('G688', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 
@@ -1292,7 +1292,7 @@
 			, G.ORD_NO                                              AS OrderNo
 			, G.ORD_NM                                              AS CustomerName
 			, (SELECT CC.CUST_ID FROM TB_CUSTOMER CC WHERE CC.CUST_NO = G.CUST_NO) AS LoginId
-			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[고객]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
+			, CASE WHEN (SELECT COUNT(*) FROM TB_USER U WHERE U.USER_NO = A.REG_NO ) > 0 THEN CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO,'/',(SELECT R.USER_NM FROM TB_USER R WHERE R.USER_NO = A.REG_NO )) ELSE CONCAT('[C/S]-교환 /',FN_GET_CODE_NM('G689', A.CHG_REASON),'/',A.CHG_MEMO) END   AS CSMemo
 			, A.UPD_DT                                              AS DateCSMemoUpdated
 			, 0                                                     AS IsDeleted
 			, ''                                                    AS DeliveryAddrNew 

+ 10 - 177
src/main/java/com/style24/persistence/mybatis/shop/TsbGoods.xml

@@ -489,6 +489,7 @@
 	<sql id="getGoodsBenefitList_sql">
 		WITH CTE AS (
 		    SELECT CPN_REFVAL_SQ
+		         , CP.CPN_ID
 		    FROM   TB_COUPON CP
 		    INNER  JOIN TB_COUPON_REFVAL CPR 
 		    ON     CP.CPN_ID = CPR.CPN_ID
@@ -576,18 +577,19 @@
 				     , G1.GOODS_CD
 				FROM   CTE CP
 				INNER  JOIN TB_COUPON_REFVAL CPR1 
-				ON     CP.CPN_REFVAL_SQ = CPR1.CPN_REFVAL_SQ
+				ON     CP.CPN_ID = CPR1.CPN_ID
 				INNER  JOIN TB_GOODS G1 
 				ON     CPR1.REF_VAL = G1.BRAND_CD
 				AND    CPR1.CPN_TARGET = 'G260_12'
 				INNER  JOIN TB_COUPON_REFVAL CPR2 
-				ON     CP.CPN_REFVAL_SQ = CPR2.CPN_REFVAL_SQ
+				ON     CP.CPN_ID = CPR2.CPN_ID
 				INNER  JOIN TB_GOODS G2
 				ON     CPR2.REF_VAL = G2.SUPPLY_COMP_CD
 				AND    CPR2.CPN_TARGET = 'G260_13'
 				WHERE  1=1
 				AND    IFNULL(CPR1.REF_FORMAL_GB, G1.FORMAL_GB) = G1.FORMAL_GB
 				AND    CPR1.CPN_ID = CPR2.CPN_ID
+				AND    G1.GOODS_CD = G2.GOODS_CD
 		 )
 		SELECT GOODS_CD
 		     , 'G100_00' AS CUST_GB
@@ -663,184 +665,12 @@
 		    , CUST_GB
 	</sql>
 
-	<!-- 상품 혜택가 목록 -->
-	<sql id="getGoodsBenefitList_sql_org">
-		SELECT GOODS_CD
-		       , 'G100_00' AS CUST_GB
-		       , CURR_PRICE
-		       , MIN(
-		           ( CASE WHEN DC_WAY = 'G240_10' THEN
-		                 GREATEST(CURR_PRICE - DC_PVAL ,0)
-		            ELSE
-		                 CURR_PRICE - (FLOOR((CURR_PRICE * DC_PVAL / 100) / #{pointUnit}) * #{pointUnit})
-		            END) )AS PC_CURR_PRICE
-		       , MIN(
-		           ( CASE WHEN DC_WAY = 'G240_10' THEN
-		                 GREATEST(CURR_PRICE - DC_MVAL ,0)
-		            ELSE
-		                 CURR_PRICE - (FLOOR((CURR_PRICE * DC_MVAL / 100) / #{pointUnit}) * #{pointUnit})
-		            END) )AS MO_CURR_PRICE
-		       , MIN(
-		           ( CASE WHEN DC_WAY = 'G240_10' THEN
-		                 GREATEST(CURR_PRICE - DC_AVAL ,0)
-		            ELSE
-		                 CURR_PRICE - (FLOOR((CURR_PRICE * DC_AVAL / 100) / #{pointUnit}) * #{pointUnit})
-		            END) )AS MO_CURR_PRICE
-		       , STAFF_CURR_PRICE
-		       , MIN(
-		           ( CASE WHEN DC_WAY = 'G240_10' THEN
-		                 GREATEST(STAFF_CURR_PRICE - DC_PVAL ,0)
-		            ELSE
-		                 CURR_PRICE - (FLOOR((STAFF_CURR_PRICE * DC_PVAL / 100) / #{pointUnit}) * #{pointUnit})
-		            END) )AS STAFF_PC_CURR_PRICE
-		       , MIN(
-		           ( CASE WHEN DC_WAY = 'G240_10' THEN
-		                 GREATEST(STAFF_CURR_PRICE - DC_MVAL ,0)
-		            ELSE
-		                 CURR_PRICE - (FLOOR((STAFF_CURR_PRICE * DC_MVAL / 100) / #{pointUnit}) * #{pointUnit})
-		            END) )AS STAFF_MO_CURR_PRICE
-		       , MIN(
-		           ( CASE WHEN DC_WAY = 'G240_10' THEN
-		                 GREATEST(STAFF_CURR_PRICE - DC_AVAL ,0)
-		            ELSE
-		                 CURR_PRICE - (FLOOR((STAFF_CURR_PRICE * DC_AVAL / 100) / #{pointUnit}) * #{pointUnit})
-		            END) )AS STAFF_APP_CURR_PRICE
-		FROM   (
-		        SELECT CP.CPN_ID
-		             , CP.CPN_NM
-		             , CP.DC_WAY                                              /*할인방식*/
-		             , CP.DC_PVAL                                             /*PC 할인값*/
-		             , CP.DC_MVAL                                             /*MO 할인값*/
-		             , CP.DC_AVAL                                             /*APP 할인값*/
-		             , CP.CURR_PRICE                                          /*전체 판매가*/
-		             , CP.STAFF_CURR_PRICE                                    /*임직원판매가*/
-		             , CP.GOODS_CD
-		        FROM   (
-		                SELECT CP.CPN_ID    /*쿠폰ID*/
-		                     , CP.CPN_NM    /*쿠폰명*/
-		                     , CP.DC_WAY    /*할인방식*/
-		                     , CP.DC_PVAL   /*PC할인값*/
-		                     , CP.DC_MVAL   /*모바일할인값*/
-		                     , CP.DC_AVAL   /*APP할인값*/
-		                     , G.CURR_PRICE  /*현재판매가*/
-		                     , G.CURR_PRICE AS STAFF_CURR_PRICE  /*현재판매가*/
-		                     , G.GOODS_CD
-		                FROM   TB_GOODS G
-		                     , TB_COUPON CP
-		                WHERE  CP.SITE_CD = 'G000_10'
-		                AND    CP.CPN_STAT = 'G232_11'   -- 쿠폰인 진행중인 쿠폰만
-		                AND    NOW() BETWEEN CP.AVAIL_STDT AND CP.AVAIL_EDDT
-		                AND    CP.CPN_TYPE = 'G230_10' /*즉시할인쿠폰*/
-		                AND    CP.DC_CD_GB = 'G233_00'                         -- 일반유형(할인쿠폰구분)
-		                AND   (
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_10'
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.GOODS_CD
-		                                                   ) > 0
-		                        )
-		                        OR /* 적용대상:카테고리*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_11'
-		                                                   AND DEL_YN = 'N'
-		                                                   AND IFNULL(REF_FORMAL_GB,G.FORMAL_GB) = G.FORMAL_GB
-		                                                   AND IFNULL(REF_BRAND_CD,G.BRAND_CD) = G.BRAND_CD
-		                                                   AND REF_VAL IN (SELECT DISTINCT X.CATE_NO
-		                                                                   FROM
-		                                                                        (SELECT LEAF_CATE_NO
-		                                                                              , CATE_LVL
-		                                                                              , CATE_NO
-		                                                                         FROM (
-		                                                                               SELECT LEAF_CATE_NO ,
-		                                                                                      CASE WHEN X = 1 THEN 'CATE1_NO'  -- 컬럼과 매핑(컬럼명)
-		                                                                                           WHEN X = 2 THEN 'CATE2_NO'
-		                                                                                           WHEN X = 3 THEN 'CATE3_NO'
-		                                                                                           WHEN X = 4 THEN 'CATE4_NO'
-		                                                                                           ELSE  'CATE5_NO'
-		                                                                                      END CATE_LVL,
-		                                                                                      CASE WHEN X = 1 THEN CATE1_NO  -- 컬럼과 매핑(컬럼 데이터)
-		                                                                                           WHEN X = 2 THEN CATE2_NO
-		                                                                                           WHEN X = 3 THEN CATE3_NO
-		                                                                                           WHEN X = 4 THEN CATE4_NO
-		                                                                                           ELSE  CATE5_NO
-		                                                                                      END CATE_NO
-		                                                                               FROM (
-		                                                                                      ( SELECT LEAF_CATE_NO
-		                                                                                             , CATE1_NO
-		                                                                                             , CATE2_NO
-		                                                                                             , CATE3_NO
-		                                                                                             , CATE4_NO
-		                                                                                             , CATE5_NO
-		                                                                                        FROM  TB_CATE_4SRCH
-		                                                                                        WHERE SITE_CD = 'G000_10'
-		                                                                                        AND CATE_TYPE = 'G031_10') A, -- 상품타입
-		                                                                                      (SELECT 1 AS X                -- UNPIVOT 컬럼 수 만큼 선언
-		                                                                                       UNION ALL SELECT 2 AS X
-		                                                                                       UNION ALL SELECT 3 AS X
-		                                                                                       UNION ALL SELECT 4 AS X
-		                                                                                       UNION ALL SELECT 5 AS X
-		                                                                                     ) B
-		                                                                                    )
-		                                                                               ORDER BY LEAF_CATE_NO, CATE_LVL
-		                                                                              ) K
-		                                                                              WHERE CATE_NO IS NOT NULL
-		                                                                        ) X,
-		                                                                        (
-		                                                                         SELECT A.CATE_NO, A.GOODS_CD
-		                                                                         FROM TB_CATE_GOODS A
-		                                                                         WHERE GOODS_CD = G.GOODS_CD
-		                                                                        ) Y
-		                                                                        WHERE X.LEAF_CATE_NO = Y.CATE_NO
-		                                                                  )
-		                                                  ) >0
-		                        )
-		                        OR /* 적용대상:브랜드*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_12'
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.BRAND_CD
-		                                                   AND IFNULL(REF_FORMAL_GB,G.FORMAL_GB) = G.FORMAL_GB
-		                                                  ) >0
-		                        )
-		                        OR /* 적용대상:공급업체*/
-		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
-		                                                   WHERE CPN_ID = CP.CPN_ID
-		                                                   AND CPN_TARGET = 'G260_13'
-		                                                   AND DEL_YN = 'N'
-		                                                   AND REF_VAL = G.SUPPLY_COMP_CD
-		                                                   /*AND IFNULL(REF_FORMAL_GB,G.FORMAL_GB) = G.FORMAL_GB*/
-		                                                  ) >0
-		                        )
-		                      )
-		                AND NOT EXISTS (
-		                                SELECT 1
-		                                FROM   TB_COUPON_REFVAL SCPR
-		                                WHERE  SCPR.CPN_ID = CP.CPN_ID
-		                                AND    SCPR.REF_VAL = G.GOODS_CD
-		                                AND    SCPR.DEL_YN = 'N' /*삭제안된넘*/
-		                                AND    SCPR.CPN_TARGET = 'G260_14' /* 제외상품*/
-		                               )
-		                AND NOT EXISTS (
-		                                 SELECT 1
-		                                FROM TB_COUPON_BAN_GOODS
-		                                WHERE GOODS_CD = G.GOODS_CD
-		                                AND DEL_YN = 'N'
-		                               )
-		               ) CP
-		       ) Y
-		GROUP BY GOODS_CD ,CURR_PRICE, STAFF_CURR_PRICE, CUST_GB
-	</sql>
-
 	<!-- 상품혜택가 temp 테이블 삭제 -->
 	<delete id="deleteGoodsBenefitPriceTemp" timeout="600">
 		/* TsbGoods.deleteGoodsBenefitPriceTemp */
 		DELETE FROM  TB_GOODS_BENEFIT_PRICE_TMP
 	</delete>
 
-
 	<!-- 상품혜택가 temp 적용 등록 -->
 	<insert id="crteateGoodsBenefitPriceTemp"  parameterType="Coupon"  timeout="600">
 		/* TsbGoods.crteateGoodsBenefitPriceTemp */
@@ -2688,7 +2518,9 @@
 		     , BENEFIT_GB
 		)
 		WITH CTE AS (
-		    SELECT CP.CPN_ID , CP.BUY_LIMIT_AMT, CPR.CPN_REFVAL_SQ
+		    SELECT CP.CPN_ID 
+		         , CP.BUY_LIMIT_AMT
+		         , CPR.CPN_REFVAL_SQ
 		    FROM TB_COUPON CP
 		    INNER JOIN TB_COUPON_REFVAL CPR ON CP.CPN_ID=CPR.CPN_ID
 		    WHERE  CP.SITE_CD = 'G000_10' /*전시사이트*/
@@ -2777,13 +2609,13 @@
 				     , G1.GOODS_CD
 				FROM   CTE CP
 				INNER  JOIN TB_COUPON_REFVAL CPR1 
-				ON     CP.CPN_REFVAL_SQ = CPR1.CPN_REFVAL_SQ
+				ON     CP.CPN_ID = CPR1.CPN_ID
 				INNER  JOIN TB_GOODS G1 
 				ON     CPR1.REF_VAL = G1.BRAND_CD
 				AND    CPR1.CPN_TARGET = 'G260_12'
 				AND    CP.BUY_LIMIT_AMT <![CDATA[<=]]> G1.CURR_PRICE  /*최소주문금액*/
 				INNER  JOIN TB_COUPON_REFVAL CPR2 
-				ON     CP.CPN_REFVAL_SQ = CPR2.CPN_REFVAL_SQ
+				ON     CP.CPN_ID = CPR2.CPN_ID
 				INNER  JOIN TB_GOODS G2
 				ON     CPR2.REF_VAL = G2.SUPPLY_COMP_CD
 				AND    CPR2.CPN_TARGET = 'G260_13'
@@ -2791,6 +2623,7 @@
 				WHERE  1=1
 				AND    IFNULL(CPR1.REF_FORMAL_GB, G1.FORMAL_GB) = G1.FORMAL_GB
 				AND    CPR1.CPN_ID = CPR2.CPN_ID
+				AND    G1.GOODS_CD = G2.GOODS_CD
 		)
 		SELECT G.GOODS_CD
 		     , '10'       AS BENEFIT_GB /*쿠폰할인*/

+ 6 - 6
src/main/java/com/style24/persistence/mybatis/shop/TsbStatistics.xml

@@ -91,7 +91,7 @@
 	<!-- 일자별 주문 집계 -->
 	<insert id="createOrderDaily" parameterType="String" timeout="600">
 	/* TsbStatistics.createOrderDaily */
-		INSERT INTO TB_STAT_ORD_DAY
+		INSERT INTO TB_STAT_ORD_DAY (DAY, GOODS_CD, FORMAL_GB, FRONT_GB, EXTMALL_ID, DISTRIBUTION_GB, SUPPLY_COMP_CD, AF_LINK_CD, BRAND_CD, ITEMKIND_CD, SEX_GB, AGE, SHOT_DELV_YN, REAL_ORD_AMT, SELL_QTY, ORD_AMT, GOODS_CPN_AMT, TMTB_AMT, CART_CPN_AMT, CNCL_QTY, RTN_QTY, CNCL_AMT, RTN_AMT, SAVE_PNT_AMT, CHG_QTY, CHG_DELV_FEE, ORD_CUST, USE_PNT_AMT, ORD_CNT, SELF_AMT, CHANNEL_AMT, EXTMALL_AMT, REG_DT)
 		WITH TAB AS (
 			SELECT *
 			FROM (
@@ -545,7 +545,7 @@
 	<!-- 시간대별 주문 집계 -->
 	<insert id="createOrderDateTime" parameterType="String" timeout="600">
 	/* TsbStatistics.createOrderDateTime */
-		INSERT INTO TB_STAT_ORD_TIME
+		INSERT INTO TB_STAT_ORD_TIME (DAY_TIME, FRONT_GB, EXTMALL_ID, BRAND_CD, ITEMKIND_CD, SHOT_DELV_YN, ORD_AMT, CNCL_AMT, ORD_CNT, SELL_QTY, CNCL_QTY, ORD_CUST, CUST_PRICE, REG_DT)
 		WITH TAB AS (
 			SELECT *
 			FROM (
@@ -750,7 +750,7 @@
 	<!-- 결제수단통계 -->
 	<insert id="createStatPay" parameterType="String" timeout="600">
 		/* TsbStatistics.createStatPay */
-		INSERT INTO TB_STAT_PAY
+		INSERT INTO TB_STAT_PAY (DAY, PAY_MEANS, PG_GB, COM_CARD_CD, PAY_AMT, REG_DT)
 		SELECT
 			DATE_FORMAT(PAY_DT, '%Y-%m-%d') AS TERM
 			, PAY_MEANS -- 결제수단
@@ -769,7 +769,7 @@
 	<!-- 부결제수단통계 -->
 	<insert id="createStatSubPay" parameterType="String" timeout="600">
 		/* TsbStatistics.createStatSubPay */
-		INSERT INTO TB_STAT_SUB_PAY
+		INSERT INTO TB_STAT_SUB_PAY (DAY, OCCUR_GB, PNT_GIVE, PNT_ORD_CNT, PNT_USE, GIFT_REG_CNT, GIFT_ORD_CNT, GIFT_USE, REG_DT)
 		WITH TAB_PNT AS (
 			SELECT
 				DATE_FORMAT(PNT_UPLOAD_DT, '%Y-%m-%d') AS TERM
@@ -816,7 +816,7 @@
 		, PNT_USE AS (
 			SELECT
 				B.TERM
-				, SUM(A.PNT_AMT) AS VAL
+				, SUM(A.PNT_AMT * -1) AS VAL
 				, B.OCCUR_GB
 				, '3' AS GB
 			FROM TB_CUST_POINT_HST A, TAB_PNT B
@@ -870,7 +870,7 @@
 		, GIFT_USE AS (
 			SELECT
 				B.TERM
-				, SUM(A.GFCD_AMT) AS VAL
+				, SUM(A.GFCD_AMT * -1) AS VAL
 				, B.OCCUR_GB
 				, '6' AS GB
 			FROM TB_CUST_GIFTCARD_HST A, TAB_GIFT B

+ 2 - 2
src/main/resources/config/application-style.yml

@@ -145,8 +145,8 @@ cron:
         aflink.inflow.yesterday.create: 2 22 2 29 2 ?  #어제일자유입통계
         order.daily.create: 0 20 1 * * *               #주문일자별통계
         order.datetime.create: 0 10 * * * ?            #주문시간대별통계 (매시간)
-        pay.create: 2 22 2 29 2 ?                      #결제수단통계
-        pay.sub.create: 2 22 2 29 2 ?                  #부결제수단통계
+        pay.create: 0 25 0 * * *                       #결제수단통계
+        pay.sub.create: 0 55 0 * * *                   #부결제수단통계
         sales.sms.send1: 0 30 20,23 * * MON-FRI        #매출문자발송 (평일은 저녁 8시30분, 11시30분)
         sales.sms.send2: 0 0 10,14,18,22 * * SAT,SUN   #매출문자발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
         sales.upload: 0 0 6 * * *                      #매출반영 (매일 아침 6시)