Merge remote-tracking branch 'origin/master'

2026-05-06 17:05:25 +09:00
parent eff6ce35bd 9cc4a26f0f
commit 16c373cb14
53 changed files with 2375 additions and 813 deletions
--- a/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml
@@ -947,6 +947,37 @@
 				SOPMAL_CD = #{sopmalCd}
 	</update>

+	<!-- 쇼핑몰 환율 설정 수정 -->
+	<update id="updateBOExchngrtSetup" parameterType="com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO" >
+		UPDATE
+			GC_SHOP
+		SET BUY_RATE	= #{buyRate},
+			SELL_RATE	= #{sellRate},
+			UPDUSR		= #{updusr},
+			UPDT_DT		= SYSDATE()
+		WHERE
+			1=1
+		AND
+			SOPMAL_CD = #{sopmalCd}
+	</update>
+
+	<!-- 쇼핑몰 안내문구 설정 수정 -->
+	<update id="updateBOGuidanceSetup" parameterType="com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO" >
+		UPDATE
+			GC_SHOP
+		SET JOIN_GUIDANCE_SJ		= #{joinGuidanceSj},
+			JOIN_GUIDANCE_WORDS		= #{joinGuidanceWords},
+			JOIN_BNEF				= #{joinBnef},
+			JOIN_COMPT_WORDS		= #{joinComptWords},
+			SUBSVC_GUIDANCE_WORDS	= #{subsvcGuidanceWords},
+			UPDUSR					= #{updusr},
+			UPDT_DT					= SYSDATE()
+		WHERE
+			1=1
+		AND
+			SOPMAL_CD = #{sopmalCd}
+	</update>
+
 	<!-- 쇼핑몰 사업자 정보 삭제 -->
    <delete id="deteteBOShopCompany" parameterType="com.wb.domainserver.domain.admin.sys.author.vo.BOMaAuthorVO">

--- a/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/promtn/purchs/BOPurchsMapper.xml
@@ -374,106 +374,103 @@
 				SOPMAL_CD,
 				EVT_INNB,
 		]]>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">
-						BGN_CNT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">
-						END_CNT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
-						BGN_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
-						END_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
-						PROVD_CNT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
-						ADIT_DSCNT_CD,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
-						ADIT_DSCNT_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
-						DSCNT_MXMM_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
-						MLG_ACCML_CD,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
-						MLG_ACCML_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
-						MLG_VALID_MT_CNT,
-					</if>
-				<![CDATA[
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">
+				BGN_CNT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">
+				END_CNT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
+				BGN_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
+				END_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
+				PROVD_CNT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
+				ADIT_DSCNT_CD,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
+				ADIT_DSCNT_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
+				DSCNT_MXMM_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
+				MLG_ACCML_CD,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
+				MLG_ACCML_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
+				MLG_VALID_MT_CNT,
+		</if>
+		<![CDATA[
 				USE_AT,
 				REGUSR,
 				REGIST_DT,
 				UPDUSR,
 				UPDT_DT
-			) SELECT
+		) VALUES (
 				#{seq},
 				#{sopmalCd},
 				#{evtInnb},
 		]]>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">
-						REPLACE(#{bgnCnt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">
-						REPLACE(#{endCnt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
-						REPLACE(#{bgnAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
-						REPLACE(#{endAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
-						#{provdCnt},
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
-						#{aditDscntCd},
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
-						REPLACE(#{aditDscntAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
-						REPLACE(#{dscntMxmmAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
-						#{mlgAccmlCd},
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
-						REPLACE(#{mlgAccmlAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
-						REPLACE(#{mlgValidMtCnt}, ',', ''),
-					</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">REPLACE(#{bgnCnt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">REPLACE(#{endCnt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
+				REPLACE(#{bgnAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
+				REPLACE(#{endAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
+				#{provdCnt},
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
+				#{aditDscntCd},
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
+				REPLACE(#{aditDscntAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
+				REPLACE(#{dscntMxmmAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
+				#{mlgAccmlCd},
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
+				REPLACE(#{mlgAccmlAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
+				REPLACE(#{mlgValidMtCnt}, ',', ''),
+		</if>
 		<![CDATA[
 				'Y',
 				#{regusr},
 				SYSDATE(),
 				#{updusr},
 				SYSDATE()
-			FROM
-			 	GC_EVENT_BENEFITS
-			 	ON DUPLICATE KEY UPDATE
-					BGN_CNT = VALUES(BGN_CNT),
-					END_CNT = VALUES(END_CNT),
-					BGN_AMT = VALUES(BGN_AMT),
-					END_AMT = VALUES(END_AMT),
-					PROVD_CNT = VALUES(PROVD_CNT),
-					ADIT_DSCNT_CD = VALUES(ADIT_DSCNT_CD),
-					ADIT_DSCNT_AMT = VALUES(ADIT_DSCNT_AMT),
-					DSCNT_MXMM_AMT = VALUES(DSCNT_MXMM_AMT),
-					MLG_ACCML_CD = VALUES(MLG_ACCML_CD),
-					MLG_ACCML_AMT = VALUES(MLG_ACCML_AMT),
-					MLG_VALID_MT_CNT = VALUES(MLG_VALID_MT_CNT),
-					REGUSR = VALUES(REGUSR),
-					UPDUSR = VALUES(UPDUSR),
-					UPDT_DT = VALUES(UPDT_DT)
+		)
+		ON DUPLICATE KEY UPDATE
+			BGN_CNT = VALUES(BGN_CNT),
+			END_CNT = VALUES(END_CNT),
+			BGN_AMT = VALUES(BGN_AMT),
+			END_AMT = VALUES(END_AMT),
+			PROVD_CNT = VALUES(PROVD_CNT),
+			ADIT_DSCNT_CD = VALUES(ADIT_DSCNT_CD),
+			ADIT_DSCNT_AMT = VALUES(ADIT_DSCNT_AMT),
+			DSCNT_MXMM_AMT = VALUES(DSCNT_MXMM_AMT),
+			MLG_ACCML_CD = VALUES(MLG_ACCML_CD),
+			MLG_ACCML_AMT = VALUES(MLG_ACCML_AMT),
+			MLG_VALID_MT_CNT = VALUES(MLG_VALID_MT_CNT),
+			REGUSR = VALUES(REGUSR),
+			UPDUSR = VALUES(UPDUSR),
+			UPDT_DT = VALUES(UPDT_DT)
 		]]>
 	</insert>

--- a/src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml
@@ -42,7 +42,12 @@
    <!--주문 설정  수정-->
    <update id="updateBOOrdrSetup">
        UPDATE GC_SHOP
-        SET MLG_PYMNT_AT = #{mlgPymntAt},
+        SET CASH_AT = IFNULL(#{cashAt},'N'),
+            MULTI_DLVY_AT = IFNULL(#{multiDlvyAt},'N'),
+            FDRM_DLVY_AT = IFNULL(#{fdrmDlvyAt},'N'),
+            GIFT_DLVY_AT = IFNULL(#{giftDlvyAt},'N'),
+            GIFT_DLVY_ATMC_CANCL_PD = #{giftDlvyAtmcCanclPd},
+            MLG_PYMNT_AT = #{mlgPymntAt},
            MLG_PYMNT_DV_CD = #{mlgPymntDvCd},
            MLG_PYMNT_RT = REPLACE(#{mlgPymntRt},',',''),
            MLG_MXMM_PYMNT_AMT = REPLACE(#{mlgMxmmPymntAmt},',',''),
@@ -63,11 +68,13 @@
                    MLG_VALID_PD_AT = 'Y',
                </otherwise>
            </choose>
-            CASH_AT = IFNULL(#{cashAt},'N'),
-            MULTI_DLVY_AT = IFNULL(#{multiDlvyAt},'N'),
-            FDRM_DLVY_AT = IFNULL(#{fdrmDlvyAt},'N'),
-            GIFT_DLVY_AT = IFNULL(#{giftDlvyAt},'N'),
-            GIFT_DLVY_ATMC_CANCL_PD = #{giftDlvyAtmcCanclPd}
+            MLG_HOLD_USE_AMT = #{mlgHoldUseAmt},
+            MLG_SETLE_AMT_USE_AMT = #{mlgSetleAmtUseAmt},
+            MLG_MUMM_USE_AMT = #{mlgMummUseAmt},
+            MLG_MXMM_USE_DV = #{mlgMxmmUseDv},
+            MLG_MXMM_USE_AMT = #{mlgMxmmUseAmt},
+            UPDUSR = #{updusr},
+            UPDT_DT = SYSDATE()
        WHERE SOPMAL_CD = #{sopmalCd}
    </update>

--- a/src/main/resources/static/js/mngr/gcone.js
+++ b/src/main/resources/static/js/mngr/gcone.js
@@ -1850,6 +1850,47 @@ function validateInput(input, opts = {}) {
    });
 }

+/************************************************************
+ form데이터 sealize 후 json 스트링 형태로 전환
+ ************************************************************ */
+function queryToJson(queryString) {
+    let jsonObj = {};
+    let pairs = queryString.split("&");
+
+    $.each(pairs, function (index, pair) {
+        let [key, value] = pair.split("=");
+        if(!fn_is_empty(value)){
+            jsonObj[key] = value ? decodeURIComponent(value) : "";
+        }
+    });
+    const jsonStr = JSON.stringify(jsonObj);
+    return jsonStr;
+}
+
+/************************************************************
+ 치환코드 입력
+ * @param eventObj : 클릭객체
+ * @param closestSelector : 가까운 객체
+ * @param targetTextAreaSelector : textarea타겟대상
+ * @property obj : 클릭한 객체
+ * @property existingVal : 기존 텍스트 아리아 값
+ * @property addStr : 추가할 치환 코드
+ * @description 치환 문자 td 클래스에 subst 클래스 부여
+ ************************************************************ */
+function fn_set_substituon_in_texatarea(eventObj, closestSelector, targetTextAreaSelector) {
+    const obj = $(eventObj);
+    let existingVal = $("#"+targetTextAreaSelector).val();
+    let addStr;
+    const addStrT = obj.closest(closestSelector).find(".subst").text();
+    const addStrV = obj.closest(closestSelector).find(".subst").val();
+    if(!fn_is_empty(addStrT)){
+        addStr = addStrT;
+    }else{
+        addStr = addStrV;
+    }
+    existingVal = existingVal + " " +addStr;
+    $("#"+targetTextAreaSelector).val(existingVal);
+}

 /* ************************************************************
 *   인피니티 스크롤 공통 처리 (footer가 보이면 callback함수 호출)