diff --git a/settings.gradle b/settings.gradle index 6cf86fdf..b5d1040f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'gconebo' +rootProject.name = 'sake' diff --git a/src/main/java/com/wb/domainserver/domain/crm/ordr/controller/CrmOrdrController.java b/src/main/java/com/wb/domainserver/domain/crm/ordr/controller/CrmOrdrController.java index c20210dc..74982df3 100644 --- a/src/main/java/com/wb/domainserver/domain/crm/ordr/controller/CrmOrdrController.java +++ b/src/main/java/com/wb/domainserver/domain/crm/ordr/controller/CrmOrdrController.java @@ -1175,7 +1175,7 @@ public class CrmOrdrController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/insertOrder") - public String insertOrder(ModelMap model, @RequestBody DataMap param, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + public String insertOrder(ModelMap model, @RequestBody HashMap param, @CookieValue(value = "authSopmalCd") String authSopmalCd) { param.put("sopmalCd", authSopmalCd); //결제플랫폼 구분코드 param.put("deviceType", "P"); @@ -1186,7 +1186,12 @@ public class CrmOrdrController { try { AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); - resultMap = orderService.insertMngrOrdrRegist(param, user); + DataMap paramData = new DataMap(); + param.entrySet().forEach(map->{ + paramData.put(map.getKey(), map.getValue()); + }); + + resultMap = orderService.insertMngrOrdrRegist(paramData, user); String ordrTyCd = (String) param.get("ordrTyCd"); diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java b/src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java index 57d2ec68..4f51786e 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java @@ -551,7 +551,7 @@ public class CscController { */ @Policy(AuthPolicy.PUBLIC) @RequestMapping(value = "/selectBbscttCn", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectBbscttCn(@RequestBody BOGnrlbbscttVO bbsctt) { + public ResponseEntity selectBbscttCn(BOGnrlbbscttVO bbsctt) { AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if ("01".equals(user.getSysDvCd())) { diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java index 127764f7..1add2b54 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java @@ -19,10 +19,7 @@ import com.wb.domainserver.domain.gcone.common.service.BOCommonService; import com.wb.domainserver.domain.gcone.goods.goods.service.BOGoodsService; import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderService; import com.wb.domainserver.domain.gcone.goods.purchs.service.BOPurchsService; -import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOGoodsVO; -import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderLogVO; -import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderVO; -import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOPurchsrVO; +import com.wb.domainserver.domain.gcone.goods.purchs.vo.*; import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService; import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO; import com.wb.domainserver.domain.gcone.ordr.dlivy.service.BODlivyService; @@ -630,7 +627,7 @@ public class OrdrController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/insertOrder") - public String insertOrder(ModelMap model, @RequestBody DataMap param, HttpServletRequest request) { + public String insertOrder(ModelMap model, @RequestBody HashMap param, HttpServletRequest request) { String agentId = ""; String jSesionId = ""; String ipAdres = ""; @@ -659,7 +656,13 @@ public class OrdrController { //결제플랫폼 구분코드 param.put("deviceType", "PC".equals(request.getAttribute("env"))?"P":"M"); log.debug("param.get(deviceType) {}", param.get("deviceType")); - Map resultMap = insertBOOrder(param); + + DataMap paramData = new DataMap(); + param.entrySet().forEach(map->{ + paramData.put(map.getKey(), map.getValue()); + }); + + Map resultMap = insertBOOrder(paramData); // Map resultMap = responseHandler.handleResponseAsMap( // sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/insertBOOrder", param) // ); @@ -679,14 +682,14 @@ public class OrdrController { return "sopmal/ordr/OrdrRspnsPayR"; } - LinkedHashMap setle = (LinkedHashMap) resultMap.get("setle"); + BOOrderSetleVO setle = (BOOrderSetleVO) resultMap.get("setle"); log.debug("setle = {}", setle); String url = ""; - if (!CollectionUtils.isEmpty(setle)) { - String pgCmpnyNm = (String) setle.get("pgCmpnyNm"); - String setleTyCd = (String) setle.get("setleTyCd"); + if (setle != null && !StringUtil.isEmpty(setle.getSetleTyCd())) { + String pgCmpnyNm = setle.getPgCmpnyNm(); + String setleTyCd = setle.getSetleTyCd(); if ("gcpay".equals(pgCmpnyNm)) { url = "sopmal/ordr/OrdrReqstGcpayPayR"; @@ -2501,7 +2504,7 @@ public class OrdrController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectBlclist", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectBlclist(ModelMap model, @RequestBody DataMap param, HttpServletRequest request) { + public ResponseEntity selectBlclist(ModelMap model, @RequestBody HashMap param, HttpServletRequest request) { log.debug("selectBlclist(param = {})", param); Map util = new HashMap<>(); @@ -2533,7 +2536,12 @@ public class OrdrController { param.put("ipAdres", ipAdres); log.debug("param = {}", param); - Map content = selectBlclist(param); + DataMap paramData = new DataMap(); + param.entrySet().forEach(map -> { + paramData.put(map.getKey(), map.getValue()); + }); + + Map content = selectBlclist(paramData); return ResponseEntity.ok( WnbtResponse.builder() .resBody(new WnbtResponseBody(content)) diff --git a/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp index b55071c0..97c4e369 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp @@ -223,8 +223,6 @@ sopmalCd: sopmalCd }, success: function (data) { - console.log(data); - alert(data); let cn = JSON.parse(data.resBody.result).cn; $("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").addClass("ck-content"); diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index d414393d..966cb890 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -664,7 +664,6 @@ if(result.result == 'Y') { alert(result.message); }else { - $.ajax({ type: 'post', contentType: 'application/json',