jsshin 5 лет назад
Родитель
Сommit
abd3f58919

+ 95 - 0
src/main/java/com/style24/front/biz/web/TsfAppController.java

@@ -0,0 +1,95 @@
+package com.style24.front.biz.web;
+
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.style24.core.biz.service.TscEnvsetService;
+import com.style24.core.support.env.TscConstants;
+import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.front.biz.service.TsfCustomerService;
+import com.style24.front.support.controller.TsfBaseController;
+import com.style24.front.support.security.session.TsfSession;
+import com.style24.persistence.domain.Customer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * 앱 관련 Controller
+ *
+ * @author jsshin
+ * @since 2021. 05. 21
+ */
+@Controller
+@RequestMapping("/app")
+@Slf4j
+public class TsfAppController extends TsfBaseController {
+
+	@Autowired
+	private TscMessageByLocale message;
+
+	@Autowired
+	private TsfCustomerService customerService;
+
+	@Autowired
+	private TscEnvsetService envsetService;
+
+
+	/**
+	 * 앱 설정 화면
+	 *
+	 * @author jsshin
+	 * @since 2020. 5. 11
+	 */
+	@GetMapping("/setting/form")
+	public ModelAndView getSettingForm() {
+		ModelAndView mav = new ModelAndView();
+
+		// 정책에 등록된 앱버전
+		if (TsfSession.getAttribute("osType").equals("I")) {
+			mav.addObject("regAppVersion",envsetService.getIosAppVersion(TscConstants.Site.STYLE24.value()));
+		} else if (TsfSession.getAttribute("osType").equals("A")) {
+			mav.addObject("regAppVersion",envsetService.getAosAppVersion(TscConstants.Site.STYLE24.value()));
+		}
+
+		// 앱푸시수신동의 가져오기
+		mav.addObject("appAgreeYn", customerService.getAppAgreeYn());
+		mav.addObject("appMkAgreeYn", customerService.getAppMkAgreeYn());
+		mav.addObject("isLogin", TsfSession.isLogin());
+		mav.setViewName("mob/app/SettingFormMob");
+		return mav;
+	}
+
+	/**
+	 * 앱푸시 수신동의
+	 *
+	 * @param  customer - 수신동의 여부
+	 * @author jsshin
+	 * @since 2021. 05. 20
+	 */
+	@PostMapping("/appagree/update")
+	@ResponseBody
+	public GagaResponse updateAppAgreeYn(@RequestBody Customer customer) {
+		customerService.updateAppAgreeYn(customer.getAppAgreeYn());
+		return super.ok(message.getMessage("SUCC_0004"));
+	}
+
+	/**
+	 * 앱마케팅 수신동의
+	 *
+	 * @param  customer - 수신동의 여부
+	 * @author jsshin
+	 * @since 2021. 05. 20
+	 */
+	@PostMapping("/mkagree/update")
+	@ResponseBody
+	public GagaResponse updateMkAgreeYn(@RequestBody Customer customer) {
+		customerService.updateMkAgreeYn(customer.getMkAgreeYn());
+		return super.ok(message.getMessage("SUCC_0004"));
+	}
+
+}

+ 0 - 53
src/main/java/com/style24/front/biz/web/TsfCustomerController.java

@@ -2,7 +2,6 @@ package com.style24.front.biz.web;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.websocket.server.PathParam;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -984,56 +983,4 @@ public class TsfCustomerController extends TsfBaseController {
 		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
-	/**
-	 * 모바일 설정 화면
-	 *
-	 * @author jsshin
-	 * @since 2020. 5. 11
-	 */
-	@GetMapping("/setting/form")
-	public ModelAndView getSettingForm() {
-		ModelAndView mav = new ModelAndView();
-
-		// 정책에 등록된 앱버전
-		if (TsfSession.getAttribute("osType").equals("I")) {
-			mav.addObject("regAppVersion","1.0");
-		} else if (TsfSession.getAttribute("osType").equals("A")) {
-			mav.addObject("regAppVersion","1.0");
-		}
-
-		// 앱푸시수신동의 가져오기
-		mav.addObject("appAgreeYn", customerService.getAppAgreeYn());
-		mav.addObject("appMkAgreeYn", customerService.getAppMkAgreeYn());
-		mav.addObject("isLogin", TsfSession.isLogin());
-		mav.setViewName("mob/customer/SettingFormMob");
-		return mav;
-	}
-
-	/**
-	 * 앱푸시 수신동의
-	 *
-	 * @param  customer - 수신동의 여부
-	 * @author jsshin
-	 * @since 2021. 05. 20
-	 */
-	@PostMapping("/appagree/update")
-	@ResponseBody
-	public GagaResponse updateAppAgreeYn(@RequestBody Customer customer) {
-		customerService.updateAppAgreeYn(customer.getAppAgreeYn());
-		return super.ok(message.getMessage("SUCC_0004"));
-	}
-
-	/**
-	 * 앱마케팅 수신동의
-	 *
-	 * @param  customer - 수신동의 여부
-	 * @author jsshin
-	 * @since 2021. 05. 20
-	 */
-	@PostMapping("/mkagree/update")
-	@ResponseBody
-	public GagaResponse updateMkAgreeYn(@RequestBody Customer customer) {
-		customerService.updateMkAgreeYn(customer.getMkAgreeYn());
-		return super.ok(message.getMessage("SUCC_0004"));
-	}
 }

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/customer/SettingFormMob.html → src/main/webapp/WEB-INF/views/mob/app/SettingFormMob.html

@@ -158,7 +158,7 @@
 				let params = {}
 				params.appAgreeYn = appAgreeYn;
 				let jsonData = JSON.stringify(params);
-				gagajf.ajaxJsonSubmit('/customer/appagree/update', jsonData);
+				gagajf.ajaxJsonSubmit('/app/appagree/update', jsonData);
 			}
 
 		}
@@ -187,7 +187,7 @@
 				let params = {}
 				params.mkAgreeYn = mkAgreeYn;
 				let jsonData = JSON.stringify(params);
-				gagajf.ajaxJsonSubmit('/customer/mkagree/update', jsonData);
+				gagajf.ajaxJsonSubmit('/app/mkagree/update', jsonData);
 			}
 
 		}

+ 3 - 1
src/main/webapp/ux/style24_link.js

@@ -36,7 +36,9 @@ const _PAGE_USE_TERMS_LAYER = _frontUrl + "/customer/use/terms/layer";								//
 const _PAGE_PRIVACY_POLICY_LAYER = _frontUrl + "/customer/privacy/policy/layer";					// 회원가입 > 개인정보취급방침
 const _PAGE_PRIVACY_TRUST_LAYER = _frontUrl + "/customer/privacy/trust/layer";						// 회원가입 > 개인정보취급위탁
 const _PAGE_NON_CUSTOMER_ORDER_CONFIRM = _frontUrl + "/customer/noncust/order/confirm/form";		// 고객 > 비회원주문확인
-const _PAGE_CUSTOMER_SETTING = _frontUrl + "/customer/setting/form";								// 앱 > 설정
+
+//== 앱 ==/
+const _PAGE_CUSTOMER_SETTING = _frontUrl + "/app/setting/form";										// 앱 > 설정
 
 //== 상품상세 ==/
 const _PAGE_GOODS_DETAIL = _frontUrl + "/goods/detail/form?goodsCd=";								// 상품 상세