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;
@@ -311,7 +312,7 @@ public class AciDlivyTasklet implements Tasklet {
         orderLogMap.put("logSj", "출고처리(" + dlivyCdNb + ")");
         orderLogMap.put("logDtlCn", "[ACI 배치] 배치 출고처리 완료");
         orderLogMap.put("aditInfoCn", null);
-        orderLogMap.put("dlivyCdNb", dlivyCdNb);
+        orderLogMap.put("dlivyInnb", orderVO.getDlivyInnb());
         orderLogMap.put("refundCdNb", null);
         orderLogMap.put("logDvCd", "01");
         orderLogMap.put("dvCd", "BATCH");

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.acidlivy.tasklet"
+            "com.wb.domainserver.mapper.gcone"
         },
         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,9 +1,9 @@
 <?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.AciDlivyMapper">
+<mapper namespace="com.wb.domainserver.mapper.gcone.AciDlivyMapper">
 
     <!-- 출고 대상 주문 목록 조회 (ORDR_STTUS_CD = '35' 상품준비중) -->
-    <select id="selectAciDlivyTargetList" resultType="com.wb.domainserver.acidlivy.AciDlivyOrderVO">
+    <select id="selectAciDlivyTargetList" resultType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">
         <![CDATA[
         SELECT
             ORDR_DLVY_INNB,
@@ -20,7 +20,7 @@
     <!-- 출고 대상 주문상품 옵션 조회 -->
     <!-- QY: 반품(85)을 제외한 미출고 수량, 출고 아이템/로그/상태 처리 기준 -->
     <select id="selectAciDlivyTargetItemList"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO"
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO"
             resultType="dataMap">
         <![CDATA[
         SELECT
@@ -41,7 +41,7 @@
 
     <!-- gc_goods_export 존재 여부 -->
     <select id="selectGoodsExportCount"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO"
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO"
             resultType="int">
         <![CDATA[
         SELECT COUNT(1)
@@ -59,7 +59,7 @@
     <!-- DLIVY_CD_NB: Java에서 생성한 dlivyCdNb 직접 포함 (INSERT 전 생성) -->
     <!-- HDRYCPN_CD: code22 고정, INVCNB: ACI BLNO -->
     <insert id="insertGoodsExport"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO">
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">
 
         <![CDATA[
         INSERT INTO GC_GOODS_EXPORT (
@@ -100,7 +100,7 @@
     <!-- gc_goods_export DLIVY_CD_NB UPDATE -->
     <!-- INSERT 경로에서 dlivyCdNb 생성 후 호출하여 DLIVY_CD_NB 설정 -->
     <update id="updateGoodsExportDlivyCdNb"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO">
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">
         <![CDATA[
         UPDATE GC_GOODS_EXPORT SET
             DLIVY_CD_NB = #{dlivyCdNb},
@@ -113,7 +113,7 @@
     <!-- gc_goods_export UPDATE (기존 레코드 있음) -->
     <!-- gc_goods_export UPDATE (기존 레코드 있음, dlivyInnb = ordrDlvyInnb Java 세팅) -->
     <update id="updateGoodsExport"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO">
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">
 
         <![CDATA[
         UPDATE GC_GOODS_EXPORT SET
@@ -215,7 +215,7 @@
     <!-- gc_order_shipping 상태 UPDATE -->
     <!-- 하위의 모든 item_option 상태/수량 기준으로 동적 결정 (기존 updateBOOrdrDlvyStatusUpdt6575 참고) -->
     <update id="updateOrderShippingStatus"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO">
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">
         <![CDATA[
         UPDATE GC_ORDER_SHIPPING SH,
         (
@@ -251,7 +251,7 @@
     <!-- gc_order 상태 UPDATE -->
     <!-- 하위의 모든 shipping 상태 기준으로 동적 결정 (기존 updateBOOrdrStatusUpdt6575 참고) -->
     <update id="updateOrderStatus"
-            parameterType="com.wb.domainserver.acidlivy.AciDlivyOrderVO">
+            parameterType="com.wb.domainserver.acidlivy.vo.AciDlivyOrderVO">
         <![CDATA[
         UPDATE GC_ORDER O,
         (
@@ -341,7 +341,7 @@
             #{logSj},
             #{logDtlCn},
             #{aditInfoCn},
-            #{dlivyCdNb},
+            #{dlivyInnb},
             #{refundCdNb},
             #{logDvCd},
             #{dvCd},