yuhaitao14 7 years ago
parent
commit
afc00b038d

+ 20 - 0
shop/src/main/java/com/zskk/shop/controller/AbstractController.java

@@ -57,6 +57,26 @@ public class AbstractController {
 	public UserBean getUser() {
 	public UserBean getUser() {
 		return getUserInfo().getUser();
 		return getUserInfo().getUser();
 	}
 	}
+	
+	public UserInfoBean getH5User(){
+		String redirect = myhost + "h5/index";
+		String value = null;
+		try {
+			value = getCookieValue(USER_COOKIE_NAME);
+		} catch (Exception e) {
+			ZSKKError error = new ZSKKError(ErrorConstant.NO_LOGIN_ERROR.getCode(),
+					uccenter + "wx/enter/" + companyid + "?redirect=" + urlEncoding(redirect));
+			throw new ZSKKException(error);
+		}
+
+		if (value == null) {
+			ZSKKError error = new ZSKKError(ErrorConstant.NO_LOGIN_ERROR.getCode(),
+					uccenter + "wx/enter/" + companyid + "?redirect=" + urlEncoding(redirect));
+			throw new ZSKKException(error);
+		}
+		UserInfoBean user = JSON.parseObject(value, UserInfoBean.class);
+		return user;
+	}
 
 
 	/**
 	/**
 	 * 获取用户信息 为登录抛出异常
 	 * 获取用户信息 为登录抛出异常

+ 2 - 4
shop/src/main/java/com/zskk/shop/controller/h5/H5BuyOrderController.java

@@ -84,7 +84,7 @@ public class H5BuyOrderController extends AbstractController{
 	
 	
 	@RequestMapping("/mypayedorders")
 	@RequestMapping("/mypayedorders")
 	public String myorders(Model model){
 	public String myorders(Model model){
-		UserBean userBean			= this.getUser();
+		UserBean userBean			= this.getH5User().getUser();
 		String uid 					= userBean.getUserid();
 		String uid 					= userBean.getUserid();
 		List<BuyOrder> orders 		= buyOrderService.queryMyPayedOrders(uid);
 		List<BuyOrder> orders 		= buyOrderService.queryMyPayedOrders(uid);
 		List<BuyOrderBean> beans 	= new ArrayList<>(orders.size());
 		List<BuyOrderBean> beans 	= new ArrayList<>(orders.size());
@@ -93,13 +93,12 @@ public class H5BuyOrderController extends AbstractController{
 			beans.add(bean);
 			beans.add(bean);
 		}
 		}
 		model.addAttribute("orders", beans);
 		model.addAttribute("orders", beans);
-		this.initUser(model);
 		return "/h5/mypayedorders";
 		return "/h5/mypayedorders";
 	}
 	}
 	
 	
 	@RequestMapping("/completedorders")
 	@RequestMapping("/completedorders")
 	public String completedorders(Model model){
 	public String completedorders(Model model){
-		UserBean userBean 		= this.getUser();
+		UserBean userBean 		= this.getH5User().getUser();
 		List<Long> ids 	  		= familyPeopleService.queryCompletedBids(userBean.getUserid());
 		List<Long> ids 	  		= familyPeopleService.queryCompletedBids(userBean.getUserid());
 		List<BuyOrder> orders 	= null;
 		List<BuyOrder> orders 	= null;
 		if (ids.isEmpty()){
 		if (ids.isEmpty()){
@@ -113,7 +112,6 @@ public class H5BuyOrderController extends AbstractController{
 			beans.add(bean);
 			beans.add(bean);
 		}
 		}
 		model.addAttribute("orders", beans);
 		model.addAttribute("orders", beans);
-		this.initUser(model);
 		return "/h5/mypayedorders";
 		return "/h5/mypayedorders";
 	}
 	}
 }
 }