Parcourir la source

매출반영 로직 수정

tsit05 il y a 4 ans
Parent
commit
fa66baf242

+ 7 - 2
src/main/java/com/style24/batch/biz/job/statistics/TsbSalesUploadJob.java

@@ -32,8 +32,8 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 
 	@Override
 	public String read() throws Exception {
-		// 어제일자 매출반영목록 생성 (한세드림)
-		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_DR.value());
+//		// 어제일자 매출반영목록 생성 (한세드림)
+//		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_DR.value());
 
 //		// 어제일자 매출반영목록 생성 (한세드림)
 //		statisticsService.createYesterdaySalesUploadList(HansaeErp.ErpGb.HANSAE_MK.value());
@@ -93,6 +93,11 @@ public class TsbSalesUploadJob extends TsbAbstractJob<String, String, String> {
 			// 매출업로드
 			GagaMap salesMap = hansaeErp.uploadErpSales(erpGb, statisticsService.getSalesUploadList(erp));
 
+			if (salesMap == null || salesMap.isEmpty()) {
+				log.error("매출반영결과 데이터가 없습니다. 한세 ERP 시스템담당자에게 문의해 주세요.");
+				continue;
+			}
+			
 			// 매출반영결과 처리
 			statisticsService.updateSalesUploadResult(erpGb, salesMap);
 

+ 16 - 12
src/main/java/com/style24/batch/biz/service/TsbStatisticsService.java

@@ -116,21 +116,25 @@ public class TsbStatisticsService {
 	@SuppressWarnings("unchecked")
 	@Transactional("shopTxnManager")
 	public void updateSalesUploadResult(String erpGb, GagaMap salesMap) {
-		// 성공건 처리
-		List<Map<String, Object>> succList = (ArrayList<Map<String, Object>>)salesMap.get("succList");
-		if (succList != null && !succList.isEmpty()) {
-			for (Map<String, Object> dataMap : succList) {
-				dataMap.put("ERP_GB", erpGb);
-				statisticsDao.updateSalesUploadResult(dataMap);
+		if (salesMap.get("succList") != null) {
+			// 성공건 처리
+			List<Map<String, Object>> succList = (ArrayList<Map<String, Object>>)salesMap.get("succList");
+			if (succList != null && !succList.isEmpty()) {
+				for (Map<String, Object> dataMap : succList) {
+					dataMap.put("ERP_GB", erpGb);
+					statisticsDao.updateSalesUploadResult(dataMap);
+				}
 			}
 		}
 
-		// 실패건 처리
-		List<Map<String, Object>> failList = (ArrayList<Map<String, Object>>)salesMap.get("failList");
-		if (failList != null && !failList.isEmpty()) {
-			for (Map<String, Object> dataMap : failList) {
-				dataMap.put("ERP_GB", erpGb);
-				statisticsDao.updateSalesUploadResult(dataMap);
+		if (salesMap.get("failList") != null) {
+			// 실패건 처리
+			List<Map<String, Object>> failList = (ArrayList<Map<String, Object>>)salesMap.get("failList");
+			if (failList != null && !failList.isEmpty()) {
+				for (Map<String, Object> dataMap : failList) {
+					dataMap.put("ERP_GB", erpGb);
+					statisticsDao.updateSalesUploadResult(dataMap);
+				}
 			}
 		}
 	}

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

@@ -1012,8 +1012,8 @@
 		        INNER JOIN TB_SUPPLY_COMPANY SC ON OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
 		        LEFT OUTER JOIN TB_EXTMALL_USAC_PRICE EUP ON ODIH.ORD_DTL_ITEM_HST_SQ = EUP.ORD_DTL_ITEM_HST_SQ
 		        WHERE  1 = 1
-		        -- AND    ODIH.REG_DT BETWEEN DATE_ADD(CURRENT_DATE(), INTERVAL -1 DAY) AND CURRENT_DATE() /*전일자*/
-		        AND    ODIH.REG_DT >= DATE_ADD(CURRENT_DATE(), INTERVAL -7 DAY)
+		        AND    ODIH.REG_DT <![CDATA[>=]]> DATE_ADD(CURRENT_DATE(), INTERVAL -1 DAY)
+		        AND    ODIH.REG_DT <![CDATA[<]]> CURRENT_DATE()
 		        AND    ODIH.ORD_DTL_STAT IN ('G720_20','G720_50','G720_60') /*판매-배송중, 환입-반품완료, 환입-교환완료*/
 		        <if test='erpGb == "hsmk"'>
 		        AND    OD.SUPPLY_COMP_CD IN (5,4) /*한세MK, FRJ*/