itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
이경숙
2026-03-27 18:34:43 +09:00
parent 8573a3e7a4 87efc0362e
commit 03193351cc
18 changed files with 411 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
View File

@@ -3671,9 +3671,11 @@
AND GMP.SOPMAL_CD = #{sopmalCd}
LEFT JOIN GC_MEMBER_GRAD MG ON GMP.MBR_GRAD_INNB = MG.MBR_GRAD_INNB
AND GMP.SOPMAL_CD = MG.SOPMAL_CD
AND MG.USE_AT = 'Y'
LEFT JOIN GC_MEMBER_GRAD MG_NEXT
ON MG.MBR_GRAD_ORDR + 1 = MG_NEXT.MBR_GRAD_ORDR
AND MG.SOPMAL_CD = MG_NEXT.SOPMAL_CD
AND MG_NEXT.USE_AT = 'Y'
LEFT JOIN GC_ORDER O ON MBR.MBR_DV_CD = O.MBR_DV_CD
AND MBR.MBR_INNB = O.MBR_INNB
AND O.USE_AT = 'Y'

45
src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml
View File

@@ -5594,6 +5594,51 @@
LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
</select>
<!-- 사용자 > 주문완료 > 구독서비스 주문 목록 조회 -->
<select id="selectOrdrSubsvcDtllList" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO" resultType="dataMap">
<![CDATA[
SELECT GO.SOPMAL_CD
, GS.IMG AS GOODS_IMG_COURS
, GS.SUBSVC_NM AS GOODS_NM
, GS.SUBSVC_GNR_NM AS OPTN_NM
, ITEM.INPUT_OPTN_TEXT
, ITEM.CNT AS ORDR_QY
, GS.SUBSVC_INNB AS GOODS_INNB
, GO.RL_SETLE_AMT AS SLEPRIC
, ITEM.DSCNT_AMT
, ROUND((IFNULL(GO.RL_SETLE_AMT, 0) - IFNULL(ITEM.DSCNT_AMT, 0))) AS APPLY_DSCNT_AMT
, ITEM.MLG_AMT
FROM GC_ORDER GO
INNER JOIN GC_SUBSVC GS ON GO.SUBSVC_INNB = GS.SUBSVC_INNB
INNER JOIN (
SELECT GOI.SOPMAL_CD
, GOI.ORDR_INNB
, MAX(GOI.GOODS_INNB) AS GOODS_INNB
, MAX(GOIO.ORDR_DLVY_INNB) AS ORDR_DLVY_INNB
, COUNT(DISTINCT GOI.ORDR_GOODS_INNB) AS CNT
, SUM(GOIO.ORDR_QY) AS ORDR_QY
, MAX(FN_GET_ORDER_INPUT_OPTN(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_INNB, GOIO.ORDR_GOODS_OPTN_INNB)) AS INPUT_OPTN_TEXT
, MAX(GOI.GOODS_IMG_COURS) AS GOODS_IMG_COURS
, SUM(FN_GET_ORDER_GOODS_DSCNT_AMT_2(GOI.SOPMAL_CD, GOI.ORDR_GOODS_INNB, GOIO.ORDR_GOODS_OPTN_INNB)) AS DSCNT_AMT
, SUM(FN_GET_ORDER_ACCML_MLG_AMT(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_INNB, GOIO.ORDR_GOODS_OPTN_INNB)) AS MLG_AMT
FROM GC_ORDER_ITEM GOI
INNER JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD
AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB
WHERE GOI.SOPMAL_CD = #{sopmalCd}
AND GOI.ORDR_INNB = #{ordrInnb}
AND GOI.GOODS_KND_CD = '01'
) ITEM ON ITEM.SOPMAL_CD = GO.SOPMAL_CD
AND ITEM.ORDR_INNB = GO.ORDR_INNB
LEFT JOIN GC_ORDER_SETLE GOS ON GOS.SOPMAL_CD = GO.SOPMAL_CD
AND GOS.ORDR_INNB = GO.ORDR_INNB
WHERE GO.USE_AT = 'Y'
AND GO.SUBSVC_AT = 'Y' /*구독서비스*/
AND GO.SOPMAL_CD = #{sopmalCd}
AND GO.ORDR_INNB = #{ordrInnb}
ORDER BY GO.REGIST_DT desc
]]>
</select>
<!-- 사용자 > 구독서비스 결제 > 구독서비스 주문 상품 목록 조회 -->
<select id="selectSubsvcGoodsList" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" resultType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
WITH RECURSIVE seq AS (