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

src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -72,8 +72,8 @@ public class TscOrderService {
 	@Autowired
 	private TscKakaotalkService kakaotalkService;
 
-	/*@Autowired
-	private TscNaverPayService naverPayService;*/
+	@Autowired
+	private TscNaverPayService naverPayService;
 
 	/**
 	 * 주문목록 카운트
@@ -440,7 +440,7 @@ public class TscOrderService {
 				}
 
 				// 4. 상품코드, 사이즈, 주문수량 체크
-				if (!orgOrder.getGoodsCd().equals(updateData.getGoodsCd()) || !orgOrder.getOptCd2().equals(updateData.getOptCd2()) || orgOrder.getOrdQty() != updateData.getOrdQty()) {
+				if (!orgOrder.getGoodsCd().equals(updateData.getGoodsCd()) || !orgOrder.getOptCd2().equals(updateData.getOptCd2()) || orgOrder.getOrdQty() - orgOrder.getCnclRtnQty() != updateData.getOrdQty()) {
 					failedGoodCdStr += updateData.getGoodsCd() + " /  " + updateData.getOptCd2() + "(Error2)<br/>";
 					failedCount++;
 					continue;
@@ -2460,7 +2460,7 @@ public class TscOrderService {
 		}
 
 		try {
-			// naverPayService.sendNaverPayDeliveryStartOrder(params, "SHIPPING");
+			naverPayService.sendNaverPayDeliveryStartOrder(params, "SHIPPING");
 		} catch(Exception e) {
 			e.printStackTrace();
 		}

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

@@ -76,8 +76,10 @@
 		AND    G.GOODS_CD = #{goodsCd}
 		</if>
 		<if test='searchDateGb != null and searchDateGb == "ordDt"'>
+		  <if test="stDate != null and stDate != ''">
 		AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
 		AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+		  </if>
 		</if>
 		AND    OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 	</select>
@@ -191,8 +193,10 @@
 		            AND    G.GOODS_CD = #{goodsCd}
 		            </if>
 		            <if test='searchDateGb != null and searchDateGb == "ordDt"'>
+		              <if test="stDate != null and stDate != ''">
 		            AND    O.ORD_DT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
 		            AND    O.ORD_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+					  </if>
 		            </if>
 		            AND    OD.ORD_QTY - OD.CNCL_RTN_QTY > 0 ) Z
 		      JOIN (SELECT @rownum := 0) R
@@ -323,15 +327,21 @@
 		                    AND    OD.ORD_DTL_NO = OCD.CHG_ORD_DTL_NO
 		                    WHERE  OD.ORD_QTY - CNCL_RTN_QTY > 0
 		                    AND    DF.DELV_FEE_GB IN ('G018_10', 'G018_30')
+		                    <if test="ordDtlNoArr != null and ordDtlNoArr.length > 0">
+		                    AND    OD.ORD_DTL_NO IN
+		                        <foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
+		                            #{item}
+		                        </foreach>
+		                    </if>
 		                    GROUP  BY OD.ORD_NO, OD.DELV_FEE_CD, DF.ORD_CHG_SQ, DF.DELV_FEE_CD, DF.DELV_FEE_GB) DF
 		ON     DF.ORD_DTL_NO = OD.ORD_DTL_NO
 		WHERE  1=1
 		AND    DA.RECIP_BASE_ADDR IS NOT NULL
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
-			AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
+		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="ordDtlNoArr != null and ordDtlNoArr.length > 0">
-			AND	OD.ORD_DTL_NO IN
+		AND	OD.ORD_DTL_NO IN
 			<foreach collection="ordDtlNoArr" item="item" index="index"  open="(" close=")" separator=",">
 				#{item}
 			</foreach>