Merge remote-tracking branch 'private/dev' into dev

src/main/java/com/wb/domainserver/acidlivy/tasklet/AciDlivyTasklet.java

@@ -2,6 +2,7 @@ package com.wb.domainserver.acidlivy.tasklet;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO;
+import com.wb.domainserver.mapper.gcone.AciDlivyMapper;
 import com.wb.domainserver.util.dataaccess.DataMap;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/wb/domainserver/acidlivy/vo/AciDlivyVO.java

@@ -1,14 +0,0 @@
-package com.wb.domainserver.acidlivy.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-// ACI API 응답에서 필요한 Data 항목 (BLNO, OverseaSellerNo)
-@Getter
-@Setter
-@ToString
-public class AciDlivyVO {
-    private String blno;            // ACI 운송장번호
-    private String overseaSellerNo; // 해외판매자 고유번호 (= ORDR_DLVY_INNB)
-}

src/main/java/com/wb/domainserver/common/config/GconeSourceConfig.java

@@ -30,8 +30,7 @@ import java.util.List;
 @EnableTransactionManagement
 @MapperScan(
         basePackages = {
-            "com.wb.domainserver.mapper.gcone",
+            "com.wb.domainserver.mapper.gcone"
-            "com.wb.domainserver.acidlivy.tasklet"
         },
         sqlSessionFactoryRef = "gconeSqlSessionFactory"
 )
@@ -60,7 +59,6 @@ public class GconeSourceConfig {
         PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         List<Resource> mapperLocations = new ArrayList<>();
         mapperLocations.addAll(Arrays.asList(resolver.getResources("classpath*:mybatis/xml/mapper/gcone/**/*.xml")));
-        mapperLocations.addAll(Arrays.asList(resolver.getResources("classpath*:mybatis/xml/mapper/acidlivy/**/*.xml")));
         sessionFactory.setMapperLocations(mapperLocations.toArray(new Resource[0]));
 
         sessionFactory.setConfigLocation(new PathMatchingResourcePatternResolver().getResource("classpath:mybatis/xml/config/mapper-config.xml"));

src/main/java/com/wb/domainserver/mapper/gcone/AciDlivyMapper.java

@@ -1,4 +1,4 @@
-package com.wb.domainserver.acidlivy.tasklet;
+package com.wb.domainserver.mapper.gcone;
 
 import com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO;
 import com.wb.domainserver.util.dataaccess.DataMap;

src/main/resources/mybatis/xml/mapper/gcone/AciDlivyMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.wb.domainserver.acidlivy.tasklet.AciDlivyMapper">
+<mapper namespace="com.wb.domainserver.mapper.gcone.AciDlivyMapper">
 
     <!-- 출고 대상 주문 목록 조회 (ORDR_STTUS_CD = '35' 상품준비중) -->
     <select id="selectAciDlivyTargetList" resultType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">