Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.core.git into develop

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

@@ -2391,6 +2391,9 @@ public class TscOrderService {
 						} catch (Exception e) {
 							throw new IllegalStateException(message.getMessage("FAIL_0004"));
 						}
+
+						// TODO 취소 메일 송부
+
 					}
 				}
 			}

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -256,7 +256,9 @@ public class TscConstants {
 	public enum OrderCancelReason {
 		CHANGE_CUSTOMER("G686_10"),		// 고객변심
 		ADMIN_CANCEL("G686_20"),			// 관리자취소
-		SOLDOUT_CANCEL("G686_30");		// 품절
+		DELAY_ORDER("G686_13"),			// 상품이 늦게 배송됨
+		SOLDOUT_CANCEL("G686_30"),		// 품절
+		ETC("G686_90");					// 기타
 
 		private String value;