Merge remote-tracking branch 'origin/master'

This commit is contained in:
jazz
2026-02-06 16:22:29 +09:00
10 changed files with 1084 additions and 61 deletions

View File

@@ -129,6 +129,19 @@
,RETURN_DLVY_APPLC_AT
,RETURN_DLVY_AMT
,EXCHNG_DLVY_AMT
,RTNLC_INNB2
,DFT_DLVY_AMT2
,AMT_CND_USE_AT2
,AMT_CND_ADIT_AMT2
,CNT_CND_USE_AT2
,CNT_CND_ADIT_AMT2
,DLVY_AREA_ADIT_AT2
,AREA_ADIT_DLVY_AMT2
,BUNDLE_DLVY_USE_AT2
,BUNDLE_DLVY_CND_AMT2
,RETURN_DLVY_APPLC_AT2
,RETURN_DLVY_AMT2
,EXCHNG_DLVY_AMT2
,USE_AT
,REGUSR
,REGIST_DT
@@ -154,6 +167,19 @@
,#{returnDlvyApplcAt}
,#{returnDlvyAmt}
,#{exchngDlvyAmt}
,#{rtnlcInnb2}
,#{dftDlvyAmt2}
,#{amtCndUseAt2}
,#{amtCndAditAmt2}
,#{cntCndUseAt2}
,#{cntCndAditAmt2}
,#{dlvyAreaAditAt2}
,#{areaAditDlvyAmt2}
,#{bundleDlvyUseAt2}
,#{bundleDlvyCndAmt2}
,#{returnDlvyApplcAt2}
,#{returnDlvyAmt2}
,#{exchngDlvyAmt2}
,'Y'
,#{regusr}
,now()
@@ -200,12 +226,50 @@
)
</insert>
<!-- 배송 반송지 등록 -->
<insert id="insertBODlvyGroupAddress2" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
<selectKey keyProperty="rtnlcInnb2"
resultType="java.lang.Integer"
order="BEFORE">
SELECT IFNULL(MAX(RTNLC_INNB),0) + 1 FROM GC_SHIPPING_ADDRESS WHERE SOPMAL_CD = #{sopmalCd}
</selectKey>
INSERT INTO GC_SHIPPING_ADDRESS
(
RTNLC_INNB
, SOPMAL_CD
, RTNLC_ZIP
, RTNLC_ADRES
, RTNLC_DTL_ADRES
, RTNLC_TELNB
, USE_AT
, REGUSR
, REGIST_DT
, UPDUSR
, UPDT_DT
)
VALUES
(
#{rtnlcInnb2}
, #{sopmalCd}
, #{rtnlcZip2}
, #{rtnlcAdres2}
, #{rtnlcDtlAdres2}
, #{rtnlcTelnb2}
, 'Y'
, #{regusr}
, now()
, #{regusr}
, now()
)
</insert>
<!-- 배송그룹 정보 조회 -->
<select id="selectBODlvyGroupDtlForm"
parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO"
resultType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
SELECT
SG.DLVY_GROUP_INNB
,SG.SOPMAL_CD
,SG.DLVY_GROUP_DV_CD
,SG.DLVY_GROUP_NM
,SG.DFT_DLVY_AMT
@@ -220,19 +284,41 @@
,SG.RETURN_DLVY_APPLC_AT
,SG.RETURN_DLVY_AMT
,SG.EXCHNG_DLVY_AMT
,SG.DFT_DLVY_AMT2
,SG.AMT_CND_USE_AT2
,SG.AMT_CND_ADIT_AMT2
,SG.CNT_CND_USE_AT2
,SG.CNT_CND_ADIT_AMT2
,SG.DLVY_AREA_ADIT_AT2
,SG.AREA_ADIT_DLVY_AMT2
,SG.BUNDLE_DLVY_USE_AT2
,SG.BUNDLE_DLVY_CND_AMT2
,SG.RETURN_DLVY_APPLC_AT2
,SG.RETURN_DLVY_AMT2
,SG.EXCHNG_DLVY_AMT2
,SG.RTNLC_INNB
,SA.RTNLC_ZIP
,SA.RTNLC_ADRES
,SA.RTNLC_DTL_ADRES
,SA.RTNLC_TELNB
,SG.RTNLC_INNB2
,SA1.RTNLC_ZIP
,SA1.RTNLC_ADRES
,SA1.RTNLC_DTL_ADRES
,SA1.RTNLC_TELNB
,SA2.RTNLC_ZIP AS RTNLC_ZIP2
,SA2.RTNLC_ADRES AS RTNLC_ADRES2
,SA2.RTNLC_DTL_ADRES AS RTNLC_DTL_ADRES2
,SA2.RTNLC_TELNB AS RTNLC_TELNB2
,SG.RETURN_DLVY_AMT
,SG.EXCHNG_DLVY_AMT
FROM GC_SHIPPING_GROUPING SG
LEFT JOIN GC_SHIPPING_ADDRESS SA
ON SG.RTNLC_INNB = SA.RTNLC_INNB
AND SG.SOPMAL_CD = SA.SOPMAL_CD
AND SG.USE_AT = 'Y'
AND SA.USE_AT = 'Y'
LEFT JOIN GC_SHIPPING_ADDRESS SA1
ON SG.RTNLC_INNB = SA1.RTNLC_INNB
AND SG.SOPMAL_CD = SA1.SOPMAL_CD
AND SG.USE_AT = 'Y'
AND SA1.USE_AT = 'Y'
LEFT JOIN GC_SHIPPING_ADDRESS SA2
ON SG.RTNLC_INNB2 = SA2.RTNLC_INNB
AND SG.SOPMAL_CD = SA2.SOPMAL_CD
AND SG.USE_AT = 'Y'
AND SA2.USE_AT = 'Y'
WHERE 1=1
AND SG.SOPMAL_CD = #{sopmalCd}
AND DLVY_GROUP_INNB = #{dlvyGroupInnb}
@@ -257,6 +343,18 @@
,RETURN_DLVY_APPLC_AT = #{returnDlvyApplcAt}
,RETURN_DLVY_AMT = #{returnDlvyAmt}
,EXCHNG_DLVY_AMT = #{exchngDlvyAmt}
,DFT_DLVY_AMT2 = #{dftDlvyAmt2}
,AMT_CND_USE_AT2 = #{amtCndUseAt2}
,AMT_CND_ADIT_AMT2 = #{amtCndAditAmt2}
,CNT_CND_USE_AT2 = #{cntCndUseAt2}
,CNT_CND_ADIT_AMT2 = #{cntCndAditAmt2}
,DLVY_AREA_ADIT_AT2 = #{dlvyAreaAditAt2}
,AREA_ADIT_DLVY_AMT2 = #{areaAditDlvyAmt2}
,BUNDLE_DLVY_USE_AT2 = #{bundleDlvyUseAt2}
,BUNDLE_DLVY_CND_AMT2 = #{bundleDlvyCndAmt2}
,RETURN_DLVY_APPLC_AT2 = #{returnDlvyApplcAt2}
,RETURN_DLVY_AMT2 = #{returnDlvyAmt2}
,EXCHNG_DLVY_AMT2 = #{exchngDlvyAmt2}
,UPDUSR = #{updusr}
,UPDT_DT = NOW()
]]>
@@ -278,11 +376,27 @@
AND SOPMAL_CD = #{sopmalCd}
</update>
<!-- 배송그룹 수정 -->
<update id="updateBODlvyGroupRtnlc2"
parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
UPDATE GC_SHIPPING_ADDRESS
SET RTNLC_ZIP = #{rtnlcZip2}
, RTNLC_ADRES = #{rtnlcAdres2}
, RTNLC_DTL_ADRES = #{rtnlcDtlAdres2}
, RTNLC_TELNB = #{rtnlcTelnb2}
, UPDUSR = #{updusr}
, UPDT_DT = NOW()
WHERE 1=1
AND RTNLC_INNB = #{rtnlcInnb2}
AND SOPMAL_CD = #{sopmalCd}
</update>
<!-- 배송그룹 삭제(사용여부 Update y > n) -->
<update id="deleteBODlvyGroup" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
<![CDATA[
UPDATE GC_SHIPPING_GROUPING
SET USE_AT = 'N'
, UPDT_DT = NOW()
]]>
<include refid="selectDlvyKeyWhere"/>
</update>
@@ -291,10 +405,20 @@
<update id="deleteBODlvyGroupRtnlc" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
UPDATE GC_SHIPPING_ADDRESS
SET USE_AT = 'N'
, UPDT_DT = NOW()
WHERE RTNLC_INNB = #{rtnlcInnb}
AND SOPMAL_CD = #{sopmalCd}
</update>
<!-- 배송그룹 삭제(사용여부 Update y > n) -->
<update id="deleteBODlvyGroupRtnlc2" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
UPDATE GC_SHIPPING_ADDRESS
SET USE_AT = 'N'
, UPDT_DT = NOW()
WHERE RTNLC_INNB = #{rtnlcInnb2}
AND SOPMAL_CD = #{sopmalCd}
</update>
<!-- 배송그룹 고유키로 연결 상품의 갯수 검색 -->
<select id="isIncludeGoods"
parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO"