Pārlūkot izejas kodu

Merge branch 'develop' into bin2107

bin2107 5 gadi atpakaļ
vecāks
revīzija
24c0a4705b

+ 2 - 0
src/main/java/com/style24/admin/biz/service/TsaCustomerService.java

@@ -73,6 +73,7 @@ public class TsaCustomerService {
 	 */
 	public Customer getCustomerInfo(Integer custNo) {
 		Customer customer = new Customer();
+		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCustNo(custNo);
 		customer.setCustStat(TscConstants.CustStat.ACTIVE.value());
 		return coreCustomerService.getCustomerInfo(customer);
@@ -138,6 +139,7 @@ public class TsaCustomerService {
 	 */
 	@Transactional("shopTxnManager")
 	public GagaMap saveCustomerSecede(Customer customer) {
+		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCustStat(TscConstants.CustStat.SECEDE.value());
 		return coreCustomerService.saveCustomerSecede(customer);
 	}

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsaCustomer.xml

@@ -226,7 +226,7 @@
 		    , HOME_DTL_ADDR = #{encodedHomeDtlAddr}
 		    </if>
 		    <if test="encodedBirthYmd != null and encodedBirthYmd != ''">
-		    , BIRTH_YMD = REPLACE(#{encodedBirthYmd}, '-', '')
+		    , BIRTH_YMD = #{encodedBirthYmd}
 		    </if>
 		    <if test="encodedEmail != null and encodedEmail != ''">
 		    , EMAIL = #{encodedEmail}

+ 2 - 1
src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -967,6 +967,7 @@
 
 	});
 
+	// 기본정보 - 탈퇴버튼
 	$('#btnCustSecede').on('click', function () {
 		let custNo = $('#custInfoForm input[name=custNo]').val();
 		if (gagajf.isNull(custNo)) {
@@ -1009,7 +1010,7 @@
 		if (customer.smsAgreeYn === orgData.smsAgreeYn) {
 			customer.smsAgreeYn = '';
 		}
-
+		customer.birthYmd = customer.birthYmd.replaceAll('-', '');
 
 		mcxDialog.confirm("기본정보를 수정 하시겠습니까?", {
 			cancelBtnText: "취소",