diff --git a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java index 5b721716..6c2032de 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java @@ -184,7 +184,10 @@ public interface BOGnrlbbscttMapper { ********************************************************************/ /** 게시글 연관 상품 등록 */ public void insertBOBbscttGoods(BOGnrlbbscttVO bbsctt); - + + /** 게시글 연관 주문 등록 (1:1문의) */ + public void insertBOBbscttM2mGoods(BOGnrlbbscttVO bbsctt); + /** 게시글 상세조회(연관상품목록) */ public List selectBOBbscttDtlGoods(BOGnrlbbscttVO bbsctt); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java index 4a835e62..96bcbdee 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java @@ -340,6 +340,7 @@ public class BOGnrlbbscttService { resultList = mapper.selectBOM2mBbscttListInqire(bbsctt); if(resultList != null && resultList.size() !=0){ resultCnt.setTotCnt(((BigInteger) resultList.get(0).get("totCnt")).intValue()); + bbsctt.getPaginationInfo().setTotalRecordCount(((BigInteger) resultList.get(0).get("totCnt")).intValue()); }else{ resultCnt.setTotCnt(0); } @@ -898,6 +899,12 @@ public class BOGnrlbbscttService { mapper.insertBOBbscttGoods(bbsctt); } } + /*1:1문의 (반품문의)는 주문번호 등록*/ + if("12".equals(bbsctt.getBbsTyCd())){ + if(bbsctt.getOrdrInnb() != null){ + mapper.insertBOBbscttM2mGoods(bbsctt); + } + } message.put("result", "success"); /*마일리지 적립 시 게시글고유번호 파라미터*/ message.put("bbscttInnb", bbsctt.getBbscttInnb()); 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..957e656a 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 @@ -938,7 +938,7 @@ public class CscController { // sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttRegistPopupForm",bbsctt) // ); model.addAttribute("resultMap", resultMap); - model.addAttribute("bbscttVO", resultMap); + model.addAttribute("bbscttVO", bbsctt); return Util.getDeviceType(request)+"/csc/BbscttRegistPopupC"; } @@ -1182,7 +1182,7 @@ public class CscController { // ); } - /**ㄴ + /** * 게시글 삭제 * @param bbsctt * @return ResponseEntity @@ -1654,7 +1654,6 @@ public class CscController { if ("01".equals(user.getSysDvCd())) { bbsctt.setSopmalCd(user.getSopmalCd()); } - ; BOGnrlbbscttVO regusrInfo = new BOGnrlbbscttVO(); DataMap mbrInfo = new DataMap(); diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java index 717e0a8e..ee9311a9 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java @@ -261,16 +261,6 @@ public class MyActController { return Util.getDeviceType(request)+"/mpage/act/MyGoodsQnaDtlUpdtU"; } - - - - - - - - - - /** * 1:1 문의 조회 * @param bbsctt @@ -406,23 +396,6 @@ public class MyActController { return Util.getDeviceType(request)+"/mpage/act/MyM2mQnaDtlUpdtU"; } - - - - - - - - - - - - - - - - - /** * 나의 리뷰 조회 폼 * @param bbsctt diff --git a/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml index 3ffb9ce7..61560826 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml @@ -1550,7 +1550,7 @@ FROM ( SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM ,TB.* - FROM (SELECT ROW_NUMBER() OVER() TOT_CNT, + FROM (SELECT CAST(count(*) OVER() AS UNSIGNED) AS TOT_CNT, FB.BBSCTT_INNB , FB.IP , FB.SJ , @@ -2612,6 +2612,37 @@ #{goodsInnb}) + + + INSERT INTO GC_BOARDDATA_GOODS + ( + SOPMAL_CD, + BBSCTT_INNB, + ORDR_GOODS_OPTN_INNB, + RE_ORDER_AT, + REGUSR, + REGIST_DT, + GOODS_INNB) + (SELECT GOI.SOPMAL_CD + , #{bbscttInnb} AS BBSCTT_INNB + , GOIO.ORDR_GOODS_OPTN_INNB + , #{reOrderAt} AS RE_ORDER_AT + , #{regusr} AS REGIST_DT + , SYSDATE() + , GOI.GOODS_INNB + FROM GC_ORDER_ITEM GOI + JOIN GC_ORDER_ITEM_OPTION GOIO + ON GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB + AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD + WHERE GOI.ORDR_INNB = #{ordrInnb} + AND GOI.SOPMAL_CD = #{sopmalCd} + ORDER BY GOIO.ORDR_GOODS_OPTN_INNB ASC + LIMIT 1 + ) + + @@ -301,6 +307,13 @@ + <%-- 1:1 문의--%> + + + + + + <%--답변사용여부와 게시글 문자사용여부 체크--%> @@ -595,7 +608,6 @@

-
diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp index ef27b2aa..57fd3d26 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp @@ -1002,6 +1002,28 @@ } + /******************************************************************** + * 1:1 문의 등록폼 호출 (C) + ********************************************************************/ + const fn_pop_m2mqna_regist = (ordrInnb) => { + $.ajax({ + type: "post", + data: { + authDv: "REGIST", + reqUrl: "modal", + bbsId: "mbrqna", + ordrInnb: ordrInnb, + listAt: "m2m", + }, + url: "/sopmal/csc/selectBbscttAuth", + success: function (data) { + /*모달중복제거*/ + fn_close_modal("qna-pop-regist"); + $("#modalDiv").html(data); + $("#qna-pop-regist").modal(); + } + }); + } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp index d2f60a46..70717f70 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp @@ -90,7 +90,8 @@ ');" class="btn outline sm full">배송조회 - ', '','', '', '');" class="btn-ordr-sttus btn gray sm full">반품신청 +<%-- ', '','', '', '');" class="btn-ordr-sttus btn gray sm full">반품신청--%> + ');" class="btn-ordr-sttus btn gray sm full">반품신청 " class="btn-ordr-sttus btn theme sm full">리뷰작성 diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp index adad8d8d..74aedfdd 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp @@ -798,9 +798,6 @@ }); } - - - /* 반품/환불 신청 */ const fn_post_return_regist = function(data) { if (!confirm("반품신청을 하시겠습니까?")) { @@ -1084,6 +1081,29 @@ window.open(url, "", status); } + /******************************************************************** + * 1:1 문의 등록폼 호출 (C) + ********************************************************************/ + const fn_pop_m2mqna_regist = (ordrInnb) => { + $.ajax({ + type: "post", + data: { + authDv: "REGIST", + reqUrl: "modal", + bbsId: "mbrqna", + ordrInnb: ordrInnb, + listAt: "m2m", + }, + url: "/sopmal/csc/selectBbscttAuth", + success: function (data) { + /*모달중복제거*/ + fn_close_modal("qna-pop-regist"); + $("#modalDiv").html(data); + $("#qna-pop-regist").modal(); + } + }); + } + @@ -1289,7 +1309,7 @@ ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 - ', '','', '', '');">반품신청 + ');">반품신청 @@ -1443,7 +1463,7 @@ ');" id="inqireDlvy" class="btn-ordr-sttus btn outline sm full">배송조회 - ', '','', '', '');">반품신청 + ');">반품신청 diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp index 130fd457..8c08392e 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttRegistPopupC.jsp @@ -174,6 +174,7 @@ //등록 버튼 이벤트 $("#regBtn").on("click", function () { $("#closeModalTarget").val("confirm_reg_alert"); + console.log($("#closeModalTarget").val()); if($("#reqDv").val() === 'goodsDtl') {//상품 상세에서 등록 시 openConfirmModal(function (onSuccess) { fn_regist_bbsctt(onSuccess);//등록함수 @@ -182,7 +183,16 @@ , 'success_reg_alert' , '#regSuccessBtn' , fn_select_qna, '1'); - }else{ + }else if($("#reqDv").val() === 'm2m') {//1:1문의 + openConfirmModal(function (onSuccess) { + fn_regist_bbsctt(onSuccess);//등록함수 + }, 'confirm_reg_alert' + , '#regCfrmBtn' + , 'success_reg_alert' + , '#regSuccessBtn' + , fn_goM2mqna, '1'); + }else { + console.log("등록처리"); openConfirmModal(function (onSuccess) { fn_regist_bbsctt(onSuccess);//등록함수 }, 'confirm_reg_alert' @@ -193,6 +203,11 @@ }); }); + if (typeof fn_goM2mqna === 'undefined') { + function fn_goM2mqna(curPage) { + window.location.href = "/sopmal/mpage/act/selectM2mQnaInqire?bbsId=mbrqna"; + } + } /********************************************************* * 게시글 등록 *********************************************************/ @@ -271,6 +286,7 @@
+
@@ -286,6 +302,13 @@
+ <%-- 1:1 문의--%> + +
+
주문번호*
+ +
+
<%--답변사용여부와 게시글 문자사용여부 체크--%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyM2mQaR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyM2mQaR.jsp index 4a6c37d8..04e0784c 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyM2mQaR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyM2mQaR.jsp @@ -21,10 +21,11 @@ + diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp index 49993d14..aa4ee198 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp @@ -25,7 +25,7 @@ fn_dlvy_event(); - MicroModal.init(); + // MicroModal.init(); }); /* ******************************************************** @@ -612,7 +612,30 @@ window.open(url, "", status); } - + /******************************************************************** + * 1:1 문의 등록폼 호출 (C) + ********************************************************************/ + const fn_pop_m2mqna_regist = (ordrInnb) => { + $.ajax({ + type: "post", + data: { + authDv: "REGIST", + reqUrl: "modal", + bbsId: "mbrqna", + ordrInnb: ordrInnb, + reqDv: "m2m" + }, + url: "/sopmal/csc/selectBbscttAuth", + success: function (data) { + $('#authPop').remove(); + $("#modalDiv").html(data); + openModal2('authPop'); + // MicroModal.init(); + // closeModal("authPop"); + // openModal2("authPop"); + } + }); + } @@ -721,7 +744,7 @@ 배송조회 - ','', '', '');">반품신청 + ');">반품신청 @@ -866,7 +889,7 @@ 배송조회 - ','', '', '');">반품신청 + ');">반품신청
게시글 등록
주문번호*
답변수신