Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/dao/TsaTestDao.java

@@ -0,0 +1,19 @@
+package com.style24.admin.biz.dao;
+
+import com.style24.core.support.annotation.ShopDs;
+import org.springframework.stereotype.Repository;
+import com.style24.persistence.domain.Test;
+
+/**
+ * Test Dao
+ *
+ * @author swkim
+ * @since 2021. 3. 19
+ */
+
+@ShopDs
+@Repository
+public interface TsaTestDao {
+
+
+}

src/main/java/com/style24/admin/biz/service/TsaTestService.java

@@ -0,0 +1,23 @@
+package com.style24.admin.biz.service;
+
+import com.style24.admin.biz.dao.TsaTestDao;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.style24.persistence.domain.Test;
+
+/**
+ * Test Service
+ *
+ * @author swkim
+ * @since 2021. 03. 19
+ */
+@Service
+@Slf4j
+public class TsaTestService {
+
+	@Autowired
+	private TsaTestDao testDao;
+
+}

src/main/java/com/style24/admin/biz/web/TsaTestController.java

@@ -0,0 +1,25 @@
+package com.style24.admin.biz.web;
+
+import com.style24.admin.biz.service.TsaTestService;
+import com.style24.admin.support.controller.TsaBaseController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Test Controller
+ *
+ * @author swkim
+ * @since 2020. 03. 19
+ */
+@Controller
+@RequestMapping("/test")
+@Slf4j
+public class TsaTestController extends TsaBaseController {
+
+	@Autowired
+	private TsaTestService testService;
+
+
+}

src/main/java/com/style24/persistence/domain/Test.java

@@ -0,0 +1,18 @@
+package com.style24.persistence.domain;
+
+import com.style24.persistence.TscBaseDomain;
+import lombok.Data;
+
+/**
+ * Test Domain
+ *
+ * @author swkim
+ * @since 2021. 03. 19
+ */
+@SuppressWarnings("serial")
+@Data
+public class Test extends TscBaseDomain {
+
+
+
+}

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

@@ -232,7 +232,7 @@
 		)
 		VALUES (
 		       #{supplyCompCd}
-		     , #{wmsColorCd}
+		     , UPPER(#{wmsColorCd})
 		     , #{wmsColorNm}
 		     , #{colorCd}
 		     , #{useYn}
@@ -242,7 +242,8 @@
 		     , NOW()
 		)
 		ON DUPLICATE KEY UPDATE
-		       COLOR_CD = #{colorCd}
+		       WMS_COLOR_NM = #{wmsColorNm}
+		     , COLOR_CD = #{colorCd}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
@@ -281,7 +282,7 @@
 		)
 		VALUES (
 		       #{supplyCompCd}
-		     , #{wmsStyleYearCd}
+		     , UPPER(#{wmsStyleYearCd})
 		     , #{wmsStyleYearNm}
 		     , #{styleYear}
 		     , #{useYn}
@@ -291,7 +292,8 @@
 		     , NOW()
 		)
 		ON DUPLICATE KEY UPDATE
-		       STYLE_YEAR = #{styleYear}
+		       WMS_STYLE_YEAR_NM = #{wmsStyleYearNm}
+		     , STYLE_YEAR = #{styleYear}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
@@ -317,7 +319,7 @@
 	<!-- WMS 시즌 매핑 저장 -->
 	<update id="saveWmsSeasonMapping" parameterType="WmsSeasonMapping">
 		/* TsaGoods.saveWmsSeasonMapping */
-		INSERT INTO TB_WMS_STYLE_YEAR_MAPPING (
+		INSERT INTO TB_WMS_SEASON_MAPPING (
 		       SUPPLY_COMP_CD
 		     , WMS_SEASON_CD
 		     , WMS_SEASON_NM
@@ -330,7 +332,7 @@
 		)
 		VALUES (
 		       #{supplyCompCd}
-		     , #{wmsSeasonCd}
+		     , UPPER(#{wmsSeasonCd})
 		     , #{wmsSeasonNm}
 		     , #{seasonCd}
 		     , #{useYn}
@@ -340,7 +342,8 @@
 		     , NOW()
 		)
 		ON DUPLICATE KEY UPDATE
-		       SEASON_CD = #{seasonCd}
+		       WMS_SEASON_NM = #{wmsSeasonNm}
+		     , SEASON_CD = #{seasonCd}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

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

@@ -227,7 +227,7 @@
 			, EXTMALL_ID
 			, AGENT_ORDER_ID
 			, EXTMALL_ORDER_ID
-			, CHANGABLE_YN
+			, CHANGEABLE_YN
 			, CHANGE_FEE_FREE_YN
 			, RETURNABLE_YN
 			, RETURN_FEE_FREE_YN
@@ -300,7 +300,7 @@
 			, '' -- EXTMALL_ID
 			, '' -- AGENT_ORDER_ID
 			, '' -- EXTMALL_ORDER_ID
-			, 'Y' -- CHANGABLE_YN
+			, 'Y' -- CHANGEABLE_YN
 			, 'Y' -- CHANGE_FEE_FREE_YN
 			, 'Y' -- RETURNABLE_YN
 			, 'Y' -- RETURN_FEE_FREE_YN

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

@@ -0,0 +1,5 @@
+<?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.style24.admin.biz.dao.TsaTestDao">
+
+</mapper>