|
@@ -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";
|
|
}
|
|
}
|
|
}
|
|
}
|