itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-12-04 10:29:34 +09:00
parent cb8042117c
commit 36dc0d7f43
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/wb/domainserver/domain/crm/ordr/controller/CrmOrdrController.java
View File

@@ -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<String, Object> 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");

2
src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java
View File

@@ -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())) {

32
src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java
View File

@@ -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<String, Object> 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<String, Object> resultMap = insertBOOrder(param);
DataMap paramData = new DataMap();
param.entrySet().forEach(map->{
paramData.put(map.getKey(), map.getValue());
});
Map<String, Object> resultMap = insertBOOrder(paramData);
// Map<String, Object> 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<WnbtResponse> selectBlclist(ModelMap model, @RequestBody DataMap param, HttpServletRequest request) {
public ResponseEntity<WnbtResponse> selectBlclist(ModelMap model, @RequestBody HashMap<String, Object> param, HttpServletRequest request) {
log.debug("selectBlclist(param = {})", param);
Map<String, String> util = new HashMap<>();
@@ -2533,7 +2536,12 @@ public class OrdrController {
param.put("ipAdres", ipAdres);
log.debug("param = {}", param);
Map<String, Object> content = selectBlclist(param);
DataMap paramData = new DataMap();
param.entrySet().forEach(map -> {
paramData.put(map.getKey(), map.getValue());
});
Map<String, Object> content = selectBlclist(paramData);
return ResponseEntity.ok(
WnbtResponse.builder()
.resBody(new WnbtResponseBody(content))