Merge branch 'develop' into style

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

@@ -862,7 +862,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		order.setUpdNo(userNo);
 		order.setRegNo(userNo);
 
-		Boolean isValid 		= true;
+		Boolean isValid 		= false;
 
 		// @ 환불계좌인증
 		CustAccount custAccount = new CustAccount();

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

@@ -321,10 +321,10 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       (SELECT CONCAT(IFNULL(SUPPLY_COMP_CD,#{supplyCompCd}),'_',IFNULL(LPAD(SUBSTRING(MAX(DELV_FEE_CD),INSTR(MAX(DELV_FEE_CD),'_') + 1) + 1,2,'0'),'01'))
+		       (SELECT IFNULL((SELECT CONCAT(IFNULL(SUPPLY_COMP_CD,#{supplyCompCd}),'_',IFNULL(LPAD(SUBSTRING(MAX(DELV_FEE_CD),INSTR(MAX(DELV_FEE_CD),'_') + 1) + 1,2,'0'),'01'))
 		        FROM   TB_DELV_FEE_POLICY Z
 		        WHERE  SUPPLY_COMP_CD LIKE CONCAT(#{supplyCompCd},'%')
-		        GROUP BY SUPPLY_COMP_CD)
+		        GROUP BY SUPPLY_COMP_CD),#{supplyCompCd}))
 		     , #{supplyCompCd}
 		     , #{delvFeeCrite}
 		     , IFNULL(#{minOrdAmt},0)