Compare commits

..

10 Commits

Author SHA1 Message Date
김현욱
6111f8ea84 Merge remote-tracking branch 'origin/master' 2025-12-11 14:21:27 +09:00
김현욱
6a41d7fa79 화폐단위 변경 샘플 등록(4) 마이페이지 2025-12-11 14:20:39 +09:00
jazz
5614cd9f85 fix : 도메인수정 2025-12-10 17:40:14 +09:00
jazz
753f194e2c fix : 도메인수정 2025-12-10 17:12:12 +09:00
김현욱
a5e30d9a24 login 수정(5) 2025-12-10 12:10:26 +09:00
jazz
a1e8825570 fix : robots.txt파일 추가 2025-12-09 16:50:39 +09:00
jazz
1e78abbe57 fix : SiteRepository 수정 2025-12-09 16:37:04 +09:00
jazz
64cf75ef9b fix : DB접속정보, 도메인 수정 2025-12-09 15:57:35 +09:00
김현욱
2ccdd0aba0 화폐단위 변경 샘플 등록(3) 2025-12-08 17:12:34 +09:00
김현욱
681963c34a 화폐단위 변경 샘플 등록(2) 2025-12-08 16:51:43 +09:00
31 changed files with 531 additions and 253 deletions

View File

@@ -116,6 +116,10 @@ public class AdminLoginController {
loginRequest.setConectBrwsr(browser); loginRequest.setConectBrwsr(browser);
String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
log.debug("admin loginProcess accessUrl :: {}", accessUrl);
loginRequest.setAccessUrl(accessUrl);
loginUser = service.adminLogin(loginRequest); loginUser = service.adminLogin(loginRequest);
loginUser.setSysDvCd("02"); loginUser.setSysDvCd("02");
@@ -262,6 +266,10 @@ public class AdminLoginController {
vo.setMngrId(loginRequest.getUsername()); vo.setMngrId(loginRequest.getUsername());
vo.setPassword(loginRequest.getPassword()); vo.setPassword(loginRequest.getPassword());
String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
log.debug("admin loginCheck accessUrl :: {}", accessUrl);
loginRequest.setAccessUrl(accessUrl);
String secretKey = commonService.selectSecretkey(); String secretKey = commonService.selectSecretkey();
vo.setSecretKey(secretKey); vo.setSecretKey(secretKey);

View File

@@ -223,6 +223,7 @@ public class LoginService {
LoginRequest req = new LoginRequest(); LoginRequest req = new LoginRequest();
req.setUserInnb(userInnb); req.setUserInnb(userInnb);
String accessUrl = UrlExtractor.getOriginalHost(request); String accessUrl = UrlExtractor.getOriginalHost(request);
accessUrl = UrlExtractor.getOriginalHost(accessUrl);
req.setAccessUrl(accessUrl); req.setAccessUrl(accessUrl);
log.debug("createRenewLoginToken accessUrl:{}",accessUrl); log.debug("createRenewLoginToken accessUrl:{}",accessUrl);
req.setSopmalCd(request.getParameter("authSopmalCd")); req.setSopmalCd(request.getParameter("authSopmalCd"));

View File

@@ -13,6 +13,7 @@ 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.mbr.mbr.vo.BOMbrVO;
import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService; import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService;
import com.wb.domainserver.realm.RealmContextHolder; import com.wb.domainserver.realm.RealmContextHolder;
import com.wb.domainserver.realm.util.UrlExtractor;
import com.wb.domainserver.response.ApiResponse; import com.wb.domainserver.response.ApiResponse;
import com.wb.domainserver.response.WnbtResponse; import com.wb.domainserver.response.WnbtResponse;
import com.wb.domainserver.response.WnbtResponseBody; import com.wb.domainserver.response.WnbtResponseBody;
@@ -126,6 +127,10 @@ public class MngrLoginController {
loginRequest.setConectBrwsr(browser); loginRequest.setConectBrwsr(browser);
String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
log.debug("mngr loginProcess accessUrl :: {}", accessUrl);
loginRequest.setAccessUrl(accessUrl);
log.debug("mngr :: /login/mngr :: loginRequest :: {}", loginRequest); log.debug("mngr :: /login/mngr :: loginRequest :: {}", loginRequest);
loginUser = service.mngrLogin(loginRequest); loginUser = service.mngrLogin(loginRequest);
@@ -227,11 +232,18 @@ public class MngrLoginController {
String queryString = request.getParameter("authSopmalCd"); String queryString = request.getParameter("authSopmalCd");
log.debug("mngr loginCheck getParameter authSopmalCd :: {}", queryString); log.debug("mngr loginCheck getParameter authSopmalCd :: {}", queryString);
// if(queryString == null || queryString.isEmpty()){
//
// }
BOJobUserVO vo = new BOJobUserVO(); BOJobUserVO vo = new BOJobUserVO();
vo.setMngrId(loginRequest.getUsername()); vo.setMngrId(loginRequest.getUsername());
vo.setPassword(loginRequest.getPassword()); vo.setPassword(loginRequest.getPassword());
String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
log.debug("mngr loginCheck accessUrl :: {}", accessUrl);
loginRequest.setAccessUrl(accessUrl);
String secretKey = commonService.selectSecretkey(); String secretKey = commonService.selectSecretkey();
vo.setSecretKey(secretKey); vo.setSecretKey(secretKey);

View File

@@ -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.dlvygrp.vo.BODlvygrpVO;
import com.wb.domainserver.domain.gcone.setup.ordrmngr.service.BOOrdrMngrService; import com.wb.domainserver.domain.gcone.setup.ordrmngr.service.BOOrdrMngrService;
import com.wb.domainserver.domain.gcone.setup.ordrmngr.vo.BOSetupOrdrVO; 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.WnbtResponse;
import com.wb.domainserver.response.WnbtResponseBody; import com.wb.domainserver.response.WnbtResponseBody;
import com.wb.domainserver.response.WnbtWebClientResponseHandler; import com.wb.domainserver.response.WnbtWebClientResponseHandler;
@@ -36,6 +37,9 @@ import com.wb.domainserver.util.util.Util;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; 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.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -647,6 +651,11 @@ public class GoodsController {
DataMap rvwBnefInfo = new DataMap(); DataMap rvwBnefInfo = new DataMap();
rvwBnefInfo = boGnrlbbscttService.selectBORvwBnefInfo(bbsctt); rvwBnefInfo = boGnrlbbscttService.selectBORvwBnefInfo(bbsctt);
log.debug("rvwBnefInfo : {}",rvwBnefInfo);
// JSONObject jsonObject = new JSONObject(rvwBnefInfo);
// log.debug("jsonObject : {}",jsonObject);
return ResponseEntity.ok( return ResponseEntity.ok(
WnbtResponse.builder() WnbtResponse.builder()
.resBody(new WnbtResponseBody(rvwBnefInfo)) .resBody(new WnbtResponseBody(rvwBnefInfo))

View File

@@ -17,6 +17,6 @@ public interface SiteRepository extends JpaRepository<Site, Long> {
@Query("SELECT s.realm FROM Site s WHERE s.url = :url") @Query("SELECT s.realm FROM Site s WHERE s.url = :url")
Optional<Realm> findRealmBySiteUrl(@Param("url") String url); Optional<Realm> findRealmBySiteUrl(@Param("url") String url);
@Query("SELECT s FROM Site s WHERE :hostUrl LIKE CONCAT('%', s.url, '%')") @Query("SELECT s FROM Site s WHERE s.url = :hostUrl")
Optional<Site> findByUrl(@Param("hostUrl")String hostUrl); Optional<Site> findByUrl(@Param("hostUrl")String hostUrl);
} }

View File

@@ -87,14 +87,14 @@ public class UrlExtractor {
String host = url.replaceFirst("https?://", ""); String host = url.replaceFirst("https?://", "");
// 로컬 혹은 개발 서브도메인 제거 // 로컬 혹은 개발 서브도메인 제거
/* 서브도메인 구분 //서브도메인 구분
if (host.startsWith("loc.")) { if (host.startsWith("loc.")) {
host = host.replaceFirst("loc\\.", ""); host = host.replaceFirst("loc\\.", "");
} }
if (host.startsWith("dev.")) { if (host.startsWith("dev.")) {
host = host.replaceFirst("dev\\.", ""); host = host.replaceFirst("dev\\.", "");
} }
*/
// 포트번호 제거 // 포트번호 제거
int portIndex = host.indexOf(":"); int portIndex = host.indexOf(":");

View File

@@ -40,6 +40,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
response.setCharacterEncoding(StandardCharsets.UTF_8.name()); response.setCharacterEncoding(StandardCharsets.UTF_8.name());
String realm = RealmContextHolder.getRealm().toLowerCase(); String realm = RealmContextHolder.getRealm().toLowerCase();
log.debug("request realm: {}", realm);
try { try {

View File

@@ -1,5 +1,8 @@
server: server:
port: 18500 port: 18500
error:
whitelabel:
enabled: false
management: management:
endpoints: endpoints:
@@ -7,12 +10,50 @@ management:
exposure: exposure:
include: refresh include: refresh
jwt:
access:
secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
max-age: 3600 # 1시간 (초)
refresh:
secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
max-age: 86400 # 24시간 (초)
spring: spring:
security: security:
oauth2: oauth2:
resourceserver: resourceserver:
jwt: jwt:
issuer-uri: http://172.31.21.12:18320/realms issuer-uri: http://172.31.21.12:18320/realms
client:
registration:
kakao:
client-id: babe84df407dcf2d58624fcf164b505e
client-secret: zl81Pb6a1hlEbrzI0PM5CnbSJa3tEz6s
client-name: Kakao
authorization-grant-type: authorization_code
client-authentication-method: client_secret_post
redirect-uri: "{baseUrl}/login/oauth2/code/kakao"
scope:
- profile_nickname,account_email,gender,birthyear,phone_number,name
naver:
provider: naver
client-id: YnCTvohpxT2LFv7DqNAG
client-secret: UmOZn0YHiw
scope: name,email,gender,mobile
client-name: Naver
authorization-grant-type: authorization_code
redirect-uri: "{baseUrl}/login/oauth2/code/naver"
provider:
kakao:
authorization-uri: https://kauth.kakao.com/oauth/authorize
token-uri: https://kauth.kakao.com/oauth/token
user-info-uri: https://kapi.kakao.com/v2/user/me
user-name-attribute: id
naver:
authorization-uri: https://nid.naver.com/oauth2.0/authorize
token-uri: https://nid.naver.com/oauth2.0/token
user-info-uri: https://openapi.naver.com/v1/nid/me
user-name-attribute: response
datasource: datasource:
gcone: gcone:
hikari: hikari:
@@ -20,12 +61,24 @@ spring:
jdbc-url: jdbc:mysql://172.31.16.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false jdbc-url: jdbc:mysql://172.31.16.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
username: winbit username: winbit
password: dnlsqlxm1! password: dnlsqlxm1!
minimumIdle: 1
maximumPoolSize: 10
idleTimeout: 30000 #30초
maxLifetime: 1800000 #30분
connectionTimeout: 30000
poolName: gconedDevPool
sure: sure:
hikari: hikari:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://172.31.17.11:3306/nutricore jdbc-url: jdbc:mysql://172.31.17.11:3306/nutricore
username: winbit username: winbit
password: dnlsqlxm1! password: dnlsqlxm1!
minimumIdle: 1
maximumPoolSize: 10
idleTimeout: 30000 #30초
maxLifetime: 1800000 #30분
connectionTimeout: 30000
poolName: SureDevPool
jpa: jpa:
hibernate: hibernate:
ddl-auto: update ddl-auto: update
@@ -43,22 +96,41 @@ logging:
com.wb.domainserver: debug com.wb.domainserver: debug
root: info root: info
#Resource-server-url sopmalfo:
url: common:
resource: fileupload:
server: uploaddirs:
product: http://127.0.0.1:18210 goods:
order: http://172.31.15.11:18220 doc: /data/gcone/docFile
payment: http://127.0.0.1:8092 web: /data/gcone/webFile
delivery: http://127.0.0.1:8093 phar: /data/gcone/phFile
coupon-mlg: http://127.0.0.1:8094 rtrn: /data/gcone/rtrnFile
review: http://127.0.0.1:8095 extensions:
extlink: http://127.0.0.1:8096 images: .gif,.jpg,.jpeg,.png
cdnurl: http://dev.img.soju1sake1.com
pagination: pagination:
page-unit: 10 page-unit: 10
page-size: 10 page-size: 10
#kakao js test key
kakao:
keys:
CH: "b3f10109439ca225a9bda684e358a9b1"
TZ: "b3f10109439ca225a9bda684e358a9b1"
LF: "b3f10109439ca225a9bda684e358a9b1"
NC: "b3f10109439ca225a9bda684e358a9b1"
PL: "b3f10109439ca225a9bda684e358a9b1"
DT: "b3f10109439ca225a9bda684e358a9b1"
NB: "b3f10109439ca225a9bda684e358a9b1"
AF: "b3f10109439ca225a9bda684e358a9b1"
BD: "b3f10109439ca225a9bda684e358a9b1"
DL: "b3f10109439ca225a9bda684e358a9b1"
JM: "b3f10109439ca225a9bda684e358a9b1"
LR: "d1fa06d7edfb5178293ce9718cc82f5b"
#슈어엠 법인별 정보 #슈어엠 법인별 정보
surem: surem:
sopmal: sopmal:
@@ -85,7 +157,7 @@ surem:
erpcode: 02 erpcode: 02
userid: tradithbio02 userid: tradithbio02
deptcode: FO-5SP-HZ deptcode: FO-5SP-HZ
yellowkey: 7ef337e0f1fce8440aa896e9ca4e01ec6aa86f35 yellowkey: 8e5470e841a36882e1a3db87e6a791bcfed5c8d2
#닥터린 #닥터린
DT: DT:
code: NP code: NP
@@ -165,7 +237,6 @@ pos-mileage:
point-rate: 0.01 point-rate: 0.01
point-rate-arr: E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-004:0.03,EX3-005:0.03 point-rate-arr: E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-004:0.03,EX3-005:0.03
point-use-min: 1 point-use-min: 1
point-store-arr: EX3-000079
sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05 sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956 ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956
ext-goods-arr: ext-goods-arr:
@@ -183,9 +254,9 @@ pos-mileage:
E7T-001582: 20000 E7T-001582: 20000
EX3-001510: 20000 EX3-001510: 20000
ext-coupon-arr: ext-coupon-arr:
E07: "076" E07: "063"
E7T: "048" E7T: "035"
EX3: "013" EX3: "031"
CH: CH:
point-except-arr: E07-000484,E07-000954,E07-000955,E07-000975,E07-000976,E07-000977,E07-000979,E7T-000734,E7T-000735,E7T-000725,E7T-000726 point-except-arr: E07-000484,E07-000954,E07-000955,E07-000975,E07-000976,E07-000977,E07-000979,E7T-000734,E7T-000735,E7T-000725,E7T-000726
point-rate: 0.01 point-rate: 0.01
@@ -208,18 +279,9 @@ pos-mileage:
E7T-001582: 20000 E7T-001582: 20000
EX3-001510: 20000 EX3-001510: 20000
ext-coupon-arr: ext-coupon-arr:
E07: "076" E07: "063"
E7T: "048" E7T: "035"
EX3: "013" EX3: "031"
ext-event-dv: brand,prod
ext-event-stdt: 2025-07-21
ext-event-enddt: 2025-07-26
ext-store-event-stdt: 2025-06-18
ext-store-event-enddt: 2025-06-30
ext-prod-event-stdt: 2025-08-01
ext-prod-event-enddt: 2025-09-05
ext-event-except-sopmal: CH,TZ
ext-event-sopmal: NC,PL
PL: PL:
point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570 point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
point-rate: 0.01 point-rate: 0.01
@@ -266,6 +328,12 @@ pos-mileage:
point-rate: 0.01 point-rate: 0.01
SC: SC:
point-rate: 0.01 point-rate: 0.01
ext-event-dv: brand
ext-event-stdt: 2024-04-26
ext-event-enddt: 2024-05-20
ext-event-except-sopmal: CH,TZ
ext-event-sopmal: NC,PL
mngrfo: mngrfo:
common: common:
board: board:
@@ -285,16 +353,22 @@ mngrfo:
web: /webFile web: /webFile
extensions: extensions:
images: .gif,.jpg,.jpeg,.png images: .gif,.jpg,.jpeg,.png
cdnurl: http://dev.img.soju1sake1.com
secret: secret:
key: 1df5be2f7e90ae36 key: 1df5be2f7e90ae36
host: host:
img: http://dev.img.gcone.co.kr img: http://dev.img.soju1sake1.com
naverpay: naverpay:
order: order:
test-url: https://test-api.pay.naver.com test-url: https://test-order.pay.naver.com
real-url: https://api.pay.naver.com test-mobile-Url: https://test-m.pay.naver.com
real-url: https://order.pay.naver.com
real-mobile-Url: https://m.pay.naver.com
zzim: zzim:
test-url: https://test-pay.naver.com test-url: https://test-pay.naver.com
real-url: https://pay.naver.com real-url: https://pay.naver.com
@@ -302,6 +376,8 @@ naverpay:
mail: mail:
host: 127.0.0.1 host: 127.0.0.1
port: 25 port: 25
username: celebpay@inssoft.kr
#이지웰페이 정보 #이지웰페이 정보
easywell: easywell:
@@ -331,7 +407,38 @@ bankda:
pw: ITteam1! pw: ITteam1!
#default css #default css
css-cours: css/theme/themeAF.css css-cours : css/theme/themeAF.css
#선물하기 URL #선물하기 URL
presenturl : dev.svc.gcone.co.kr presenturl : dev.svc.soju1sake1.com
# 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
# 송장번호 %INVCNB% 치환
# 한진택배는 운송번호 바로 조회 서비스 미제공함
ordr:
export:
hdrycpn:
code0: https://trace.cjlogistics.com/next/tracking.html?wblNo=%INVCNB%
code7: https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=%INVCNB%&displayHeader=
code9: https://www.hanjin.com/kor/CMS/DeliveryMgr/WaybillSch.do?mCode=MN038
code10: https://www.lotteglogis.com/home/reservation/tracking/linkView?InvNo=%INVCNB%
code29: https://ylis.yongmalogis.co.kr/cmm/modalDeliveryCargoTrace.do?ordno=%INVCNB%
# 서치어드바이저 소유권 코드
meta-content:
google:
LR: ""
naver:
LR: "5fcdb284f18ca08cf86af214a01998990c008e84"
facebook:
LR: ""
# 결제 api 사용 암호 key
api:
AES_KEY: "aMZV6RjCtE1iyuH8WyE+Hg=="
DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
currency-unit:
default: 円(엔)
JP: 円(엔)
KR: 원

View File

@@ -1,5 +1,8 @@
server: server:
port: 18500 port: 18500
error:
whitelabel:
enabled: false
management: management:
endpoints: endpoints:
@@ -55,9 +58,9 @@ spring:
gcone: gcone:
hikari: hikari:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://172.31.16.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false jdbc-url: jdbc:mysql://sakedb01.sldb.iwinv.net:3306/sake
username: winbit username: sakeone
password: dnlsqlxm1! password: dnlfxjtm13@$
minimumIdle: 1 minimumIdle: 1
maximumPoolSize: 10 maximumPoolSize: 10
idleTimeout: 30000 #30초 idleTimeout: 30000 #30초
@@ -67,9 +70,9 @@ spring:
sure: sure:
hikari: hikari:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://172.31.17.11:3306/nutricore jdbc-url: jdbc:mysql://sakedb01.sldb.iwinv.net:3306/sake
username: winbit username: sakeone
password: dnlsqlxm1! password: dnlfxjtm13@$
minimumIdle: 1 minimumIdle: 1
maximumPoolSize: 10 maximumPoolSize: 10
idleTimeout: 30000 #30초 idleTimeout: 30000 #30초
@@ -104,7 +107,7 @@ sopmalfo:
rtrn: /data/gcone/rtrnFile rtrn: /data/gcone/rtrnFile
extensions: extensions:
images: .gif,.jpg,.jpeg,.png images: .gif,.jpg,.jpeg,.png
cdnurl: http://dev.img.gcone.co.kr cdnurl: http://img.soju1sake1.com
pagination: pagination:
@@ -350,7 +353,7 @@ mngrfo:
web: /webFile web: /webFile
extensions: extensions:
images: .gif,.jpg,.jpeg,.png images: .gif,.jpg,.jpeg,.png
cdnurl: http://dev.img.gcone.co.kr cdnurl: http://img.soju1sake1.com
secret: secret:
@@ -358,7 +361,7 @@ secret:
host: host:
img: http://dev.img.gcone.co.kr img: http://img.soju1sake1.com
naverpay: naverpay:
order: order:

View File

@@ -10,48 +10,75 @@ management:
exposure: exposure:
include: refresh include: refresh
jwt:
access:
secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
max-age: 3600 # 1시간 (초)
refresh:
secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
max-age: 86400 # 24시간 (초)
spring: spring:
application:
name: sakemall-stage
config:
additional-location: classpath:/secured-config.yml
servlet:
multipart:
max-file-size: 100MB
max-request-size: 100MB
messages:
basename: messages_ko
encoding: UTF-8
security: security:
oauth2: oauth2:
resourceserver: resourceserver:
jwt: jwt:
issuer-uri: http://10.100.71.12:18320/realms issuer-uri: http://172.31.21.12:18320/realms
client:
registration:
kakao:
client-id: babe84df407dcf2d58624fcf164b505e
client-secret: zl81Pb6a1hlEbrzI0PM5CnbSJa3tEz6s
client-name: Kakao
authorization-grant-type: authorization_code
client-authentication-method: client_secret_post
redirect-uri: "{baseUrl}/login/oauth2/code/kakao"
scope:
- profile_nickname,account_email,gender,birthyear,phone_number,name
naver:
provider: naver
client-id: YnCTvohpxT2LFv7DqNAG
client-secret: UmOZn0YHiw
scope: name,email,gender,mobile
client-name: Naver
authorization-grant-type: authorization_code
redirect-uri: "{baseUrl}/login/oauth2/code/naver"
provider:
kakao:
authorization-uri: https://kauth.kakao.com/oauth/authorize
token-uri: https://kauth.kakao.com/oauth/token
user-info-uri: https://kapi.kakao.com/v2/user/me
user-name-attribute: id
naver:
authorization-uri: https://nid.naver.com/oauth2.0/authorize
token-uri: https://nid.naver.com/oauth2.0/token
user-info-uri: https://openapi.naver.com/v1/nid/me
user-name-attribute: response
datasource: datasource:
gcone: gcone:
hikari: hikari:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://10.100.81.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false jdbc-url: jdbc:mysql://sakedb01.sldb.iwinv.net:3306/sake
username: winbit username: sakeone
password: Roqkf13@$ password: dnlfxjtm13@$
minimumIdle: 20 minimumIdle: 1
maximumPoolSize: 500 maximumPoolSize: 10
idleTimeout: 30000 #30초 idleTimeout: 30000 #30초
maxLifetime: 1800000 #30분 maxLifetime: 1800000 #30분
connectionTimeout: 30000 connectionTimeout: 30000
poolName: gconeboGconePool poolName: SakePool
sure: sure:
hikari: hikari:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://10.100.238.11:3306/surem jdbc-url: jdbc:mysql://sakedb01.sldb.iwinv.net:3306/sake
username: winbit username: sakeone
password: winbit1! password: dnlfxjtm13@$
minimumIdle: 20 minimumIdle: 1
maximumPoolSize: 500 maximumPoolSize: 10
idleTimeout: 30000 #30초10 idleTimeout: 30000 #30초
maxLifetime: 1800000 #30분 maxLifetime: 1800000 #30분
connectionTimeout: 30000 connectionTimeout: 30000
poolName: gconeboSurePool poolName: SurePool
jpa: jpa:
hibernate: hibernate:
ddl-auto: update ddl-auto: update
@@ -63,28 +90,47 @@ mybatis:
logging: logging:
level: level:
org.springframework.web: info org.springframework.web: debug
org.springframework.security: info org.springframework.security: debug
org.springframework.security.oauth2: info org.springframework.security.oauth2: debug
com.wb.domainserver: info com.wb.domainserver: debug
root: info root: info
#Resource-server-url sopmalfo:
url: common:
resource: fileupload:
server: uploaddirs:
product: http://127.0.0.1:18210 goods:
order: http://172.31.15.11:18220 doc: /data/gcone/docFile
payment: http://127.0.0.1:8092 web: /data/gcone/webFile
delivery: http://127.0.0.1:8093 phar: /data/gcone/phFile
coupon-mlg: http://127.0.0.1:8094 rtrn: /data/gcone/rtrnFile
review: http://127.0.0.1:8095 extensions:
extlink: http://127.0.0.1:8096 images: .gif,.jpg,.jpeg,.png
cdnurl: http://img.soju1sake1.com
pagination: pagination:
page-unit: 10 page-unit: 10
page-size: 10 page-size: 10
#kakao js test key
kakao:
keys:
CH: "b3f10109439ca225a9bda684e358a9b1"
TZ: "b3f10109439ca225a9bda684e358a9b1"
LF: "b3f10109439ca225a9bda684e358a9b1"
NC: "b3f10109439ca225a9bda684e358a9b1"
PL: "b3f10109439ca225a9bda684e358a9b1"
DT: "b3f10109439ca225a9bda684e358a9b1"
NB: "b3f10109439ca225a9bda684e358a9b1"
AF: "b3f10109439ca225a9bda684e358a9b1"
BD: "b3f10109439ca225a9bda684e358a9b1"
DL: "b3f10109439ca225a9bda684e358a9b1"
JM: "b3f10109439ca225a9bda684e358a9b1"
LR: "d1fa06d7edfb5178293ce9718cc82f5b"
#슈어엠 법인별 정보 #슈어엠 법인별 정보
surem: surem:
sopmal: sopmal:
@@ -111,7 +157,7 @@ surem:
erpcode: 02 erpcode: 02
userid: tradithbio02 userid: tradithbio02
deptcode: FO-5SP-HZ deptcode: FO-5SP-HZ
yellowkey: 7ef337e0f1fce8440aa896e9ca4e01ec6aa86f35 yellowkey: 8e5470e841a36882e1a3db87e6a791bcfed5c8d2
#닥터린 #닥터린
DT: DT:
code: NP code: NP
@@ -189,11 +235,10 @@ pos-mileage:
NC: NC:
point-except-arr: E07-000954,E07-000955,E7T-000509,E7T-000510,E7T-000725,E7T-000726,E7T-000734,E7T-000735,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570 point-except-arr: E07-000954,E07-000955,E7T-000509,E7T-000510,E7T-000725,E7T-000726,E7T-000734,E7T-000735,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
point-rate: 0.01 point-rate: 0.01
point-rate-arr: E7T-002:0.05,E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-002:0.05,EX3-004:0.03,EX3-005:0.03,E07-021:0.05 point-rate-arr: E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-004:0.03,EX3-005:0.03
point-store-arr: EX3-000079
point-use-min: 1 point-use-min: 1
sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05 sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956, E07-000677, E07-000934, E07-000527, E07-000916, E7T-000037, E7T-000711, E7T-000060, E7T-000693, EX2-000089, EX2-000639, EX2-000082, EX2-000623, EX3-000089, EX3-000680, EX3-000082, EX3-000654, E07-000296, E07-000478, E07-000265, E7T-000063, E7T-000073, E7T-000025, EX2-000063, EX2-000016, EX2-000020, EX3-000063, EX3-000016, EX3-000020 ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956
ext-goods-arr: ext-goods-arr:
fix-point-arr: fix-point-arr:
E07-002045: 30000 E07-002045: 30000
@@ -209,26 +254,16 @@ pos-mileage:
E7T-001582: 20000 E7T-001582: 20000
EX3-001510: 20000 EX3-001510: 20000
ext-coupon-arr: ext-coupon-arr:
E07: "076" E07: "063"
E7T: "048" E7T: "035"
EX3: "013" EX3: "031"
ext-event-dv: brand,prod
ext-event-sopmal: NC,FN,PL
ext-event-stdt: 2025-07-21
ext-event-enddt: 2025-07-27
ext-store-event-stdt: 2025-06-18
ext-store-event-enddt: 2025-06-30
ext-prod-event-stdt: 2025-08-04
ext-prod-event-enddt: 2025-09-05
ext-test-arr: E7T000036
CH: CH:
point-except-arr: E07-000484,E07-000954,E07-000955,E07-000975,E07-000976,E07-000977,E07-000979,E7T-000734,E7T-000735,E7T-000725,E7T-000726 point-except-arr: E07-000484,E07-000954,E07-000955,E07-000975,E07-000976,E07-000977,E07-000979,E7T-000734,E7T-000735,E7T-000725,E7T-000726
point-rate: 0.01 point-rate: 0.01
point-rate-arr: E07-001:0.03,E07-002:0.03,E07-004:0.05,E07-019:0.01,E07-020:0.01,E07-021:0.05,EX2-004:0.03,EX2-005:0.03,EX2-013:0.01 point-rate-arr: E07-001:0.03,E07-002:0.03,E07-019:0.01,E07-020:0.01,EX2-004:0.03,EX2-005:0.03,EX2-013:0.01
point-use-min: 1 point-use-min: 1
sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05 sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956, E07-000677, E07-000934, E07-000527, E07-000916, E7T-000037, E7T-000711, E7T-000060, E7T-000693, EX2-000089, EX2-000639, EX2-000082, EX2-000623, EX3-000089, EX3-000680, EX3-000082, EX3-000654, E07-000296, E07-000478, E07-000265, E7T-000063, E7T-000073, E7T-000025, EX2-000063, EX2-000016, EX2-000020, EX3-000063, EX3-000016, EX3-000020 ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956
ext-goods-arr: ext-goods-arr:
fix-point-arr: fix-point-arr:
E07-002045: 30000 E07-002045: 30000
@@ -244,19 +279,61 @@ pos-mileage:
E7T-001582: 20000 E7T-001582: 20000
EX3-001510: 20000 EX3-001510: 20000
ext-coupon-arr: ext-coupon-arr:
E07: "076" E07: "063"
E7T: "048" E7T: "035"
EX3: "013" EX3: "031"
ext-event-dv: brand,prod PL:
ext-event-stdt: 2025-07-21 point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
ext-event-enddt: 2025-07-27 point-rate: 0.01
ext-prod-event-stdt: 2025-08-04 point-rate-arr: E7T-003:0.03,E7T-004:0.03,EX3-004:0.04,EX3-005:0.03
ext-prod-event-enddt: 2025-09-05 sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
ext-event-except-sopmal: point-use-min: 5000
ext-event-sopmal: NC,FN,PL TZ:
ext-test-arr: E7T000036 point-rate: 0.01
ext-store-event-stdt: 2025-06-18 sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
ext-store-event-enddt: 2025-06-30 point-use-min: 5000
NB:
point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
point-rate: 0.01
point-rate-arr: E7T-003:0.03,E7T-004:0.03,EX3-004:0.04,EX3-005:0.03
sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
point-use-min: 5000
DT:
point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
point-rate: 0.01
point-rate-arr: E7T-003:0.03,E7T-004:0.03,EX3-004:0.04,EX3-005:0.03
sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
point-use-min: 5000
AF:
point-rate: 0.02
BD:
point-rate: 0.01
JM:
point-rate: 0.05
LF:
point-rate: 0.01
DL:
point-rate: 0.01
OY:
point-rate: 0.01
VN:
point-rate: 0.01
CO:
point-rate: 0.01
NC2:
point-rate: 0.01
PL2:
point-rate: 0.01
CN:
point-rate: 0.01
SC:
point-rate: 0.01
ext-event-dv: brand
ext-event-stdt: 2024-04-26
ext-event-enddt: 2024-05-20
ext-event-except-sopmal: CH,TZ
ext-event-sopmal: NC,PL
mngrfo: mngrfo:
common: common:
board: board:
@@ -276,44 +353,52 @@ mngrfo:
web: /webFile web: /webFile
extensions: extensions:
images: .gif,.jpg,.jpeg,.png images: .gif,.jpg,.jpeg,.png
cdnurl: http://img.soju1sake1.com
secret: secret:
key: 1df5be2f7e90ae36 key: 1df5be2f7e90ae36
host: host:
img: https://img.gcone.co.kr img: http://img.soju1sake1.com
naverpay: naverpay:
order: order:
test-url: https://test-api.pay.naver.com test-url: https://test-order.pay.naver.com
real-url: https://api.pay.naver.com test-mobile-Url: https://test-m.pay.naver.com
real-url: https://order.pay.naver.com
real-mobile-Url: https://m.pay.naver.com
zzim: zzim:
test-url: https://test-pay.naver.com test-url: https://test-pay.naver.com
real-url: https://pay.naver.com real-url: https://pay.naver.com
mail: mail:
host: 10.100.238.11 host: 127.0.0.1
port: 25 port: 25
username: celebpay@inssoft.kr
#이지웰페이 정보 #이지웰페이 정보
easywell: easywell:
applc-hdqrtrs : E07, E7T #이지웰페이 적용 본부 applc-hdqrtrs : E07, E7T #이지웰페이 적용 본부
server : server :
nc: #운영서버 (NC) nc: #개발서버 (NC)
ip: 211.180.161.111 ip : 211.180.161.102
port: 3712 port : 3712
company-code: nutricore #회사코드(띄어쓰기(1) 포함 10자) company-code : slbiotech #회사코드(띄어쓰기(1) 포함 10자)
brand-code: nutricore #브랜드코드(띄어쓰기(1) 포함 10자) brand-code : 10067521 #브랜드코드(띄어쓰기(2) 포함 10자)
cipher: AES/CBC/PKCS5Padding #블록 암호화 알고리즘 (as-is AES-128-CBC 동일) cipher : AES/CBC/PKCS5Padding #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
key: cbaab556ceba4713 key : 38a05be31b054a06 #암호화 키
iv: cbaab556ceba4713 iv : 38a05be31b054a06 # 초기화 벡터
other: #운영서버(기타 브랜드) other: #개발서버(기타 브랜드)
ip: 211.180.161.111 ip : 211.180.161.102
port: 3711 port : 3711
company-code: gcbio #회사코드(띄어쓰기(5) 포함 10자) company-code : gcbio #회사코드(띄어쓰기(5) 포함 10자)
brand-code: gcbio #브랜드코드(띄어쓰기(5) 포함 10자) brand-code : "0012345" #브랜드코드(띄어쓰기(3) 포함 10자)
cipher: AES/CBC/PKCS5Padding #블록 암호화 알고리즘 (as-is AES-128-CBC 동일) cipher : AES/CBC/PKCS5Padding #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
key: f9a01135dd01416e key : f0c4c9c0a6154552 #암호화 키
iv: f9a01135dd01416e iv : f0c4c9c0a6154552 # 초기화 벡터
#뱅크다 #뱅크다
bankda: bankda:
@@ -325,4 +410,35 @@ bankda:
css-cours : css/theme/themeAF.css css-cours : css/theme/themeAF.css
#선물하기 URL #선물하기 URL
presenturl : svc.gcone.co.kr presenturl : svc.soju1sake1.com
# 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
# 송장번호 %INVCNB% 치환
# 한진택배는 운송번호 바로 조회 서비스 미제공함
ordr:
export:
hdrycpn:
code0: https://trace.cjlogistics.com/next/tracking.html?wblNo=%INVCNB%
code7: https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=%INVCNB%&displayHeader=
code9: https://www.hanjin.com/kor/CMS/DeliveryMgr/WaybillSch.do?mCode=MN038
code10: https://www.lotteglogis.com/home/reservation/tracking/linkView?InvNo=%INVCNB%
code29: https://ylis.yongmalogis.co.kr/cmm/modalDeliveryCargoTrace.do?ordno=%INVCNB%
# 서치어드바이저 소유권 코드
meta-content:
google:
LR: ""
naver:
LR: "5fcdb284f18ca08cf86af214a01998990c008e84"
facebook:
LR: ""
# 결제 api 사용 암호 key
api:
AES_KEY: "aMZV6RjCtE1iyuH8WyE+Hg=="
DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
currency-unit:
default: 円(엔)
JP: 円(엔)
KR: 원

View File

@@ -70,7 +70,7 @@
parameterType="com.wb.domainserver.domain.admin.store.bsnm.vo.BOBsnmVO" parameterType="com.wb.domainserver.domain.admin.store.bsnm.vo.BOBsnmVO"
resultType="datamap"> resultType="datamap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (

View File

@@ -60,7 +60,7 @@
parameterType="com.wb.domainserver.domain.admin.store.sopthema.vo.BOSopThemaVO" parameterType="com.wb.domainserver.domain.admin.store.sopthema.vo.BOSopThemaVO"
resultType="dataMap"> resultType="dataMap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (
SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM

View File

@@ -87,7 +87,7 @@
parameterType="com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO" parameterType="com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO"
resultType="dataMap"> resultType="dataMap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (
SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM

View File

@@ -48,7 +48,7 @@
,TELNB ,TELNB
,MBTLNB ,MBTLNB
, MNGR_DV , MNGR_DV
,(SELECT SYS_DV_CD FROM site WHERE #{accessUrl} LIKE CONCAT('%',URL,'%')) AS SYS_DV_CD ,(SELECT SYS_DV_CD FROM site WHERE URL = #{accessUrl}) AS SYS_DV_CD
,#{sopmalCd} AS SOPMAL_CD ,#{sopmalCd} AS SOPMAL_CD
FROM GC_MANAGER FROM GC_MANAGER
WHERE 1=1 WHERE 1=1

View File

@@ -1293,7 +1293,7 @@
parameterType = "com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponPkSndngVO" parameterType = "com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponPkSndngVO"
resultType = "dataMap"> resultType = "dataMap">
<![CDATA[ <![CDATA[
SET @ROWNUM = 0; /*SET @ROWNUM = 0;*/
SELECT * SELECT *
FROM ( FROM (
SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM SELECT CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED) AS RNUM

View File

@@ -6135,7 +6135,7 @@ main {
gap: 4px; gap: 4px;
} }
.orderList__description__first { .orderList__description__first {
width: 56%; width: 52%;
margin-bottom: 15px; margin-bottom: 15px;
} }
.orderList__description__second { .orderList__description__second {
@@ -6154,7 +6154,7 @@ main {
width: 48%; width: 48%;
} }
.orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first { .orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first {
width: 56%; width: 52%;
} }
.orderList__orderNum { .orderList__orderNum {
font-size: 15px; font-size: 15px;

View File

@@ -172,7 +172,7 @@ function fn_push_send() {
var pushSj = "테스트 발송"; var pushSj = "테스트 발송";
var pushCn = "테스트 발송입니다."; var pushCn = "테스트 발송입니다.";
var pushType = "notice"; var pushType = "notice";
var imgFilCours = "https://img.gcone.co.kr/NC/goods/1/2017/06/116_tmp_2a6add67ad603d452d32743dac0410112327view.jpg"; var imgFilCours = "https://img.soju1sake1.com/NC/goods/1/2017/06/116_tmp_2a6add67ad603d452d32743dac0410112327view.jpg";
var dataUrl = "/sopmal/goods/selectGoodsDtl?goodsInnb=857"; var dataUrl = "/sopmal/goods/selectGoodsDtl?goodsInnb=857";
var dataKey = ""; var dataKey = "";
var dataExt = ""; var dataExt = "";

View File

@@ -6160,7 +6160,7 @@ main {
gap: 4px; gap: 4px;
} }
.orderList__description__first { .orderList__description__first {
width: 56%; width: 52%;
margin-bottom: 15px; margin-bottom: 15px;
} }
.orderList__description__second { .orderList__description__second {
@@ -6179,7 +6179,7 @@ main {
width: 48%; width: 48%;
} }
.orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first { .orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first {
width: 56%; width: 52%;
} }
.orderList__orderNum { .orderList__orderNum {
font-size: 15px; font-size: 15px;

View File

@@ -0,0 +1,7 @@
User-agent: *
Allow: /
Allow: /sopmal/
Disallow: /sopmal/mpage/
Disallow: /sopmal/csc/
Disallow: /sopmal/login
Allow: /sopmal/ordr/selectCartCntRefresh

View File

@@ -6135,7 +6135,7 @@ main {
gap: 4px; gap: 4px;
} }
.orderList__description__first { .orderList__description__first {
width: 56%; width: 52%;
margin-bottom: 15px; margin-bottom: 15px;
} }
.orderList__description__second { .orderList__description__second {
@@ -6154,7 +6154,7 @@ main {
width: 48%; width: 48%;
} }
.orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first { .orderList__description:has(.orderList__btnControls):has(.orderList__regularDelivery) .orderList__description__first {
width: 56%; width: 52%;
} }
.orderList__orderNum { .orderList__orderNum {
font-size: 15px; font-size: 15px;

View File

@@ -210,11 +210,11 @@
const hostname = window.location.hostname; const hostname = window.location.hostname;
let itrntDomain = null; let itrntDomain = null;
if (hostname.match(/^loc\./)) { // loc.로 시작하는지 검사 if (hostname.match(/^loc\./)) { // loc.로 시작하는지 검사
itrntDomain = 'http://loc.itrnt.gcone.co.kr:18310'; itrntDomain = 'http://loc.itrnt.soju1sake1.com:18310';
} else if (hostname.match(/^dev\./)) { // dev.로 시작하는지 검사 } else if (hostname.match(/^dev\./)) { // dev.로 시작하는지 검사
itrntDomain = 'http://dev.itrnt.gcone.co.kr'; itrntDomain = 'http://dev.itrnt.soju1sake1.com';
} else { } else {
itrntDomain = 'https://itrnt.gcone.co.kr'; itrntDomain = 'https://itrnt.soju1sake1.com';
} }
// 본사 아이디 CH와 NC일 경우 분기 처리 // 본사 아이디 CH와 NC일 경우 분기 처리

View File

@@ -459,8 +459,8 @@
} }
//로컬처리(임시) //로컬처리(임시)
if (window.location.hostname === "loc.mngr.gcone.co.kr") { if (window.location.hostname === "loc.mngr.soju1sake1.com") {
sopmalDomain = sopmalDomain.replace("dev.", "loc.") + ":18310"; sopmalDomain = sopmalDomain.replace("dev.", "loc.") + ":18500";
} }
window.open(sopmalDomain+'/sopmal/mbr/selectPosJoinAgreeTermsForm?storeCode='+posCode+'&code=mngr', '_blank'); window.open(sopmalDomain+'/sopmal/mbr/selectPosJoinAgreeTermsForm?storeCode='+posCode+'&code=mngr', '_blank');

View File

@@ -1374,7 +1374,10 @@
type: "post", type: "post",
url: "/sopmal/goods/selectRvwBnefInfo", url: "/sopmal/goods/selectRvwBnefInfo",
success: function (data) { 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"); fn_pop_Modal("#reviewBenefit", "#reviewBenefitContent");
} }
}); });
@@ -1390,25 +1393,25 @@
} }
/*리뷰 혜택 내용 set*/ /*리뷰 혜택 내용 set*/
const fn_set_rvw_bnef_cn = (data) => { 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 gnrlRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt : null);
let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt); let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.photoRvwMlgAccmlmnyAmt : null);
let writngChrCnt = rvwBnefInfo.writngChrCnt; let writngChrCnt = rvwBnefInfo.writngChrCnt != undefined ? rvwBnefInfo.writngChrCnt : null;
/*한달리뷰 정보*/ /*한달리뷰 정보*/
let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt; let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt != undefined ? rvwBnefInfo.monthBbsExpsrAt : null;
let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt); let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt : null);
/*일반리뷰,포토리뷰 추가 마일리지 정보*/ /*일반리뷰,포토리뷰 추가 마일리지 정보*/
let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe; let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe != undefined ? rvwBnefInfo.aditMlgPymntBgnDe : null;
let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe; let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe != undefined ? rvwBnefInfo.aditMlgPymntEndDe : null;
let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt); let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.aditPymntMlgAccmlmnyAmt : null);
/*한달리뷰,포토리뷰 추가 마일리지 정보*/ /*한달리뷰,포토리뷰 추가 마일리지 정보*/
let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe; let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe != undefined ? rvwBnefInfo.monthAditMlgPymntBgnDe : null;
let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe; let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe != undefined ? rvwBnefInfo.monthAditMlgPymntEndDe : null;
let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt); let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt : null);
/*포토리뷰 금액 존재 여부에 따른 html 구성*/ /*포토리뷰 금액 존재 여부에 따른 html 구성*/

View File

@@ -898,6 +898,7 @@
<%-- 마이페이지 Right 영역 --%> <%-- 마이페이지 Right 영역 --%>
<jsp:include page="/WEB-INF/views/comm/mpage/MypageRight.jsp"/> <jsp:include page="/WEB-INF/views/comm/mpage/MypageRight.jsp"/>
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/> <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<div class="sub-right-content__section"> <div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">주문/배송 조회 <span <h3 class="sub-right-content__innerTitle">주문/배송 조회 <span
@@ -970,9 +971,9 @@
</div> </div>
<div class="product-unit-price"> <div class="product-unit-price">
<div class="product-unit-price__price"> <div class="product-unit-price__price">
<span class="product-unit-price__original comma"><fmt:formatNumber value="${list.slepric}" pattern="#,###"/>원</span> <span class="product-unit-price__original comma"><fmt:formatNumber value="${list.slepric}" pattern="#,###"/>${curUnit}</span>
<c:set var = "dscntAmt" value = "${list.slepric }"/> <c:set var = "dscntAmt" value = "${list.slepric }"/>
<span class="product-unit-price__current comma"><fmt:formatNumber value="${dscntAmt}" pattern="#,###"/>원</span> <span class="product-unit-price__current comma"><fmt:formatNumber value="${dscntAmt}" pattern="#,###"/>${curUnit}</span>
</div> </div>
<div class="product-unit-price__sale"> <div class="product-unit-price__sale">
<span class="percent"><c:out value="${list.slePercent}"/>%</span> <span class="percent"><c:out value="${list.slePercent}"/>%</span>

View File

@@ -13,6 +13,7 @@
<div class="orderList__item__inner"> <div class="orderList__item__inner">
<a href="<c:url value="/sopmal/goods/selectGoodsDtl?sopmalCd=${order.sopmalCd}&goodsInnb=${order.goodsInnb}"/>" class="orderList__image"> <a href="<c:url value="/sopmal/goods/selectGoodsDtl?sopmalCd=${order.sopmalCd}&goodsInnb=${order.goodsInnb}"/>" class="orderList__image">
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/> <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<img src="<c:out value="${ cdnurl }${order.goodsImageUrl}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${order.goodsNm}"/>"> <img src="<c:out value="${ cdnurl }${order.goodsImageUrl}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${order.goodsNm}"/>">
</a> </a>
<div class="orderList__description"> <div class="orderList__description">
@@ -30,10 +31,10 @@
</c:if> </c:if>
</div> </div>
<div class="orderList__description__second"> <div class="orderList__description__second">
<span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>원</span> <span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
</div> </div>
<div class="orderList__description__third"> <div class="orderList__description__third">
<span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>원</span> <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>${curUnit}</span>
</div> </div>
<div class="orderList__description__fourth"> <div class="orderList__description__fourth">
<c:choose> <c:choose>

View File

@@ -5,6 +5,7 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<c:choose> <c:choose>
<c:when test="${not empty data.resultList}"> <c:when test="${not empty data.resultList}">
@@ -30,11 +31,11 @@
</c:if> </c:if>
</div> </div>
<div class="orderList__description__second"> <div class="orderList__description__second">
<span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>원</span> <span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
</div> </div>
<div class="orderList__description__third"> <div class="orderList__description__third">
<c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}"> <c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}">
<span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>원</span> <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>${curUnit}</span>
</c:if> </c:if>
</div> </div>
<div class="orderList__description__fourth"> <div class="orderList__description__fourth">

View File

@@ -6,6 +6,7 @@
<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<%-- <%--
Class Name : OrdrDtlR.jsp Class Name : OrdrDtlR.jsp
Description : 마이페이지 주문/배송조회 Description : 마이페이지 주문/배송조회
@@ -1230,26 +1231,26 @@
<td> <td>
<span class="cartItem__normalPrice"> <span class="cartItem__normalPrice">
<span class=" comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span> <span class=" comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <td>
<span class="cartItem__discountPrice"> <span class="cartItem__discountPrice">
<span class="cartItem__discountMinus">(-)</span> <span class="cartItem__discountMinus">(-)</span>
<span class="comma"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/></span> <span class="comma"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <td>
<span class="cartItem__afterPrice"> <span class="cartItem__afterPrice">
<span class="comma"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/></span> <span class="comma"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <td>
<span class="cartItem__mileage"> <span class="cartItem__mileage">
<span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span> <span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">점</span>
</span> </span>
</td> </td>
<td> <td>
@@ -1384,26 +1385,26 @@
<td> <td>
<span class="cartItem__normalPrice"> <span class="cartItem__normalPrice">
<span class=" comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span> <span class=" comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <td>
<span class="cartItem__discountPrice"> <span class="cartItem__discountPrice">
<span class="cartItem__discountMinus">(-)</span> <span class="cartItem__discountMinus">(-)</span>
<span class="comma"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/></span> <span class="comma"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <td>
<span class="cartItem__afterPrice"> <span class="cartItem__afterPrice">
<span class="comma"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/></span> <span class="comma"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">${curUnit}</span>
</span> </span>
</td> </td>
<td> <td>
<span class="cartItem__mileage"> <span class="cartItem__mileage">
<span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span> <span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span>
<span class="priceUnit">원</span> <span class="priceUnit">점</span>
</span> </span>
</td> </td>
<td> <td>
@@ -1598,7 +1599,7 @@
</c:if> </c:if>
<tr> <tr>
<th>결제금액</th> <th>결제금액</th>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>원</td> <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr> </tr>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%> <c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
<tr> <tr>
@@ -1675,36 +1676,36 @@
<ul class="cartOrderBox__list"> <ul class="cartOrderBox__list">
<li> <li>
<span class="cartOrderBox__th">총 주문금액</span> <span class="cartOrderBox__th">총 주문금액</span>
<span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span><span class="priceUnit">원</span></span> <span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li> </li>
<li> <li>
<span class="cartOrderBox__th">할인금액</span> <span class="cartOrderBox__th">할인금액</span>
<span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span class="comma"><fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">원</span></span> <span class="cartOrderBox__td"><span class="cartOrderBox__discountMinus">(-)</span><span class="comma"><fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li> </li>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status"> <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}"> <c:if test="${'03' != dscnt.dscntDvCd}">
<li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}"> <li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}">
<span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span> <span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span>
<span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">원</span></span> <span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li> </li>
</c:if> </c:if>
</c:forEach> </c:forEach>
<li> <li>
<span class="cartOrderBox__th">배송비</span> <span class="cartOrderBox__th">배송비</span>
<span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span><span class="priceUnit">원</span></span> <span class="cartOrderBox__td"><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li> </li>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status"> <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}"> <c:if test="${'03' == dscnt.dscntDvCd}">
<li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}"> <li class="cartOrderBox__miscItem ${1 == status.count ? 'first' : ''}">
<span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span> <span class="cartOrderBox__miscTh"><c:out value="${dscnt.dscntDvNm}"/></span>
<span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">원</span></span> <span class="cartOrderBox__miscTd"><span class="comma"><fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</li> </li>
</c:if> </c:if>
</c:forEach> </c:forEach>
</ul> </ul>
<div class="cartOrderBox__total"> <div class="cartOrderBox__total">
<span class="cartOrderBox__totalTh">결제금액</span> <span class="cartOrderBox__totalTh">결제금액</span>
<span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">원</span></span> <span class="cartOrderBox__totalTd"><span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span><span class="priceUnit">${curUnit}</span></span>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -19,6 +19,7 @@
<head> <head>
<jsp:include page="/WEB-INF/views/comm/mobile/Include.jsp"/> <jsp:include page="/WEB-INF/views/comm/mobile/Include.jsp"/>
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/> <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<script type="text/javascript" src="//developers.band.us/js/share/band-button.js?v=24082024"></script> <script type="text/javascript" src="//developers.band.us/js/share/band-button.js?v=24082024"></script>
<script type="text/JavaScript" src="https://developers.kakao.com/sdk/js/kakao.min.js"></script> <script type="text/JavaScript" src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
<script type="text/javascript">Kakao.init('${kakaoKey}');</script> <script type="text/javascript">Kakao.init('${kakaoKey}');</script>
@@ -586,7 +587,7 @@
var $number = $counter.find(".product-count__amount-number"); var $number = $counter.find(".product-count__amount-number");
var $price = $counter.find(".product-count__priceNum"); var $price = $counter.find(".product-count__priceNum");
$number.text(productArr[$index][1]); $number.text(productArr[$index][1]);
$price.text(addComma(productArr[$index][3]) + "원"); $price.text(addComma(productArr[$index][3]) + '${curUnit}');
}); });
updateTotalPrice(); // 총 상품금액 업데이트 updateTotalPrice(); // 총 상품금액 업데이트
} }
@@ -646,7 +647,8 @@
type: "post", type: "post",
url: "/sopmal/goods/selectRvwBnefInfo", url: "/sopmal/goods/selectRvwBnefInfo",
success: function (data) { success: function (data) {
fn_set_rvw_bnef_cn(data); const jsonString = JSON.stringify(data.resBody.result);
fn_set_rvw_bnef_cn(jsonString);
openModal("reviewBenefitPop"); openModal("reviewBenefitPop");
} }
}); });
@@ -664,50 +666,51 @@
/*리뷰 혜택 내용 set*/ /*리뷰 혜택 내용 set*/
const fn_set_rvw_bnef_cn = (data) => { 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 gnrlRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt) != undefined ? rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt : null;
let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt); let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.photoRvwMlgAccmlmnyAmt : null);
console.log(gnrlRvwMlgAccmlmnyAmt); // console.log(gnrlRvwMlgAccmlmnyAmt) != undefined ? rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt : null;
console.log(photoRvwMlgAccmlmnyAmt); // console.log(photoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.photoRvwMlgAccmlmnyAmt : null);
let writngChrCnt = rvwBnefInfo.writngChrCnt; let writngChrCnt = rvwBnefInfo.writngChrCnt != undefined ? rvwBnefInfo.writngChrCnt : null;
/*한달리뷰 정보*/ /*한달리뷰 정보*/
let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt; let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt != undefined ? rvwBnefInfo.monthBbsExpsrAt : null;
let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt); let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt : null);
/*일반리뷰,포토리뷰 추가 마일리지 정보*/ /*일반리뷰,포토리뷰 추가 마일리지 정보*/
let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe; let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe != undefined ? rvwBnefInfo.aditMlgPymntBgnDe : null;
let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe; let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe != undefined ? rvwBnefInfo.aditMlgPymntEndDe : null;
let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt); let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.aditPymntMlgAccmlmnyAmt : null);
/*한달리뷰,포토리뷰 추가 마일리지 정보*/ /*한달리뷰,포토리뷰 추가 마일리지 정보*/
let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe; let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe != undefined ? rvwBnefInfo.monthAditMlgPymntBgnDe : null;
let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe; let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe != undefined ? rvwBnefInfo.monthAditMlgPymntEndDe : null;
let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt); let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt : null);
/*포토리뷰 금액 존재 여부에 따른 html 구성*/ /*포토리뷰 금액 존재 여부에 따른 html 구성*/
let photoMilCn = photoRvwMlgAccmlmnyAmt !== '0' ? ` <dl> let photoMilCn = photoRvwMlgAccmlmnyAmt !== '0' ? ` <dl>
<dt> 2.포토리뷰</dt> <dt> 2.포토리뷰</dt>
<dd>마일리지 <em>\${photoRvwMlgAccmlmnyAmt}\원</em> 적립</dd> <dd>마일리지 <em>\${photoRvwMlgAccmlmnyAmt}\점</em> 적립</dd>
</dl>` : ''; </dl>` : '';
/*일반리뷰, 포토리뷰 추가마일리지 여부에 따른 html 구성*/ /*일반리뷰, 포토리뷰 추가마일리지 여부에 따른 html 구성*/
let aditMlgCn = aditPymntMlgAccmlmnyAmt !== '0' ? ` <dl> let aditMlgCn = aditPymntMlgAccmlmnyAmt !== '0' ? ` <dl>
<dt>4. 일반리뷰 ,포토 리뷰 추가 마일리지(\${monthAditMlgPymntBgnDe}\ ~ \${monthAditMlgPymntEndDe}\ )</dt> <dt>4. 일반리뷰 ,포토 리뷰 추가 마일리지(\${monthAditMlgPymntBgnDe}\ ~ \${monthAditMlgPymntEndDe}\ )</dt>
<dd>마일리지 <em>\${aditPymntMlgAccmlmnyAmt}\원</em> 적립</dd> <dd>마일리지 <em>\${aditPymntMlgAccmlmnyAmt}\점</em> 적립</dd>
</dl>` : ''; </dl>` : '';
/*한딜리뷰 사용 여부에 따른 html 구성*/ /*한딜리뷰 사용 여부에 따른 html 구성*/
let monthMilCn = monthBbsExpsrAt === 'Y' ? `<dl> let monthMilCn = monthBbsExpsrAt === 'Y' ? `<dl>
<dt>3. 한달리뷰</dt> <dt>3. 한달리뷰</dt>
<dd>마일리지 <em>\${monthPhotoRvwMlgAccmlmnyAmt}\원</em> 적립</dd> <dd>마일리지 <em>\${monthPhotoRvwMlgAccmlmnyAmt}\점</em> 적립</dd>
</dl>` : ''; </dl>` : '';
/* 한달 리뷰 추가마일리지 여부에 따른 html 구성*/ /* 한달 리뷰 추가마일리지 여부에 따른 html 구성*/
let monthAditMlgCn = monthAditPymntMlgAccmlmnyAmt !== '0' ? ` <dl> let monthAditMlgCn = monthAditPymntMlgAccmlmnyAmt !== '0' ? ` <dl>
<dt>5. 한달리뷰 추가 마일리지(\${monthAditMlgPymntBgnDe}\ ~ \${monthAditMlgPymntEndDe}\)</dt> <dt>5. 한달리뷰 추가 마일리지(\${monthAditMlgPymntBgnDe}\ ~ \${monthAditMlgPymntEndDe}\)</dt>
<dd>마일리지 <em>\${monthAditPymntMlgAccmlmnyAmt}\원</em> 적립</dd> <dd>마일리지 <em>\${monthAditPymntMlgAccmlmnyAmt}\점</em> 적립</dd>
</dl>` : ''; </dl>` : '';
/*한달리뷰 사용 여부에 따른 분기 처리(상품 설정에 따른)*/ /*한달리뷰 사용 여부에 따른 분기 처리(상품 설정에 따른)*/
const MtRvwWritngPosblAt = $("#MtRvwWritngPosblAt").val(); const MtRvwWritngPosblAt = $("#MtRvwWritngPosblAt").val();
@@ -718,7 +721,7 @@
/* 분기처리후 최종 html*/ /* 분기처리후 최종 html*/
let rvwBnefInfoCn = `<dl> let rvwBnefInfoCn = `<dl>
<dt>1. 일반리뷰</dt> <dt>1. 일반리뷰</dt>
<dd>마일리지 <em>\${gnrlRvwMlgAccmlmnyAmt}\원</em> 적립</dd> <dd>마일리지 <em>\${gnrlRvwMlgAccmlmnyAmt}\점</em> 적립</dd>
</dl> </dl>
\${photoMilCn} \${photoMilCn}
\${aditMlgCn} \${aditMlgCn}
@@ -2216,6 +2219,8 @@
// 묶음배송 개수 // 묶음배송 개수
const bundleDlvyCndAmt = `${resultMap.goodsDtl.bundleDlvyCndAmt}`; const bundleDlvyCndAmt = `${resultMap.goodsDtl.bundleDlvyCndAmt}`;
let curUnit = `${curUnit}`;
/*배송비 정보 세팅 */ /*배송비 정보 세팅 */
/*기본 배송비 세팅 */ /*기본 배송비 세팅 */
@@ -2229,24 +2234,24 @@
<tbody> <tbody>
<tr> <tr>
<th>기본배송비</th> <th>기본배송비</th>
<td>\${dftDlvyAmt}\원</td> <td>\${dftDlvyAmt}${curUnit}\</td>
</tr>`; </tr>`;
//금액 구간이 있을 경우 //금액 구간이 있을 경우
let amtCndUseCn = amtCndUseAt === 'Y' ? `<tr> let amtCndUseCn = amtCndUseAt === 'Y' ? `<tr>
<th>\${amtCndAditAmt}\원 이상 ~</th> <th>\${amtCndAditAmt}${curUnit}\ 이상 ~</th>
<td>0원</td> <td>0\${curUnit}\</td>
</tr>` : ""; </tr>` : "";
//개수조건 있을 경우 //개수조건 있을 경우
let cntCndUseCn = cntCndUseAt === 'Y' ? `<tr> let cntCndUseCn = cntCndUseAt === 'Y' ? `<tr>
<th>\${cntCndAditAmt}\개 이상 ~</th> <th>\${cntCndAditAmt}\개 이상 ~</th>
<td>0원</td> <td>0\${curUnit}\</td>
</tr>` : ""; </tr>` : "";
// 묶음배송 있을 경우 // 묶음배송 있을 경우
let bundleDlvyUseCn = bundleDlvyUseAt === 'Y' ? `<tr> let bundleDlvyUseCn = bundleDlvyUseAt === 'Y' ? `<tr>
<th>\${bundleDlvyCndAmt}\원 이상 ~</th> <th>\${bundleDlvyCndAmt}${curUnit}\ 이상 ~</th>
<td>0원(묶음 배송)</td> <td>0\${curUnit}\(묶음 배송)</td>
</tr>` : ""; </tr>` : "";
let dftDlvyAmtCnEnd = ` </tbody> let dftDlvyAmtCnEnd = ` </tbody>
@@ -2266,15 +2271,15 @@
<tbody> <tbody>
<tr> <tr>
<th>도서산간</th> <th>도서산간</th>
<td>\${areaAditDlvyAmt}\원</td> <td>\${areaAditDlvyAmt}${curUnit}\</td>
</tr> </tr>
<tr> <tr>
<th>제주지역</th> <th>제주지역</th>
<td>\${areaAditDlvyAmt}\원</td> <td>\${areaAditDlvyAmt}${curUnit}\</td>
</tr> </tr>
<tr> <tr>
<th>제주도서산간</th> <th>제주도서산간</th>
<td>\${areaAditDlvyAmt}\원</td> <td>\${areaAditDlvyAmt}${curUnit}\</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -3740,11 +3745,11 @@ const fn_move_goodsDtl_login = () => {
<c:when test="${resultMap.goodsDtl.pricRplcWordsUseAt ne 'Y'}"> <c:when test="${resultMap.goodsDtl.pricRplcWordsUseAt ne 'Y'}">
<div class="productDetailInfo__price__price"> <div class="productDetailInfo__price__price">
<span class="productDetailInfo__price__original"> <span class="productDetailInfo__price__original">
<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.cnsmrpric}"/></span><span class="priceUnit">원</span> <span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.cnsmrpric}"/></span><span class="priceUnit">${curUnit}</span>
<input type="hidden" id="cnsmrpric" value="<c:out value="${resultMap.goodsDtl.cnsmrpric}"/> "/> <input type="hidden" id="cnsmrpric" value="<c:out value="${resultMap.goodsDtl.cnsmrpric}"/> "/>
</span> </span>
<span class="productDetailInfo__price__current" id="_salesPrice"> <span class="productDetailInfo__price__current" id="_salesPrice">
<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.slepric}"/></span><span class="priceUnit">원</span> <span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.slepric}"/></span><span class="priceUnit">${curUnit}</span>
</span> </span>
</div> </div>
<div class="productDetailInfo__price__sale"> <div class="productDetailInfo__price__sale">
@@ -3797,7 +3802,7 @@ const fn_move_goodsDtl_login = () => {
<div class="productDetailInfo__price__current coupon" style="font-size: large; color: #e34747;"> <div class="productDetailInfo__price__current coupon" style="font-size: large; color: #e34747;">
<span class="productCoupon__text">최대혜택가</span> <span class="productCoupon__text">최대혜택가</span>
<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.dcSlepric}"/></span><span <span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.dcSlepric}"/></span><span
class="priceUnit"></span>원 class="priceUnit"></span>${curUnit}
<span class="percent">${resultMap.goodsDtl.dcPercent}%</span> &nbsp; <span class="percent">${resultMap.goodsDtl.dcPercent}%</span> &nbsp;
<button id="dcPrice" class="infoBtn"> <button id="dcPrice" class="infoBtn">
<i class="icon icon_question"></i> <i class="icon icon_question"></i>
@@ -3841,12 +3846,12 @@ const fn_move_goodsDtl_login = () => {
<c:if test="${resultMap.goodsDtl.amtCndUseAt eq 'Y'}"> <c:if test="${resultMap.goodsDtl.amtCndUseAt eq 'Y'}">
(<span class="comma"><c:out (<span class="comma"><c:out
value="${resultMap.goodsDtl.amtCndAditAmt}" default="0"/></span> value="${resultMap.goodsDtl.amtCndAditAmt}" default="0"/></span>
<span class="priceUnit">원</span> 이상 무료 배송) <span class="priceUnit">${curUnit}</span> 이상 무료 배송)
</c:if> </c:if>
<c:if test="${resultMap.goodsDtl.dlvyGroupDvCd eq '03'}"> <c:if test="${resultMap.goodsDtl.dlvyGroupDvCd eq '03'}">
(<span class="comma">유료배송 : <c:out (<span class="comma">유료배송 : <c:out
value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span> value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span>
<span class="priceUnit">원</span>) <span class="priceUnit">${curUnit}</span>)
</c:if> </c:if>
<c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}"> <c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}">
<button type="button" class="infoBtn" onclick="fn_select_dlvy_info('deliveryFeePop')"> <button type="button" class="infoBtn" onclick="fn_select_dlvy_info('deliveryFeePop')">
@@ -3866,7 +3871,7 @@ const fn_move_goodsDtl_login = () => {
<dl> <dl>
<dt>구매시 <br/> 적립혜택</dt> <dt>구매시 <br/> 적립혜택</dt>
<dd style="margin-top: 9px;"> <dd style="margin-top: 9px;">
<em><fmt:formatNumber value="${(resultMap.goodsDtl.mlgAccmlAmt + resultMap.goodsDtl.gradMlgAccmlAmt + resultMap.goodsDtl.evtMlgAccmlAmt) }"/>원</em> <em><fmt:formatNumber value="${(resultMap.goodsDtl.mlgAccmlAmt + resultMap.goodsDtl.gradMlgAccmlAmt + resultMap.goodsDtl.evtMlgAccmlAmt) }"/>${curUnit}</em>
<c:if test = "${resultMap.goodsDtl.rvwWritngPosblAt eq 'Y' || resultMap.goodsDtl.rvwWritngPosblAt eq 'N'}"> <c:if test = "${resultMap.goodsDtl.rvwWritngPosblAt eq 'Y' || resultMap.goodsDtl.rvwWritngPosblAt eq 'N'}">
· 리뷰작성시 적립 · 리뷰작성시 적립
<button class="infoBtn" onclick="fn_select_rvw_bnef_info()"> <button class="infoBtn" onclick="fn_select_rvw_bnef_info()">
@@ -4054,7 +4059,7 @@ const fn_move_goodsDtl_login = () => {
<c:if test="${goodsOpt01.disableAt eq 'Y'}"> <span>(품절)</span></c:if> <c:if test="${goodsOpt01.disableAt eq 'Y'}"> <span>(품절)</span></c:if>
</div> </div>
<div class="product-option__right"> <div class="product-option__right">
<span class="product-option__price"><fmt:formatNumber value="${goodsOpt01.slepric}"/>원</span> <span class="product-option__price"><fmt:formatNumber value="${goodsOpt01.slepric}"/>${curUnit}</span>
<span class="product-option__monthly-payment">${goodsOpt01.optnInfo}</span> <span class="product-option__monthly-payment">${goodsOpt01.optnInfo}</span>
</div> </div>
</c:if> </c:if>
@@ -4160,7 +4165,7 @@ const fn_move_goodsDtl_login = () => {
<span class="product-total__text">총 상품금액</span> <span class="product-total__text">총 상품금액</span>
<span class="product-total__price"> <span class="product-total__price">
<span class="productDetailInfo__priceTotal__totalPriceNum">0</span><span <span class="productDetailInfo__priceTotal__totalPriceNum">0</span><span
class="won">원</span></span> class="won">${curUnit}</span></span>
</div> </div>
<c:choose> <c:choose>
<c:when test="${resultMap.goodsDtl.buttonRplcWordsUseAt ne 'Y'}"> <c:when test="${resultMap.goodsDtl.buttonRplcWordsUseAt ne 'Y'}">
@@ -4281,10 +4286,10 @@ const fn_move_goodsDtl_login = () => {
<span class="product-unit-price__original"> <span class="product-unit-price__original">
<span class="comma"> <span class="comma">
<c:out value="${relateInfo.cnsmrpric}"/> </span> <c:out value="${relateInfo.cnsmrpric}"/> </span>
<span class="priceUnit">원</span></span> <span class="priceUnit">${curUnit}</span></span>
<span class="product-unit-price__current"> <span class="product-unit-price__current">
<span class="comma"><fmt:formatNumber value="${relateInfo.slepric}"/> </span> <span class="comma"><fmt:formatNumber value="${relateInfo.slepric}"/> </span>
<span class="priceUnit">원</span></span> <span class="priceUnit">${curUnit}</span></span>
</div> </div>
<div class="product-unit-price__sale"> <div class="product-unit-price__sale">
<span class="percent"> <span class="percent">
@@ -4751,20 +4756,20 @@ const fn_move_goodsDtl_login = () => {
<ul class="productDetailInfo__saleList" style="font-size: 15px; color: #16191d"> <ul class="productDetailInfo__saleList" style="font-size: 15px; color: #16191d">
<li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;"> <li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;">
<span class="productDetailInfo__miscTh">상품가격</span> <span class="productDetailInfo__miscTh">상품가격</span>
<span class="productDetailInfo__miscTd" style="margin-left: auto;"><span class="comma" style=" margin-left: auto;"><fmt:formatNumber value="${resultMap.goodsDtl.slepric}"/> </span><span class="priceUnit" style="font-size: small;">원</span></span> <span class="productDetailInfo__miscTd" style="margin-left: auto;"><span class="comma" style=" margin-left: auto;"><fmt:formatNumber value="${resultMap.goodsDtl.slepric}"/> </span><span class="priceUnit" style="font-size: small;">${curUnit}</span></span>
</li> </li>
<hr style="color:darkgray"/> <hr style="color:darkgray"/>
<c:if test="${resultMap.goodsDtl.eventAt eq 'Y'}"> <c:if test="${resultMap.goodsDtl.eventAt eq 'Y'}">
<li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;"> <li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;">
<span class="productDetailInfo__miscTh">이벤트 <c:if test="${ not empty resultMap.goodsDtl.evtnm}"><br/><span style="font-size: small;">${resultMap.goodsDtl.evtnm}</span></c:if></span> <span class="productDetailInfo__miscTh">이벤트 <c:if test="${ not empty resultMap.goodsDtl.evtnm}"><br/><span style="font-size: small;">${resultMap.goodsDtl.evtnm}</span></c:if></span>
<span class="productDetailInfo__miscTd" style=" margin-left: auto;">-<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.evtAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">원</span></span> <span class="productDetailInfo__miscTd" style=" margin-left: auto;">-<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.evtAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">${curUnit}</span></span>
</li> </li>
<hr style="color:darkgray"/> <hr style="color:darkgray"/>
</c:if> </c:if>
<c:if test="${resultMap.goodsDtl.dplctLmttCoupon eq '99' or resultMap.goodsDtl.dplctLmttCoupon eq '03'}"> <c:if test="${resultMap.goodsDtl.dplctLmttCoupon eq '99' or resultMap.goodsDtl.dplctLmttCoupon eq '03'}">
<li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;"> <li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;">
<span class="productDetailInfo__miscTh">상품 쿠폰<c:if test="${ not empty resultMap.goodsDtl.gdCouponSndngNm}"> <br/><span style="font-size: small;">${resultMap.goodsDtl.gdCouponSndngNm }</span></c:if></span> <span class="productDetailInfo__miscTh">상품 쿠폰<c:if test="${ not empty resultMap.goodsDtl.gdCouponSndngNm}"> <br/><span style="font-size: small;">${resultMap.goodsDtl.gdCouponSndngNm }</span></c:if></span>
<span class="productDetailInfo__miscTd" style=" margin-left: auto;" >-<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.gdAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">원</span></span> <span class="productDetailInfo__miscTd" style=" margin-left: auto;" >-<span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.gdAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">${curUnit}</span></span>
</li> </li>
<hr style="color:darkgray"/> <hr style="color:darkgray"/>
</c:if> </c:if>
@@ -4777,7 +4782,7 @@ const fn_move_goodsDtl_login = () => {
<span class="percent" style=" margin-left: auto;">-<fmt:formatNumber value="${resultMap.goodsDtl.ctAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">%</span> <span class="percent" style=" margin-left: auto;">-<fmt:formatNumber value="${resultMap.goodsDtl.ctAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">%</span>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<span class="comma" style=" margin-left: auto;">-<fmt:formatNumber value="${resultMap.goodsDtl.ctAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">원</span> <span class="comma" style=" margin-left: auto;">-<fmt:formatNumber value="${resultMap.goodsDtl.ctAditDscntAmt}"/> </span><span class="priceUnit" style="font-size: small;">${curUnit}</span>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</span> </span>
@@ -4786,7 +4791,7 @@ const fn_move_goodsDtl_login = () => {
</c:if> </c:if>
<li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;"> <li class="productDetailInfo__saleItem" style="display: flex; justify-content: center; align-items: end;">
<span class="productDetailInfo__miscTh" style="color:red;">최대혜택가</span> <span class="productDetailInfo__miscTh" style="color:red;">최대혜택가</span>
<span class="productDetailInfo__miscTd" style="margin-left:auto;color:red; "><span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.dcSlepric}"/> </span><span class="priceUnit" style="font-size: small;">원</span></span> <span class="productDetailInfo__miscTd" style="margin-left:auto;color:red; "><span class="comma"><fmt:formatNumber value="${resultMap.goodsDtl.dcSlepric}"/> </span><span class="priceUnit" style="font-size: small;">${curUnit}</span></span>
</li> </li>
</ul> </ul>
</div> </div>

View File

@@ -71,6 +71,7 @@
<c:if test = "${not empty mpageResultMap.info.mbrGradIconCours}"> <c:if test = "${not empty mpageResultMap.info.mbrGradIconCours}">
<div class="member-rank-summary__icon"> <div class="member-rank-summary__icon">
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/> <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<img src="${cdnurl}${ mpageResultMap.info.mbrGradIconCours }" onerror="this.src='/pc/images/image_placeholder.png'" alt="${ mpageResultMap.info.mbrGradNm }"> <img src="${cdnurl}${ mpageResultMap.info.mbrGradIconCours }" onerror="this.src='/pc/images/image_placeholder.png'" alt="${ mpageResultMap.info.mbrGradNm }">
</div> </div>
</c:if> </c:if>

View File

@@ -6,7 +6,7 @@
<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%> <%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui"%>
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/> <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko"> <html lang="ko">
@@ -163,7 +163,7 @@
if (row.optnNm != null) { if (row.optnNm != null) {
div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>'; div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>';
} }
div += ' <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>원'; div += ' <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';
div += ' </p>'; div += ' </p>';
div += ' </div>'; div += ' </div>';
div += ' </div>'; div += ' </div>';

View File

@@ -7,6 +7,7 @@
<%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%> <%@ taglib prefix="f" uri="/WEB-INF/tlds/f.tld"%>
<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/> <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko"> <html lang="ko">
<head> <head>
@@ -699,7 +700,7 @@
<p class="orderDetailProduct__info__quantity"> <p class="orderDetailProduct__info__quantity">
<fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/>개 <fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/>개
<span class="orderDetailProduct__info__dot">·</span> <span class="orderDetailProduct__info__dot">·</span>
<span class="comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>원 <span class="comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>${curUnit}
</p> </p>
</div> </div>
</div> </div>
@@ -839,7 +840,7 @@
</c:if> </c:if>
<p class="orderDetailProduct__info__quantity"> <p class="orderDetailProduct__info__quantity">
<fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/>개<span class="orderDetailProduct__info__dot">·</span> <fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/>개<span class="orderDetailProduct__info__dot">·</span>
<span class="comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>원 <span class="comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>${curUnit}
</p> </p>
</div> </div>
</div> </div>
@@ -916,7 +917,7 @@
<tbody> <tbody>
<tr> <tr>
<th>구매확정 시 적립예정</th> <th>구매확정 시 적립예정</th>
<td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>원</em></td> <td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td>
</tr> </tr>
<tr> <tr>
<th>리뷰작성 시 적립예정</th> <th>리뷰작성 시 적립예정</th>
@@ -925,14 +926,14 @@
<c:choose> <c:choose>
<c:when test="${'06' == ntc.bbsTyCd}"> <c:when test="${'06' == ntc.bbsTyCd}">
<c:if test="${not empty ntc.gnrlRvwAmt}"> <c:if test="${not empty ntc.gnrlRvwAmt}">
일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>원</em> 적립 일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립
</c:if> </c:if>
<c:if test="${not empty ntc.photoRvwAmt}"> <c:if test="${not empty ntc.photoRvwAmt}">
<br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>원</em> 적립 <br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립
</c:if> </c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>원</em> 적립 <br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}"> <c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}">
@@ -941,7 +942,7 @@
<fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/> <fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/>
<fmt:formatDate value="${endDeDate}" var="endDe" pattern="yyyy-MM-dd"/> <fmt:formatDate value="${endDeDate}" var="endDe" pattern="yyyy-MM-dd"/>
<br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>원</i> 추가 적립) <br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>점</i> 추가 적립)
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
@@ -1083,7 +1084,7 @@
</c:if> </c:if>
<tr> <tr>
<th>결제금액</th> <th>결제금액</th>
<td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>원</td> <td><span class="comma"><fmt:formatNumber value="${setle.setleAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr> </tr>
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%> <c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}"><%--주문취소시 미노출--%>
<tr <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>> <tr <c:if test = "${empty setle.issuSttusCd}">style="border-bottom: 0.5px solid #e9ecef;"</c:if>>
@@ -1174,31 +1175,31 @@
<th>총 상품금액</th> <th>총 상품금액</th>
<td> <td>
<span class="orderDetail__table__productPrice"> <span class="orderDetail__table__productPrice">
<span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span>원 <span class="comma"><fmt:formatNumber value="${total.slepric}" pattern="#,###"/></span>${curUnit}
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<th>할인금액</th> <th>할인금액</th>
<td>-<fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>원</td> <td>-<fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>${curUnit}</td>
</tr> </tr>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status"> <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}"> <c:if test="${'03' != dscnt.dscntDvCd}">
<tr class="orderDetail__table__discountSub"> <tr class="orderDetail__table__discountSub">
<th><span><c:out value="${dscnt.dscntDvNm}"/></span></th> <th><span><c:out value="${dscnt.dscntDvNm}"/></span></th>
<td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</td> <td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</td>
</tr> </tr>
</c:if> </c:if>
</c:forEach> </c:forEach>
<tr> <tr>
<th>배송비</th> <th>배송비</th>
<td><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span>원</td> <td><span class="comma"><fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/></span>${curUnit}</td>
</tr> </tr>
<c:forEach var="dscnt" items="${data.dscntList}" varStatus="status"> <c:forEach var="dscnt" items="${data.dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}"> <c:if test="${'03' == dscnt.dscntDvCd}">
<tr class="orderDetail__table__discountSub"> <tr class="orderDetail__table__discountSub">
<th><span><c:out value="${dscnt.dscntDvNm}"/></span></th> <th><span><c:out value="${dscnt.dscntDvNm}"/></span></th>
<td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</td> <td>-<fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</td>
</tr> </tr>
</c:if> </c:if>
</c:forEach> </c:forEach>
@@ -1207,7 +1208,7 @@
<tr> <tr>
<th>총 결제금액</th> <th>총 결제금액</th>
<td> <td>
<span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>원 <span class="comma"><fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/></span>${curUnit}
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
@@ -1261,7 +1262,7 @@
</tr> </tr>
<tr style="border-bottom: 1px solid #e9ecef;"> <tr style="border-bottom: 1px solid #e9ecef;">
<th>처리금액</th> <th>처리금액</th>
<td colspan="2"><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/>원</td> <td colspan="2"><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/>${curUnit}</td>
</tr> </tr>
</c:forEach> </c:forEach>
</tbody> </tbody>