diff --git a/src/main/java/com/wb/domainserver/domain/mngr/goods/subsvc/controller/SubsvcController.java b/src/main/java/com/wb/domainserver/domain/mngr/goods/subsvc/controller/SubsvcController.java index 2ae7b95f..cc6b63db 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/goods/subsvc/controller/SubsvcController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/goods/subsvc/controller/SubsvcController.java @@ -83,6 +83,8 @@ public class SubsvcController { @Value("${mngrfo.common.fileupload.uploaddirs.web}") private String uploadWebFilePath; + @Value("${mngrfo.common.subsvc.dft-goods-optn-innb}") + private String dftGoodsOptnInnb; @Autowired private BOSubsvcService service; @Autowired @@ -297,6 +299,9 @@ public class SubsvcController { } //파일 업로드 관련 END + //기본상품옵션번호셋팅 + vo.setDftGoodsOptnInnb(dftGoodsOptnInnb); + Map message = new HashMap<>(); String result = service.insertBOMngrSubsvc(vo); message.put("message",result); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 880c0b9d..8d764c90 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -358,6 +358,8 @@ mngrfo: extensions: images: .gif,.jpg,.jpeg,.png cdnurl: http://dev.img.soju1sake1.com + subsvc: + dft-goods-optn-innb: 5 secret: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 521ebbae..f0c093f2 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -359,7 +359,8 @@ mngrfo: images: .gif,.jpg,.jpeg,.png cdnurl: https://19b0bde6dcdc15ad.kinxzone.com upurl: https://www.soju1sake1.com - + subsvc: + dft-goods-optn-innb: 5 secret: key: 1df5be2f7e90ae36 diff --git a/src/main/resources/application-stage.yml b/src/main/resources/application-stage.yml index ecc81044..bdcb3388 100644 --- a/src/main/resources/application-stage.yml +++ b/src/main/resources/application-stage.yml @@ -358,6 +358,8 @@ mngrfo: extensions: images: .gif,.jpg,.jpeg,.png cdnurl: https://19b0bde6dcdc15ad.kinxzone.com + subsvc: + dft-goods-optn-innb: 5 secret: diff --git a/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml index 1738acef..7eca7582 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml @@ -121,10 +121,10 @@ ORDER BY - GC.SUBSVC_NM ASC, SUBSVC_GNR_NM ASC, + GC.SUBSVC_NM ASC, SUBSVC_GNR ASC, - GC.SUBSVC_NM DESC, SUBSVC_GNR_NM DESC, + GC.SUBSVC_NM DESC, SUBSVC_GNR DESC, GC.SUBSVC_INNB ASC @@ -284,7 +284,7 @@ , #{mblSubsvcDc} , #{mblSubsvcDcPcSameAt} , #{img} - , 5 + , #{dftGoodsOptnInnb} , 'Y' , #{regusr} , NOW() diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcList.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcList.jsp index b71fa8ac..ed080758 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcList.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcList.jsp @@ -27,8 +27,8 @@