이태영 - 20210615 네이버페이 주문형 개발 중 & scm 수정사항 수정

pom.xml

@@ -165,6 +165,84 @@
 		</dependency>
 		<!-- \\\ USAFE 보증보험 -->
 
+		<!-- 네이버페이 -->
+		<dependency>
+			<groupId>org.apache.axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/axis.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bouncycastle</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/bcprov-jdk16-138.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml</groupId>
+			<artifactId>rpc</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/jaxrpc.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.nhncorp</groupId>
+			<artifactId>SimpleCryptLib</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/SimpleCryptLib-1.1.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons.discovery</groupId>
+			<artifactId>common-discovery</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons.logging</groupId>
+			<artifactId>common-logging</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-logging-1.2.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>saaj</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/saaj.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>wsdl4j</groupId>
+			<artifactId>wsdl4j</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/wsdl4j.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>jsr173api</groupId>
+			<artifactId>jsr173api</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/jsr173_1.0_api.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xalan.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>xbean</groupId>
+			<artifactId>xbean</artifactId>
+			<version>1.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xbean.jar</systemPath>
+		</dependency>
 		<!-- \\\ WEB-INF lib -->
 	</dependencies>
 	

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

@@ -469,28 +469,28 @@
 	<insert id="insertFreegiftGoodsApplyCompanyOrBrandList" parameterType="FreeGoodsPromotion">
 		/* TsaMarketing.insertFreegiftGoodsApplyList : 실사용 업체/브랜드 리스트 등록 */
 		INSERT INTO TB_FREEGIFT_GOODS_APPLY
-		SELECT FG.FREEGIFT_SQ
+		SELECT DISTINCT FG.FREEGIFT_SQ
 		<if test="targetGb == 'G260_13'">		<!-- 업체일 경우 업체에 등록된 브랜드 코드 입력 -->
-		     , 'G260_12'
-		     , BS.BRAND_CD
+		     , 'G260_12' AS TARGET_GB
+		     , BS.BRAND_CD AS TARGET_VAL
 		</if>
 		<if test="targetGb == 'G260_12'">		<!-- 브랜드일 경우 업체에 등록된 업체 코드 입력 -->
-			, 'G260_13'
-			 , BS.SUPPLY_COMP_CD
+			, 'G260_13' AS TARGET_GB
+			 , BS.SUPPLY_COMP_CD AS TARGET_VAL
 		</if>
-			 , #{regNo}
-			 , NOW()
-		  FROM TB_FREEGIFT_GOODS FG
-		 INNER JOIN TB_BRAND_SUPPLY BS
+			 , #{regNo} AS REG_NO
+			 , NOW() AS REG_DT
+		FROM   TB_FREEGIFT_GOODS FG
+		INNER  JOIN TB_BRAND_SUPPLY BS
 		<if test="targetGb == 'G260_13'">
-			ON FG.TARGET_VAL = BS.SUPPLY_COMP_CD
+		ON     FG.TARGET_VAL = BS.SUPPLY_COMP_CD
 		</if>
 		<if test="targetGb == 'G260_12'">
-			ON FG.TARGET_VAL = BS.BRAND_CD
+		ON     FG.TARGET_VAL = BS.BRAND_CD
 		</if>
-		 WHERE 1=1
-		   AND FG.FREEGIFT_SQ = #{freegiftSq}
-		   AND FG.TARGET_GB = #{targetGb}
-		   AND FG.DEL_YN = 'N'
+		WHERE  1=1
+		AND    FG.FREEGIFT_SQ = #{freegiftSq}
+		AND    FG.TARGET_GB = #{targetGb}
+		AND    FG.DEL_YN = 'N'
 	</insert>
 </mapper>

src/main/webapp/WEB-INF/views/order/OrderSellerListForm.html

@@ -171,7 +171,8 @@ var columnDefs = [
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
 	{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "사이즈",			field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션1",			field:"optCd1",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
 	{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
@@ -204,14 +205,16 @@ var fnSearch = function() {
 	var ordNo = $('#searchForm input[name=ordNo]').val();
 	var stDate = $('#stDate').val();
 	var edDate = $('#edDate').val();
-	
-	if (gagajf.isNull(ordNo)) {
-		if (gagajf.isNull(stDate)) {
-			mcxDialog.alert('시작 기간을 입력하세요.');
+
+	if (!gagajf.isNull(stDate)) {
+		if (gagajf.isNull(edDate)) {
+			mcxDialog.alert('종료 기간을 입력하세요.');
 			return;
 		}
+	}
 
-		if (gagajf.isNull(edDate)) {
+	if (!gagajf.isNull(edDate)) {
+		if (gagajf.isNull(stDate)) {
 			mcxDialog.alert('종료 기간을 입력하세요.');
 			return;
 		}