|
@@ -58,9 +58,6 @@ public class HomeHandler {
|
|
|
private MemberService memberService;
|
|
|
|
|
|
@Autowired
|
|
|
- private SystemService systemService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
private CartService cartService;
|
|
|
|
|
|
/**
|
|
@@ -92,7 +89,7 @@ public class HomeHandler {
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequestMapping(value = "/indexData", method = RequestMethod.POST)
|
|
|
- public ResultMsg indexData(HttpServletRequest request) throws Exception {
|
|
|
+ public ResultMsg indexData(HttpServletRequest request) {
|
|
|
Member m = memberService.getMemberByUserOpenId(WechatUtils.getUserBySession(request).getUserOpenid());
|
|
|
// Banner、广告位集合
|
|
|
List<ActionBannerImage> images = homeService.selectNowBannerByType();
|
|
@@ -118,12 +115,7 @@ public class HomeHandler {
|
|
|
returnMap.put("banners", banners);
|
|
|
returnMap.put("memberOpenid", m.getUserOpenid());
|
|
|
// 组装前端需要的数据
|
|
|
- ResultMsg msg = new ResultMsg();
|
|
|
- msg.setData(returnMap);
|
|
|
- msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
|
|
|
- msg.setResultCode(ResultInfo.SUCCESSCODE);
|
|
|
- msg.setStatus(true);
|
|
|
- return msg;
|
|
|
+ return ResultMsg.SUCCESS().setData(returnMap);
|
|
|
}
|
|
|
/**
|
|
|
* 刷新用户信息
|
|
@@ -153,11 +145,7 @@ public class HomeHandler {
|
|
|
}catch (Exception e){
|
|
|
logger.error("获取个人信息失败:{}", e);
|
|
|
}
|
|
|
- ResultMsg msg = new ResultMsg();
|
|
|
- msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
|
|
|
- msg.setResultCode(ResultInfo.SUCCESSCODE);
|
|
|
- msg.setStatus(true);
|
|
|
- return msg;
|
|
|
+ return ResultMsg.SUCCESS();
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -177,6 +165,7 @@ public class HomeHandler {
|
|
|
|
|
|
List<Product> productList = productInfoService.selectIndexPageProduct();
|
|
|
|
|
|
+ /*
|
|
|
// 判断是否为金牌会员下线,如果是,则以优惠价显示,如果不是则按原价显示
|
|
|
// 查询金牌会员模板id
|
|
|
int templateId = systemService.selectOneShopRuleById(114).getRuleNum().intValue();
|
|
@@ -198,7 +187,8 @@ public class HomeHandler {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
+
|
|
|
|
|
|
// 根据openid查询该用户是否购买过订单
|
|
|
ShopSalesOrderDto shopSalesOrderDto = new ShopSalesOrderDto();
|
|
@@ -225,11 +215,7 @@ public class HomeHandler {
|
|
|
}
|
|
|
|
|
|
returnMap.put("products", productList);
|
|
|
- msg.setData(returnMap);
|
|
|
- msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
|
|
|
- msg.setResultCode(ResultInfo.SUCCESSCODE);
|
|
|
- msg.setStatus(true);
|
|
|
- return msg;
|
|
|
+ return ResultMsg.SUCCESS().setData(returnMap);
|
|
|
}
|
|
|
|
|
|
}
|