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-03 12:04:10 +09:00
parent d0ee787a9e
commit 9cb1d3f419
5 changed files with 119 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Base64Util;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -346,7 +347,7 @@ public class OrdrController {
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectSetleExpectAmt", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectSetleExpectAmt(HttpServletRequest request, @RequestBody DataMap param) {
public ResponseEntity<WnbtResponse> selectSetleExpectAmt(HttpServletRequest request, @RequestBody HashMap<String, Object> param) {
String sesionId ="";
Cookie[] cookies = request.getCookies();
if(cookies != null){
@@ -366,7 +367,11 @@ public class OrdrController {
}
Map<String, Object> content = new HashMap<>();
try {
content = service.selectSetleExpectAmt(param);
DataMap datamap = new DataMap();
param.entrySet().forEach(map -> {
datamap.put(map.getKey(), map.getValue());
});
content = service.selectSetleExpectAmt(datamap);
} catch (WnbtRestException wre) {
log.debug("결제예정금액 ordr wre");
log.error(wre.getMessage(), wre);
@@ -1790,16 +1795,16 @@ public class OrdrController {
// //sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/npay/config/loadNpayConfigDetail", param)
// sendToResrc.ofGetWithParam(RESRC.GCONEBO, "/gcone/ordr/npay/config/loadNpayConfigDetail", param)
// );
Map<String,Object> naverMap = (Map<String, Object>) naverKey.get("npayConfigDetail");
BONpayConfigVO naverMap = (BONpayConfigVO) naverKey.get("npayConfigDetail");
log.debug("naverKey value checking > " + naverMap.toString());
// 네이버 페이 사용 여부
model.addAttribute("naverPayYn", naverKey.get("naverPayYn").toString());
// 네이버 페이 공통인증키
model.addAttribute("commonCertiKey", naverMap.get("commonCertiKey").toString());
model.addAttribute("commonCertiKey", naverMap.getCommonCertiKey());
// 네이버 페이 BUTTON_KEY
model.addAttribute("buttonKey", naverMap.get("buttonKey").toString());
model.addAttribute("buttonKey", naverMap.getButtonKey());
return Util.getDeviceType(request) + "/ordr/SpbkPtinR";
}