Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -48,8 +48,10 @@
 	<!-- 주문상세번호 조회 -->	
 	<select id="getOrdDtlNoList" resultType="SweetTracker">
 		/*TssDelivery.getOrdDtlNoList*/
+		<![CDATA[
 		SELECT ORD_DTL_NO FROM TB_ORDER_DETAIL WHERE INVOICE_NO = #{invoice_no}
-		
+		AND REG_DT >= DATE_ADD(STR_TO_DATE('20210831160000', '%Y%m%d%H%i%s'), INTERVAL 0 DAY)
+		]]>
 	</select>
 	
 	<!-- 주문상세 상태값 변경    -->

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

@@ -226,6 +226,7 @@
 		   AND O.DISP_YN = 'Y'
 		   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_25'
 		   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
+		   AND O.REG_DT > 20210901
 		</where>
 				) Z
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.GIFT_LIMIT_DT, Z.GIFT_LIMIT_DAY, Z.GIFT_COMPLETE_DT, GIFT_ADDR_INP_YN, Z.DELV_EDDT, Z.AUTO_DECIDE_LEFT_DAY
@@ -279,6 +280,7 @@
 		           AND O.ORD_NO = #{ordNo}
 			</otherwise>
 		</choose>
+		           AND O.REG_DT > 20210901
 		         GROUP BY O.ORD_NO
 		       ) Z
 	</select>
@@ -326,6 +328,7 @@
 		   AND O.ORD_NO = #{ordNo}
 			</otherwise>
 		</choose>
+		   AND O.REG_DT > 20210901
 		 GROUP BY O.ORD_NO
 		<include refid="selectForPagingFooter"/>
 	</select>

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

@@ -631,6 +631,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		           AND O.REG_DT > 20210901
 		  ) Z
 		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_ORD_DTL_NO, Z.CHG_STAT, Z.CHG_STAT_NM, Z.CHG_REASON
 		        , Z.ORD_NO, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE, Z.LIST_PRICE
@@ -720,6 +721,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		           AND O.REG_DT > 20210901
 		         GROUP BY OCD.ORD_CHG_SQ
 		       ) Z
 	</select>
@@ -807,6 +809,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		 AND O.REG_DT > 20210901
 		 GROUP BY OCD.ORD_CHG_SQ
 		<include refid="selectForPagingFooter"/>
 	</select>

src/main/resources/config/application-tsit.yml

@@ -105,6 +105,28 @@ naverPay:
     service.name: MallService5
     version: 5.0
 
+#카카오 API
+kakao:
+    cid : TC0ONETIME
+    appId : 399207
+    appName : 구축용 테스트앱
+    companyName : 예스이십사
+    nativeAppKey : f961e612e07b47aa2d1884714518a194
+    restApiKey: b3955cef0328a09156c7e25f18552164
+    javascriptKey : 06cab652ad5d25be2190388d11a88fa4
+    adminKey : a25ca74dde640f3a63a8d8442fe35fcd
+    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+    login.callbackUrl: /signin/snsLoginCallback?snsType=KK
+    tokenUrl: https://kauth.kakao.com/oauth/token
+    userInfoUrl: https://kapi.kakao.com/v2/user/me
+    authorizeUrl: https://kauth.kakao.com/oauth/authorize
+    unlinkUrl : https://kapi.kakao.com/v1/user/unlink
+    paymentReadyUrl : https://kapi.kakao.com/v1/payment/ready
+    paymentRedirectUrl : /order/kakao/payment/request
+    approvePaymentUrl : https://kapi.kakao.com/v1/payment/approve
+    paymentOrderUrl : https://kapi.kakao.com/v1/payment/order
+    cancelPaymentUrl : https://kapi.kakao.com/v1/payment/cancel
+
 # 검색엔진(NHN다이퀘스트)
 search:
     engine: