Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-198(다다익선등록오류)

src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.security.GagaPasswordEncoder;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscMailService;
@@ -36,9 +38,6 @@ import com.style24.persistence.domain.WishList;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.security.GagaPasswordEncoder;
-
 /**
  * 고객(회원) Service
  *
@@ -445,10 +444,13 @@ public class TsfCustomerService {
 				resultMap.setString("custStat", "DUP_PHONE_CUST"); // 휴대폰 중복
 				return resultMap;
 			}
-			boolean isFindByEmail = getCustomerFindByEmailCount(custSnsInfo.getEmail());
-			if (isFindByEmail) {
-				resultMap.setString("custStat", "DUP_EMAIL_CUST"); // 이메일 중복
-				return resultMap;
+			// 2021.12.06 card007 이메일 없을 시 패스
+			if (StringUtils.isNotBlank(custSnsInfo.getEmail())) {
+				boolean isFindByEmail = getCustomerFindByEmailCount(custSnsInfo.getEmail());
+				if (isFindByEmail) {
+					resultMap.setString("custStat", "DUP_EMAIL_CUST"); // 이메일 중복
+					return resultMap;
+				}
 			}
 			Customer customer = objectMapper.convertValue(custSnsInfo, Customer.class);
 			boolean isJoin = saveJoinCustomerSns(customer);

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -24,6 +24,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.parameter.GagaParameterUtil;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaCookieUtil;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscEnvsetService;
@@ -73,12 +78,6 @@ import com.style24.persistence.domain.WishList;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.parameter.GagaParameterUtil;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.gagaframework.web.util.GagaCookieUtil;
-
 /**
  * 마이페이지 Controller
  * 
@@ -2771,7 +2770,7 @@ public class TsfMypageController extends TsfBaseController {
 			return super.error(e.getMessage());
 		}
 
-		return super.ok(env.getProperty("SUCC_0005"));
+		return super.ok(message.getMessage("SUCC_0005"));
 	}
 
 	/**

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListInfoMob.html

@@ -349,7 +349,7 @@
 								<!-- 배송지등록전 -->
 								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
 									<div>
-										<button type="button" class="btn btn_default btn_sms_send">
+										<button type="button" class="btn btn_default btn_sms_send" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);">
 											<span>SMS 재발송</span>
 										</button>
 									</div>