Merge branch 'jmh' into jmh_option

src/main/java/com/style24/batch/biz/service/TsbCustomerService.java

@@ -8,6 +8,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.style24.batch.biz.dao.TsbCustomerDao;
 import com.style24.batch.support.env.TsbConstants;
 import com.style24.core.biz.service.TscCustomerService;
@@ -27,8 +28,6 @@ import com.style24.persistence.domain.SsgDirectMessage;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-
 /**
  * 회원(고객) Service
  *
@@ -266,7 +265,7 @@ public class TsbCustomerService {
 		replaceInfo.setString("siteNm", siteNm);
 		int result;
 		SsgDirectMessage directMessage = kakaoSender.getDiretMessage(SsgKakaoSender.KakaoAnswerSq.PRIVACY_POLICY.value(), dm, replaceInfo);
-		if ("style".equals(active) || "real".equals(active) || "locp".equals(active) || "brdg".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "brdg".equals(active)) {
 			result = customerDao.createPrivacyPolicyNoticeKko(directMessage);
 		} else {
 			result = customerDao.createPrivacyPolicyNoticeKkoDev(directMessage);
@@ -303,7 +302,7 @@ public class TsbCustomerService {
 		int result;
 		Netpathy netpathy = netpathyMailSender.getMailContents(NetpathyMailSender.MailAnswerSq.PRIVACY_POLICY.value(), replaceInfo);
 
-		if ("style".equals(active) || "real".equals(active) || "locp".equals(active) || "brdg".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "brdg".equals(active)) {
 			result = customerDao.createPrivacyPolicyNoticeEmail(netpathy);
 		} else {
 			result = customerDao.createPrivacyPolicyNoticeEmailDev(netpathy);
@@ -478,7 +477,7 @@ public class TsbCustomerService {
 		int result = 0;
 
 		String active = env.getProperty("spring.profiles.active");
-		if ("style".equals(active) || "brdg".equals(active)) {
+		if ("style".equals(active) || "brdg".equals(active) || "locp".equals(active)) {
 			customerDao.truncateNetpathyMailCustomer();
 			result = customerDao.createNetpathyMailCustomer();
 		} else {
@@ -499,7 +498,7 @@ public class TsbCustomerService {
 		int result = 0;
 
 		String active = env.getProperty("spring.profiles.active");
-		if ("style".equals(active) || "brdg".equals(active)) {
+		if ("style".equals(active) || "brdg".equals(active) || "locp".equals(active)) {
 			customerDao.truncateNetpathyMailWithdrawalCustomer();
 			result = customerDao.createNetpathyMailWithdrawalCustomer();
 		} else {
@@ -521,7 +520,7 @@ public class TsbCustomerService {
 		int result = 0;
 
 		String active = env.getProperty("spring.profiles.active");
-		if ("style".equals(active) || "brdg".equals(active)) {
+		if ("style".equals(active) || "brdg".equals(active) || "locp".equals(active)) {
 			customerDao.truncateNetpathyMailCustomerPoint();
 			result = customerDao.createNetpathyMailCustomerPoint();
 		} else {

src/main/java/com/style24/batch/biz/task/TsbGoodsTask.java

@@ -207,7 +207,7 @@ public class TsbGoodsTask {
 	@Scheduled(cron = "${cron.goods.summary.create}")
 	@Async
 	public void summaryCreateJob() throws Exception {
-		goodsSummaryJob.run("cron.goods.summary.create");
+		goodsSummaryJob.runById("cron.goods.summary.create");
 	}
 
 	/**

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

@@ -689,8 +689,8 @@
 		                INNER JOIN
 		                       TB_ORDER_DETAIL OD
 		                WHERE  O.ORD_NO = OD.ORD_NO
-		                AND    OD.ORD_DTL_STAT = 'G013_70' /*구매확정*/
-		                AND    O.ORD_DT >= DATE_ADD(DATE_ADD(LAST_DAY(NOW()), INTERVAL 1 DAY), INTERVAL -#{calMonths} MONTH)
+		                AND    OD.ORD_DTL_STAT IN ('G013_60', 'G013_70') /*구매확정*/
+		                AND    O.ORD_DT >= DATE_ADD(LAST_DAY(NOW() - INTERVAL 1 MONTH) + INTERVAL 1 DAY, INTERVAL - #{calMonths} MONTH)
 		                AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(LAST_DAY(NOW()), INTERVAL 1 DAY) /*익월 1일*/
 		                GROUP BY O.ORD_NO, O.CUST_NO
 		                HAVING SUM(OD.REAL_ORD_AMT + OD.GFCD_USE_AMT) >= #{buyExceptAmt}

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

@@ -568,12 +568,14 @@
 				     , 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
+		        AND    CPR1.DEL_YN = 'N'
 				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
+			    AND    CPR2.DEL_YN = 'N'
 				INNER  JOIN TB_GOODS G2
 				ON     CPR2.REF_VAL = G2.SUPPLY_COMP_CD
 				AND    CPR2.CPN_TARGET = 'G260_13'

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

@@ -166,7 +166,8 @@
 		                                              IFNULL(GBP.PC_CURR_PRICE,G.CURR_PRICE) * G.MIN_ORD_QTY * C.DC_PVAL / 100
 		                                          ELSE
 		                                              0
-		                                     END) DESC
+		                                     END) DESC,
+		                                     C.CPN_ID DESC /*할인금액이 같을 경우 나중에 생성된 쿠폰을 적용*/
 		                          )          AS RK
 		        FROM   TB_COUPON C
 		        INNER JOIN TB_COUPON_REFVAL CR ON C.CPN_ID = CR.CPN_ID

src/main/resources/config/application-brdg.yml

@@ -152,6 +152,8 @@ cron:
         sales.sms.send1: 2 22 2 29 2 ?                 #매출문자발송 (평일은 저녁 8:30분, 11시)
         sales.sms.send2: 2 22 2 29 2 ?                 #매출문자발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
         sales.upload: 2 22 2 29 2 ?                    #매출반영
+        customer.create: 2 22 2 29 2 ?                   #회원통계
+        customer.order.create: 2 22 2 29 2 ?            #회원주문통계
 
     #모니터링
     monitoring:

src/main/resources/config/application-locp.yml

@@ -159,6 +159,8 @@ cron:
         sales.sms.send1: 2 22 2 29 2 ?                 #매출문자발송 (평일은 저녁 8시30분, 11시30분)
         sales.sms.send2: 2 22 2 29 2 ?                 #매출문자발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
         sales.upload: 2 22 2 29 2 ?                    #매출반영
+        customer.create: 2 22 2 29 2 ?                   #회원통계
+        customer.order.create: 2 22 2 29 2 ?            #회원주문통계
 
     #모니터링
     monitoring:

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

@@ -123,7 +123,7 @@ cron:
             outgoing.result.receive: 0 5/10 7-22 * * MON-FRI    #WMS 출고결과 수신 (1시간 1회)
             invoice.receive: 0 7/10 7-20 * * MON-FRI     #WMS 운송장번호 수신(1시간 1회)
         sweettracker.invoice.retrieve: 2 22 2 29 2 ?   #스윗트래커 배송추적 요청 (1시간 1회). public 배치에서 실행
-        auto.soldout.cancel: 0 8/10 10-23 * * MON-FRI  #자동품절취소 (1시간 1회)
+        auto.soldout.cancel: 0 8 18-22 * * MON-FRI  #자동품절취소 (1시간 1회)
 
     #회수
     withdraw:
@@ -139,7 +139,7 @@ cron:
 
     #네이버페이
     naverPay.order.batch: 2 22 2 29 2 ?                  #네이버페이 배치 실행
-    naverPay.order.decision: 0 46 11 * * *               #네이버페이 결제형 구매확정 (1일 1회)
+    naverPay.order.decision: 0 46 23 * * *               #네이버페이 결제형 구매확정 (1일 1회)
 
     #통계
     statistics: