Merge branch 'develop' into bin2107

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

@@ -301,6 +301,7 @@ public class TsfCartService {
 	public void saveSetTypeCartInfo(Collection<Cart> params, List<Integer> cartSqs) {
 		Cart cart = new Cart();
 		StringBuilder sb = new StringBuilder();
+		String cartGb = "";
 
 		// 로그인 정보
 		if(TsfSession.isLogin()) {
@@ -409,6 +410,7 @@ public class TsfCartService {
 			cartSqComma.append(cartSq);
 			i++;
 		}
+
 		if(chkGoOrderForm) {
 			TsfSession.setAttribute("cartSqArr", cartSqComma.toString());
 		}
@@ -441,6 +443,7 @@ public class TsfCartService {
 		}
 
 		// 세션 추가용 변수
+		String cartGb = params.iterator().next().getCartGb();
 		List<String> sendCartSqList = new ArrayList<String>();
 		for(Cart item : params) {
 			item.setCartGb(cart.getCartGb());
@@ -485,7 +488,8 @@ public class TsfCartService {
 			cartSqComma.append(cartSq);
 			i++;
 		}
-		if (!StringUtils.isEmpty(params.iterator().next().getCartGb()) && ("O".equals(params.iterator().next().getCartGb()) || "G".equals(params.iterator().next().getCartGb()))) {
+
+		if (!StringUtils.isEmpty(cartGb) && ("O".equals(cartGb) || "G".equals(cartGb))) {
 			TsfSession.setAttribute("cartSqArr", cartSqComma.toString());
 		}
 	}

src/main/java/com/style24/front/support/security/handler/TsfLoginSuccessHandler.java

@@ -170,7 +170,10 @@ public class TsfLoginSuccessHandler implements AuthenticationSuccessHandler {
 		result.setString("status", "OK");
 		result.setString("returnUrl", returnUrl);
 		result.setString("custNo", loginDetails.getUsername()); // 로그인 후 APP푸시SDK 연동을 위해
-
+		if (loginDetails.isLogin()) {
+			result.setString("appAgreeDt", loginDetails.getLoginInfo().getAppAgreeDt());
+			result.setString("mkAgreeDt", loginDetails.getLoginInfo().getMkAgreeDt());
+		}
 		GagaStringUtil.write(response, result);
 	}
 

src/main/java/com/style24/persistence/domain/Login.java

@@ -49,6 +49,10 @@ public class Login extends TscBaseDomain {
 	private String tempPasswdYn;	// 임시비밀번호여부
 	private int pwdChgDay;			// 비밀번호변경일자
 	private String ci;				// CI(본인인증여부)
+	private String appAgreeYn;		// 앱푸시수신동의여부
+	private String appAgreeDt;		// 앱푸시수신동의일시
+	private String mkAgreeYn;		// 마케팅푸시수신동의여부
+	private String mkAgreeDt;		// 마케팅푸시수신동의일시
 
 	// 암호화 대상 복호화 처리 =================================================
 	public String getCustNm() {

src/main/java/com/style24/persistence/mybatis/shop/TsfCart.xml

@@ -818,7 +818,8 @@
 														   AND CUST_NO = #{custNo} ) A
 												),0)
 		WHERE  CART_SQ = #{updCartSq}
-		AND	CUST_NO = #{custNo}
+		AND    CUST_NO = #{custNo}
+		AND    CART_GB = 'G026_BC'
 	</update>
 
 	<!-- 로그인 후 장바구니단품 삭제 -->
@@ -828,7 +829,8 @@
 		WHERE  CART_SQ IN (SELECT CART_SQ
 						   FROM   TB_CART
 						   WHERE  CART_SQ = #{delCartSq}
-						   AND	CUST_NO = #{custNo}
+						   AND    CUST_NO = #{custNo}
+		                   AND    CART_GB = 'G026_BC'
 						  )
 	</delete>
 
@@ -837,7 +839,8 @@
 		/* TsfCart.deleteCartAfterLogin */
 		DELETE FROM TB_CART
 		WHERE  CART_SQ = #{delCartSq}
-		AND	CUST_NO = #{custNo}
+		AND    CUST_NO = #{custNo}
+		AND    CART_GB = 'G026_BC'
 	</delete>
 	
 	<!-- 로그인 후 장바구니이력 생성 -->
@@ -873,6 +876,7 @@
 			 , NOW()
 		FROM   TB_CART C
 		WHERE  CART_SQ = #{updCartSq}
+		AND    CART_GB = 'G026_BC'
 	</update>
 
 	<!-- 장바구니 상품 정보 조회 -->

src/main/java/com/style24/persistence/mybatis/shop/TsfLogin.xml

@@ -31,6 +31,10 @@
 		     , CI                                                        /*CI본인인증여부*/
 		     , BIRTH_YMD                                                 /*생년월일*/
 		     , SEX_GB                                                    /*성별*/
+		     , APP_AGREE_YN
+		     , DATE_FORMAT(APP_AGREE_DT, '%Y%m%d%H%i%S')  AS APP_AGREE_DT
+		     , MK_AGREE_YN
+		     , DATE_FORMAT(MK_AGREE_DT, '%Y%m%d%H%i%S')   AS MK_AGREE_DT
 		FROM   TB_CUSTOMER A
 		WHERE  1 = 1
 		<choose>

src/main/webapp/WEB-INF/views/mob/SigninFormMob.html

@@ -171,6 +171,9 @@
 	var fnReloadAfterLogin = function(result) {
 		if (result.status === 'OK') {
 			if (_isApp === 'true') {
+				if (gagajf.isNull(result.appAgreeDt)) {
+					fnAppPushAgreeUpdate('Y');
+				}
 				document.location.href = "idsend://?id=" + result.custNo + "^link=" + result.returnUrl;
 			} else {
 				document.location.href = result.returnUrl;
@@ -331,6 +334,14 @@
 		}
 	};
 
+	// 앱푸시동의 데이터 처리
+	var fnAppPushAgreeUpdate = function (appAgreeYn) {
+		let params = {}
+		params.appAgreeYn = appAgreeYn;
+		let jsonData = JSON.stringify(params);
+		gagajf.ajaxJsonSubmit('/app/appagree/update', jsonData);
+	}
+
 	$(document).ready(function() {
 
 		$('#loginForm input[name=loginId]').val(gagajf.getCookie(ckLoginId));

src/main/webapp/WEB-INF/views/mob/SnsCallBackFormMob.html

@@ -100,6 +100,9 @@
 	var fnReloadAfterLogin = function(result) {
 		if (result.status === 'OK') {
 			if (_isApp === 'true') {
+				if (gagajf.isNull(result.appAgreeDt)) {
+					fnAppPushAgreeUpdate('Y');
+				}
 				document.location.href = "idsend://?id=" + result.custNo + "^link=" + result.returnUrl;
 			} else {
 				document.location.href = result.returnUrl;
@@ -140,6 +143,14 @@
 
 		return; // 정상적으로 로그인 되지 않았으므로 return
 	}
+		// 앱푸시동의 데이터 처리
+	var fnAppPushAgreeUpdate = function (appAgreeYn) {
+		let params = {}
+		params.appAgreeYn = appAgreeYn;
+		let jsonData = JSON.stringify(params);
+		gagajf.ajaxJsonSubmit('/app/appagree/update', jsonData);
+	}
+
 	$(document).ready(function() {
 		if (gagajf.isNull(resultMap.snsId) && gagajf.isNull(resultMap.snsType)){
 			mcxDialog.alertC("인증에 실패하였습니다.<br> 로그인 정보를 확인해주시기 바랍니다.", {