Compare commits
73 Commits
53f5f0d3bb
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e33dc43f3 | ||
|
|
5f3687deb1 | ||
|
|
a59dc92601 | ||
|
|
5527c23171 | ||
|
|
7b24a5395f | ||
|
|
87da1e547e | ||
|
|
889639a63b | ||
|
|
7594ebcb88 | ||
|
|
60f28bae5a | ||
|
|
4ad51df503 | ||
|
|
bb3ecebad1 | ||
|
|
342bea50d6 | ||
|
|
103621fe2a | ||
|
|
8be851c472 | ||
|
|
27301d554b | ||
|
|
668823a32a | ||
|
|
24c697bfbf | ||
|
|
9347d5407c | ||
|
|
0aad369f61 | ||
|
|
04493a107c | ||
|
|
a86e1e5c16 | ||
|
|
f4e9a49b12 | ||
|
|
4bec8b7eb9 | ||
|
|
808b2c8b03 | ||
|
|
f9b8c8712a | ||
|
|
c6c041819b | ||
|
|
f1767425a0 | ||
|
|
cb0157a73b | ||
|
|
7564dc21e5 | ||
|
|
06760482aa | ||
|
|
1c48d65b7b | ||
|
|
15f299d842 | ||
|
|
49738b87bd | ||
|
|
1b52e2ecbd | ||
|
|
de7bb587e2 | ||
|
|
de3c84957d | ||
|
|
ff289ac2c8 | ||
|
|
19586bd744 | ||
|
|
fc47ad11ad | ||
|
|
ad649de088 | ||
|
|
c6d656b648 | ||
|
|
ac2402d764 | ||
|
|
df8c176dbb | ||
|
|
846de3009c | ||
|
|
194ab35ba6 | ||
|
|
f894756a5f | ||
|
|
82ec7f8b20 | ||
|
|
6222c3b7d1 | ||
|
|
184dbbe21b | ||
|
|
2e28122d97 | ||
|
|
297664b621 | ||
|
|
c51f716cc4 | ||
|
|
2b8e84799d | ||
|
|
cb655263af | ||
|
|
1de8b5c39f | ||
|
|
4074ace97d | ||
|
|
28ee8f8556 | ||
|
|
bbeb2a630a | ||
|
|
bc7f738e55 | ||
|
|
32250636e9 | ||
|
|
6858b24344 | ||
|
|
c04668fda2 | ||
|
|
1cab83f69f | ||
|
|
784cadc6f2 | ||
|
|
39ce46c4dc | ||
|
|
03ec9d863e | ||
|
|
7bfa5a288c | ||
|
|
56f29943b6 | ||
|
|
31561200c2 | ||
|
|
5fa4aa5c37 | ||
|
|
f2038728fd | ||
|
|
450e43aecb | ||
|
|
1d72e28600 |
@@ -3,6 +3,7 @@ package com.wb.domainserver.domain.admin.store.sopmal.mapper;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.wb.domainserver.domain.admin.store.sopmal.vo.Shop;
|
import com.wb.domainserver.domain.admin.store.sopmal.vo.Shop;
|
||||||
|
import com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO;
|
||||||
import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponVO;
|
import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponVO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
@@ -202,4 +203,7 @@ public interface BOMaSopmalMapper {
|
|||||||
|
|
||||||
/*전체 쇼핑몰 목록*/
|
/*전체 쇼핑몰 목록*/
|
||||||
List<DataMap> selectSopmalList();
|
List<DataMap> selectSopmalList();
|
||||||
|
|
||||||
|
// XML 수정 임시
|
||||||
|
public List<DataMap> selectSitemapXml(String sopmalCd);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import com.wb.domainserver.domain.admin.sys.menu.vo.BOMaMenuVO;
|
|||||||
import com.wb.domainserver.domain.gcone.goods.goodsinfo.mapper.BOGoodsinfoMapper;
|
import com.wb.domainserver.domain.gcone.goods.goodsinfo.mapper.BOGoodsinfoMapper;
|
||||||
import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
|
import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.apache.commons.text.StringEscapeUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
@@ -984,4 +985,43 @@ public class BOMaSopmalService {
|
|||||||
return mapper.selectSopmalList();
|
return mapper.selectSopmalList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 사이트맵 XML
|
||||||
|
* @param sopmalCd
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
public String selectSitemapXml(String sopmalCd) {
|
||||||
|
List<DataMap> resultList = new ArrayList<>();
|
||||||
|
StringBuilder xml = new StringBuilder();
|
||||||
|
|
||||||
|
try {
|
||||||
|
xml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
|
||||||
|
xml.append("<?xml-stylesheet type=\"text/css\" href=\"https://www.xml-sitemaps.com/css/sitemap.css\"?>");
|
||||||
|
xml.append("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n");
|
||||||
|
|
||||||
|
resultList = mapper.selectSitemapXml(sopmalCd);
|
||||||
|
for (DataMap data : resultList) {
|
||||||
|
xml.append(" <url>");
|
||||||
|
xml.append(" <loc>")
|
||||||
|
.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("targetUrl"))))
|
||||||
|
.append("</loc>");
|
||||||
|
xml.append(" <lastmod>")
|
||||||
|
.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("lastModified"))))
|
||||||
|
.append("</lastmod>");
|
||||||
|
xml.append(" <priority>")
|
||||||
|
.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("priority"))))
|
||||||
|
.append("</priority>");
|
||||||
|
xml.append(" </url>");
|
||||||
|
}
|
||||||
|
|
||||||
|
xml.append("</urlset>");
|
||||||
|
} catch (WnbtRestException wre){
|
||||||
|
throw new WnbtRestException(wre.getMessage());
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error(e.getMessage(), e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return xml.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1570,10 +1570,10 @@ public class BOPayService{
|
|||||||
String authKey = resultMap.get("kcpSecretKey").toString();
|
String authKey = resultMap.get("kcpSecretKey").toString();
|
||||||
String cpId = resultMap.get("kcpMid").toString();
|
String cpId = resultMap.get("kcpMid").toString();
|
||||||
// 개발서버 네이버페이 CPID 관련 적용 취소
|
// 개발서버 네이버페이 CPID 관련 적용 취소
|
||||||
// if ("naverpay".equals(payVO.getModGubun())) {
|
if ("naverpay".equals(payVO.getModGubun())) {
|
||||||
// authKey = resultMap.get("bpaySecretKey").toString();
|
authKey = resultMap.get("bpaySecretKey").toString();
|
||||||
// cpId = resultMap.get("bpayMid").toString();
|
cpId = resultMap.get("bpayMid").toString();
|
||||||
// }
|
}
|
||||||
|
|
||||||
String amount = payVO.getCancelAmount(); //취소금액
|
String amount = payVO.getCancelAmount(); //취소금액
|
||||||
String trxId = payVO.getTno(); //거래번호
|
String trxId = payVO.getTno(); //거래번호
|
||||||
|
|||||||
@@ -1120,7 +1120,7 @@ public class BORtngudrefndService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 개발서버 네이버페이 CPID 구분 적용 취소
|
// 개발서버 네이버페이 CPID 구분 적용 취소
|
||||||
// payVO.setModGubun(setle.getPgCmpnyNm()); //결제키 구분용
|
payVO.setModGubun(setle.getPgCmpnyNm()); //결제키 구분용
|
||||||
if ("kiwoom".equals(setle.getPgCmpnyNm())) {
|
if ("kiwoom".equals(setle.getPgCmpnyNm())) {
|
||||||
payVO.setPayMethod("CARD");
|
payVO.setPayMethod("CARD");
|
||||||
} else if ("naverpay".equals(setle.getPgCmpnyNm())) {
|
} else if ("naverpay".equals(setle.getPgCmpnyNm())) {
|
||||||
|
|||||||
@@ -198,6 +198,20 @@ public class MainController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 사이트맵 XML
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Policy(AuthPolicy.PUBLIC)
|
||||||
|
@RequestMapping(value="/sitemap", produces = MediaType.APPLICATION_XML_VALUE)
|
||||||
|
public ResponseEntity<String> selectSitemapXml() {
|
||||||
|
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
|
||||||
|
String xml = boMaSopmalService.selectSitemapXml(user.getSopmalCd());
|
||||||
|
|
||||||
|
return ResponseEntity.ok().contentType(MediaType.APPLICATION_XML).body(xml);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 비회원 휴대폰번호 확인
|
* 비회원 휴대폰번호 확인
|
||||||
* @return OrdrDtlR.jsp
|
* @return OrdrDtlR.jsp
|
||||||
|
|||||||
@@ -1569,5 +1569,124 @@
|
|||||||
AND GD.USE_AT = 'Y'
|
AND GD.USE_AT = 'Y'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<!-- 사이트맵 XML -->
|
||||||
|
<select id="selectSitemapXml"
|
||||||
|
parameterType="String"
|
||||||
|
resultType="dataMap">
|
||||||
|
WITH RECURSIVE CATEGORY_TREE AS (
|
||||||
|
SELECT
|
||||||
|
GC.CTGRY_ID
|
||||||
|
, GC.UPPER_CTGRY_ID
|
||||||
|
, GC.SOPMAL_CD
|
||||||
|
, GC.CTGRY_NM
|
||||||
|
, GC.CTGRY_DEPTH
|
||||||
|
, GC.SORT_ORDR
|
||||||
|
, GC.CTGRY_DV_CD
|
||||||
|
, GC.EXPSR_CD
|
||||||
|
, GC.URL_DV_CD
|
||||||
|
, CASE
|
||||||
|
WHEN GC.URL_DV_CD = '01' THEN ''
|
||||||
|
WHEN GC.URL_DV_CD = '02' THEN GC.URL
|
||||||
|
ELSE NULL
|
||||||
|
END URL
|
||||||
|
, GC.USE_AT
|
||||||
|
, GC.EXPSR_BGN_DT
|
||||||
|
, GC.EXPSR_END_DT
|
||||||
|
FROM GC_CATEGORY GC
|
||||||
|
WHERE GC.SOPMAL_CD = #{sopmalCd}
|
||||||
|
AND GC.UPPER_CTGRY_ID IS NULL
|
||||||
|
AND GC.USE_AT = 'Y'
|
||||||
|
AND (
|
||||||
|
GC.EXPSR_CD = '01'
|
||||||
|
OR (
|
||||||
|
GC.EXPSR_CD = '03'
|
||||||
|
AND SYSDATE() BETWEEN GC.EXPSR_BGN_DT AND GC.EXPSR_END_DT
|
||||||
|
)
|
||||||
|
)
|
||||||
|
UNION ALL
|
||||||
|
SELECT
|
||||||
|
CHILD.CTGRY_ID
|
||||||
|
, CHILD.UPPER_CTGRY_ID
|
||||||
|
, CHILD.SOPMAL_CD
|
||||||
|
, CHILD.CTGRY_NM
|
||||||
|
, CHILD.CTGRY_DEPTH
|
||||||
|
, CHILD.SORT_ORDR
|
||||||
|
, CHILD.CTGRY_DV_CD
|
||||||
|
, CHILD.EXPSR_CD
|
||||||
|
, CHILD.URL_DV_CD
|
||||||
|
, CASE
|
||||||
|
WHEN CHILD.URL_DV_CD = '01' THEN
|
||||||
|
CASE
|
||||||
|
WHEN CHILD.CTGRY_DV_CD = '01' THEN CONCAT('/sopmal/goods/selectGoodsListForm?ctgryId=', CHILD.CTGRY_ID)
|
||||||
|
ELSE NULL
|
||||||
|
END
|
||||||
|
WHEN CHILD.URL_DV_CD = '02' THEN CHILD.URL
|
||||||
|
ELSE NULL
|
||||||
|
END URL
|
||||||
|
, CHILD.USE_AT
|
||||||
|
, CHILD.EXPSR_BGN_DT
|
||||||
|
, CHILD.EXPSR_END_DT
|
||||||
|
FROM GC_CATEGORY CHILD
|
||||||
|
INNER JOIN CATEGORY_TREE PARENT
|
||||||
|
ON CHILD.SOPMAL_CD = PARENT.SOPMAL_CD
|
||||||
|
AND CHILD.UPPER_CTGRY_ID = PARENT.CTGRY_ID
|
||||||
|
WHERE CHILD.USE_AT = 'Y'
|
||||||
|
AND (
|
||||||
|
CHILD.EXPSR_CD = '01'
|
||||||
|
OR (
|
||||||
|
CHILD.EXPSR_CD = '03'
|
||||||
|
AND SYSDATE() BETWEEN CHILD.EXPSR_BGN_DT AND CHILD.EXPSR_END_DT
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
SELECT CONCAT(GS.PC_DOMN_ADRES, GC.URL) AS TARGET_URL
|
||||||
|
, DATE_FORMAT(SYSDATE(), '%Y-%m-%dT%H:%i:%s+09:00') AS LAST_MODIFIED
|
||||||
|
, ROUND(POWER(0.8, GC.CTGRY_DEPTH - 1), 4) AS PRIORITY
|
||||||
|
FROM CATEGORY_TREE GC
|
||||||
|
INNER JOIN GC_SHOP GS
|
||||||
|
ON GC.SOPMAL_CD = GS.SOPMAL_CD
|
||||||
|
WHERE GC.CTGRY_DV_CD != '02'
|
||||||
|
AND GC.CTGRY_DEPTH != 2
|
||||||
|
UNION
|
||||||
|
SELECT CONCAT(GS.PC_DOMN_ADRES, '/sopmal/goods/selectGoodsDtl?goodsInnb=', GG.GOODS_INNB) AS TARGET_URL
|
||||||
|
, DATE_FORMAT(GG.UPDT_DT, '%Y-%m-%dT%H:%i:%s+09:00') AS LAST_MODIFIED
|
||||||
|
, ROUND(POWER(0.8, 1), 4) AS PRIORITY
|
||||||
|
FROM GC_GOODS GG
|
||||||
|
INNER JOIN GC_SHOP GS
|
||||||
|
ON GG.SOPMAL_CD = GS.SOPMAL_CD
|
||||||
|
WHERE GG.USE_AT = 'Y'
|
||||||
|
AND GG.SOPMAL_CD = #{sopmalCd}
|
||||||
|
AND GG.GOODS_KND_CD = '01'
|
||||||
|
AND GG.EXPSR_DV_CD = '01'
|
||||||
|
AND GG.GOODS_STTUS_CD IN ('01', '02')
|
||||||
|
UNION
|
||||||
|
SELECT CONCAT(GS.PC_DOMN_ADRES, '/sopmal/csc/selectBbscttAuth?authDv=CM&bbsTyCd=',
|
||||||
|
CASE
|
||||||
|
WHEN GB.BBS_ID = 'sake_column' THEN '01'
|
||||||
|
WHEN GB.BBS_ID = 'magazine' THEN '09'
|
||||||
|
ELSE NULL
|
||||||
|
END,
|
||||||
|
'&bbscttInnb=', GB.BBSCTT_INNB,
|
||||||
|
'&reqUrl=subPage&bbsId=', GB.BBS_ID,
|
||||||
|
'&cscAt='
|
||||||
|
) AS TARGET_URL
|
||||||
|
, DATE_FORMAT(GB.UPDT_DT, '%Y-%m-%dT%H:%i:%s+09:00') AS LAST_MODIFIED
|
||||||
|
, ROUND(POWER(0.8, 1), 4) AS PRIORITY
|
||||||
|
FROM GC_BOARDDATA GB
|
||||||
|
INNER JOIN GC_SHOP GS
|
||||||
|
ON GB.SOPMAL_CD = GS.SOPMAL_CD
|
||||||
|
WHERE GB.USE_AT = 'Y'
|
||||||
|
AND GB.EXPSR_AT = 'Y'
|
||||||
|
AND (
|
||||||
|
GB.NTCE_PD_SETUP_AT = 'N'
|
||||||
|
OR (
|
||||||
|
GB.NTCE_PD_SETUP_AT = 'Y'
|
||||||
|
AND DATE_FORMAT(SYSDATE(), '%Y-%m-%d') BETWEEN DATE_FORMAT(GB.NTCE_BGN_DE, '%Y-%m-%d') AND DATE_FORMAT(GB.NTCE_END_DE, '%Y-%m-%d')
|
||||||
|
)
|
||||||
|
)
|
||||||
|
AND GB.BBS_ID IN ('sake_column', 'magazine')
|
||||||
|
AND depth = 0
|
||||||
|
ORDER BY PRIORITY DESC
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 4.4 KiB |
@@ -133,6 +133,17 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ********************************************************
|
||||||
|
* xml 임시
|
||||||
|
******************************************************** */
|
||||||
|
const fn_update_xml = function () {
|
||||||
|
const url = '<c:url value="/mngr/goods/goodsmngr/selectGoodsRegistForm"/>';
|
||||||
|
|
||||||
|
$('#listForm').attr('action', url);
|
||||||
|
$('#listForm').attr('method', 'post');
|
||||||
|
$('#listForm').submit();
|
||||||
|
};
|
||||||
|
|
||||||
/* ********************************************************
|
/* ********************************************************
|
||||||
* 등록폼 이동
|
* 등록폼 이동
|
||||||
******************************************************** */
|
******************************************************** */
|
||||||
@@ -441,6 +452,7 @@
|
|||||||
<div class="page-title">
|
<div class="page-title">
|
||||||
<h2 class="page-title__title">상품 목록</h2>
|
<h2 class="page-title__title">상품 목록</h2>
|
||||||
<div class="page-title__btn-container">
|
<div class="page-title__btn-container">
|
||||||
|
<button onclick="fn_update_xml()" class="btn primary">XML 업데이트(임시)</button>
|
||||||
<button onclick="fn_move_regpage()" class="btn primary">상품 <spring:message code="button.insert"/></button>
|
<button onclick="fn_move_regpage()" class="btn primary">상품 <spring:message code="button.insert"/></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -642,12 +642,12 @@
|
|||||||
const kcpMid = '<c:out value="${data.payInfo.kcpMid}"/>';
|
const kcpMid = '<c:out value="${data.payInfo.kcpMid}"/>';
|
||||||
const bpayMid = '<c:out value="${data.payInfo.bpayMid}"/>';
|
const bpayMid = '<c:out value="${data.payInfo.bpayMid}"/>';
|
||||||
// 개발서버 네이버페이 CPID 구분 적용 취소
|
// 개발서버 네이버페이 CPID 구분 적용 취소
|
||||||
$(form).find('#siteCdMid').val(kcpMid);
|
// $(form).find('#siteCdMid').val(kcpMid);
|
||||||
// if('naverpay' === id) {
|
if('naverpay' === id) {
|
||||||
// $(form).find('#siteCdMid').val(bpayMid);
|
$(form).find('#siteCdMid').val(bpayMid);
|
||||||
// } else {
|
} else {
|
||||||
// $(form).find('#siteCdMid').val(kcpMid);
|
$(form).find('#siteCdMid').val(kcpMid);
|
||||||
// }
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/* 결제예정금액 > 약관 전체동의 선택 이벤트 */
|
/* 결제예정금액 > 약관 전체동의 선택 이벤트 */
|
||||||
|
|||||||
Reference in New Issue
Block a user