diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java b/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java index dafd5ff9..abd4a97b 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java @@ -21,6 +21,7 @@ import com.wb.domainserver.domain.gcone.setup.dlvygrp.service.BODlvygrpService; import com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO; import com.wb.domainserver.domain.gcone.setup.ordrmngr.service.BOOrdrMngrService; import com.wb.domainserver.domain.gcone.setup.ordrmngr.vo.BOSetupOrdrVO; +import com.wb.domainserver.response.ApiResponse; import com.wb.domainserver.response.WnbtResponse; import com.wb.domainserver.response.WnbtResponseBody; import com.wb.domainserver.response.WnbtWebClientResponseHandler; @@ -36,6 +37,9 @@ import com.wb.domainserver.util.util.Util; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.configurationprocessor.json.JSONObject; +import org.springframework.boot.configurationprocessor.json.JSONStringer; +import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -647,6 +651,11 @@ public class GoodsController { DataMap rvwBnefInfo = new DataMap(); rvwBnefInfo = boGnrlbbscttService.selectBORvwBnefInfo(bbsctt); + log.debug("rvwBnefInfo : {}",rvwBnefInfo); + +// JSONObject jsonObject = new JSONObject(rvwBnefInfo); +// log.debug("jsonObject : {}",jsonObject); + return ResponseEntity.ok( WnbtResponse.builder() .resBody(new WnbtResponseBody(rvwBnefInfo)) diff --git a/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp index a35b5200..1145e062 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp @@ -1374,7 +1374,10 @@ type: "post", url: "/sopmal/goods/selectRvwBnefInfo", success: function (data) { - fn_set_rvw_bnef_cn(data); + // console.log("fn_select_rvw_bnef_info data: "+data); + const jsonString = JSON.stringify(data.resBody.result); + // console.log("fn_select_rvw_bnef_info jsonString: "+jsonString); + fn_set_rvw_bnef_cn(jsonString); fn_pop_Modal("#reviewBenefit", "#reviewBenefitContent"); } }); @@ -1390,25 +1393,25 @@ } /*리뷰 혜택 내용 set*/ const fn_set_rvw_bnef_cn = (data) => { - const rvwBnefInfo = JSON.parse(data.resBody.result); + // const rvwBnefInfo = JSON.parse(data.resBody.result); + const rvwBnefInfo = JSON.parse(JSON.parse(data)); /*일반리뷰 정보*/ - let gnrlRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt); - let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt); - let writngChrCnt = rvwBnefInfo.writngChrCnt; + let gnrlRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt : null); + let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.photoRvwMlgAccmlmnyAmt : null); + let writngChrCnt = rvwBnefInfo.writngChrCnt != undefined ? rvwBnefInfo.writngChrCnt : null; /*한달리뷰 정보*/ - let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt; - let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt); + let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt != undefined ? rvwBnefInfo.monthBbsExpsrAt : null; + let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt : null); /*일반리뷰,포토리뷰 추가 마일리지 정보*/ - let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe; - let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe; - let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt); - + let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe != undefined ? rvwBnefInfo.aditMlgPymntBgnDe : null; + let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe != undefined ? rvwBnefInfo.aditMlgPymntEndDe : null; + let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.aditPymntMlgAccmlmnyAmt : null); /*한달리뷰,포토리뷰 추가 마일리지 정보*/ - let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe; - let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe; - let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt); + let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe != undefined ? rvwBnefInfo.monthAditMlgPymntBgnDe : null; + let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe != undefined ? rvwBnefInfo.monthAditMlgPymntEndDe : null; + let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt : null); /*포토리뷰 금액 존재 여부에 따른 html 구성*/