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-02-10 14:48:39 +09:00
parent 4939bf7954 55192f8ccc
commit cb022e9841
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/wb/domainserver/domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java
View File

@@ -206,7 +206,11 @@ public class BOAtmcRcpmnyCnfirmVO extends AbstractVO {
/** 입금여부3 */
private String srchOrdrSttusCd3;
private String srchDatePick;
/** 회원 구분 코드 */
private String mbrDvCd;
}

2
src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 주문 설정 VO
@@ -23,6 +24,7 @@ import lombok.Data;
* </pre>
*/
@Data
@EqualsAndHashCode(callSuper=true)
public class BOSetupOrdrVO extends AbstractVO {
/** 쇼핑몰 코드 */
private String sopmalCd;

2
src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml
View File

@@ -27,6 +27,7 @@
AND OI.GOODS_INNB = G.GOODS_INNB
INNER JOIN GC_ORDER O ON EX.SOPMAL_CD = O.SOPMAL_CD
AND EX.ORDR_INNB = O.ORDR_INNB
AND O.SUBSVC_AT = 'N' /*구독서비스 제외*/
INNER JOIN GC_ORDER_SHIPPING OSHIP ON EX.SOPMAL_CD = OSHIP.SOPMAL_CD
AND EX.ORDR_INNB = OSHIP.ORDR_INNB
AND EX.ORDR_DLVY_INNB = OSHIP.ORDR_DLVY_INNB
@@ -405,6 +406,7 @@
AND OI.GOODS_INNB = G.GOODS_INNB
INNER JOIN GC_ORDER O ON SH.SOPMAL_CD = O.SOPMAL_CD
AND SH.ORDR_INNB = O.ORDR_INNB
AND O.SUBSVC_AT = 'N' /*구독서비스 제외*/
INNER JOIN GC_ORDER_SETLE ST ON SH.SOPMAL_CD = ST.SOPMAL_CD
AND SH.ORDR_INNB = ST.ORDR_INNB
LEFT JOIN GC_MEMBER MBR ON O.MBR_DV_CD = MBR.MBR_DV_CD

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

@@ -494,6 +494,7 @@
AND FOS.ORDR_INNB = FO.ORDR_INNB
WHERE FO.USE_AT = 'Y'
AND IFNULL(FOS.ORDR_INNB, '') != ''
AND FO.SUBSVC_AT = 'N'
AND FO.SOPMAL_CD = #{sopmalCd}
<include refid="orderWhere"/>
</select>
@@ -597,6 +598,7 @@
ON FOS.SOPMAL_CD = FO.SOPMAL_CD
AND FOS.ORDR_INNB = FO.ORDR_INNB
WHERE FO.USE_AT = 'Y'
AND FO.SUBSVC_AT = 'N'
AND FOS.ORDR_INNB IS NOT NULL -- GC_ORDER_SETLE 에 데이터가 있을 때 조건
# AND IFNULL(FOS.ORDR_INNB, '') != '' -- 필터조건의 의미가 inner join 을 의미하므로, GC_ORDER_SETLE 테이블과 inner join 으로 변경하였음.
AND FO.SOPMAL_CD = #{sopmalCd}
@@ -3815,6 +3817,7 @@
LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD
AND FOS.ORDR_INNB = FO.ORDR_INNB
WHERE FO.USE_AT = 'Y'
AND FO.SUBSVC_AT = 'N' /*구독서비스 제외*/
AND IFNULL(FOS.ORDR_INNB, '') != ''
AND FO.SOPMAL_CD = #{sopmalCd}
AND FO.MBR_DV_CD = #{mbrDvCd}
@@ -3959,7 +3962,7 @@
LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD
AND FOS.ORDR_INNB = FO.ORDR_INNB
WHERE FO.USE_AT = 'Y'
AND FO.SUBSVC_INNB IS NULL /*구독서비스 제외*/
AND FO.SUBSVC_AT = 'N' /*구독서비스 제외*/
AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
AND FO.SOPMAL_CD = #{sopmalCd}
AND FO.MBR_DV_CD = #{mbrDvCd}

4
src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp
View File

@@ -464,9 +464,7 @@
<div class="content__inner">
<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
<div class="page-title">
<h2 class="page-title__title">
<a href="javascript:void(0);" onclick="fn_move_goods_dtl_common(<c:out value="${resultMap.subsvcDtl.subsvcInnb}"/>, 'sopmal')">구독서비스 수정 (상품번호 : ${resultMap.subsvcDtl.subsvcInnb})</a>
</h2>
<h2 class="page-title__title">구독서비스 수정 (상품번호 : ${resultMap.subsvcDtl.subsvcInnb})</h2>
<div class="page-title__btn-container">
<button onclick="fn_select_list()" class="btn outline"><spring:message code="button.list"/></button>
<button onclick="fn_updateSubsvc();return false;" class="btn primary"><spring:message code="button.update"/></button>