Merge remote-tracking branch 'style24/stage_tsit' into develop

src/main/java/com/style24/front/biz/thirdparty/KaKaoLogin.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
+import com.vdurmont.emoji.EmojiParser;
 
 import javax.annotation.PostConstruct;
 import java.net.URI;
@@ -193,7 +194,7 @@ public class KaKaoLogin {
 			Locale locale = Locale.KOREA;
 
 			String snsId = obj.get("id").toString();
-			String custNm = properties.getString("nickname");
+			String custNm = EmojiParser.removeAllEmojis(properties.getString("nickname"));
 			String email = kakaoAccount.getString("email");
 			String birthYmd = kakaoAccount.getString("birthyear") + kakaoAccount.getString("birthday");
 			String cellPhnno = getPhoneNumber(kakaoAccount.getString("phone_number"), locale.getCountry());

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

@@ -264,7 +264,8 @@ public class TsfCartController extends TsfBaseController {
 	public Login selectLoginInfo(Order param) {
 		Login result = new Login();
 		if (TsfSession.isLogin()) {
-			result = TsfSession.getInfo();
+			/* result = TsfSession.getInfo(); */
+			result.setCustNo(TsfSession.getInfo().getCustNo()); 
 		} else {
 			result.setCustNo(0);
 		}