allCategoryList = serviceCateService.selectServiceCateList(serviceCateQuery);
// 2. 分离一级分类和二级分类
@@ -1088,7 +1091,6 @@ public class AppletController extends BaseController {
/**
* 根据分类ID查询商品列表
*
- * @param cateId 分类ID
* @param request HTTP请求对象
* @return 该分类下的商品列表
*
@@ -1099,29 +1101,58 @@ public class AppletController extends BaseController {
* - 自动添加图片CDN前缀
* - 无需用户登录验证
*/
- @GetMapping(value = "/api/goods/cate/{cateId}")
- public AjaxResult getGoodsByCategory(@PathVariable("cateId") Long cateId, HttpServletRequest request) {
+ @PostMapping(value = "/api/goods/cate")
+ public AjaxResult getGoodsByCategory(@RequestBody Map params, HttpServletRequest request) {
try {
- // 参数验证
- if (cateId == null || cateId <= 0) {
- return AppletControllerUtil.appletWarning("分类ID无效");
- }
+ // 1. 获取分页参数
+ int page = params.get("page") != null ? (Integer) params.get("page") : 1;
+ int limit = params.get("limit") != null ? (Integer) params.get("limit") : 15;
+ String cateId = params.get("cateId").toString();
+// // 1. 参数验证
+// if (cateId == null) {
+// return AppletControllerUtil.appletWarning("分类ID不能为空");
+// }
- // 验证分类是否存在
- ServiceCate category = serviceCateService.selectServiceCateById(cateId);
- if (category == null) {
- return AppletControllerUtil.appletWarning("分类不存在");
- }
+ // 验证分页参数
+// if (page < 1) page = 1;
+// if (limit < 1) limit = 15;
+// if (limit > 100) limit = 100; // 限制最大每页数量
- // 构建查询条件
+ // 2. 设置分页参数
+ PageHelper.startPage(page, limit);
+
+ // 3. 构建查询条件
ServiceGoods queryGoods = new ServiceGoods();
- queryGoods.setCateId(cateId); // 根据分类ID查询
queryGoods.setStatus("1"); // 只查询启用状态的商品
- // 查询该分类下的商品列表
+ // 判断是否查询全部商品
+ boolean queryAll = "00".equals(cateId.trim()) || cateId.trim().isEmpty();
+
+ if (!queryAll) {
+ // 验证分类ID格式
+ Long categoryId;
+ try {
+ categoryId = Long.parseLong(cateId);
+ if (categoryId <= 0) {
+ return AppletControllerUtil.appletWarning("分类ID无效");
+ }
+ } catch (NumberFormatException e) {
+ return AppletControllerUtil.appletWarning("分类ID格式错误");
+ }
+
+ // 验证分类是否存在
+ ServiceCate category = serviceCateService.selectServiceCateById(categoryId);
+ if (category == null) {
+ return AppletControllerUtil.appletWarning("分类不存在");
+ }
+
+ queryGoods.setCateId(categoryId); // 根据分类ID查询
+ }
+
+ // 4. 查询商品列表
List goodsList = serviceGoodsService.selectServiceGoodsList(queryGoods);
- // 构建返回数据
+ // 5. 构建返回数据
List> resultList = new ArrayList<>();
for (ServiceGoods goods : goodsList) {
Map goodsData = new HashMap<>();
@@ -1130,10 +1161,34 @@ public class AppletController extends BaseController {
goodsData.put("icon", AppletControllerUtil.buildImageUrl(goods.getIcon()));
goodsData.put("price", goods.getPrice() != null ? goods.getPrice().toString() : "0.00");
goodsData.put("sales", goods.getSales() != null ? goods.getSales() : 0L);
+ goodsData.put("cate_id", goods.getCateId());
resultList.add(goodsData);
}
- return AppletControllerUtil.appletSuccess(resultList);
+ // 6. 构建分页信息
+ PageInfo pageInfo = new PageInfo<>(goodsList);
+
+ // 7. 构建返回数据格式
+ Map responseData = new HashMap<>();
+ responseData.put("current_page", pageInfo.getPageNum());
+ responseData.put("data", resultList);
+ responseData.put("from", pageInfo.getStartRow());
+ responseData.put("last_page", pageInfo.getPages());
+ responseData.put("per_page", pageInfo.getPageSize());
+ responseData.put("to", pageInfo.getEndRow());
+ responseData.put("total", pageInfo.getTotal());
+
+ // 构建分页链接信息
+ String baseUrl = "https://www.huafurenjia.cn/api/goods/cate/" + cateId;
+ responseData.put("first_page_url", baseUrl + "?page=1");
+ responseData.put("last_page_url", baseUrl + "?page=" + pageInfo.getPages());
+ responseData.put("next_page_url", pageInfo.isHasNextPage() ?
+ baseUrl + "?page=" + pageInfo.getNextPage() : null);
+ responseData.put("prev_page_url", pageInfo.isHasPreviousPage() ?
+ baseUrl + "?page=" + pageInfo.getPrePage() : null);
+ responseData.put("path", baseUrl);
+
+ return AppletControllerUtil.appletSuccess(responseData);
} catch (Exception e) {
return AppletControllerUtil.appletError("查询分类商品失败：" + e.getMessage());
}
@@ -1256,6 +1311,105 @@ public class AppletController extends BaseController {
// 使用AppletLoginUtil执行完整的微信登录流程
return AppletLoginUtil.executeWechatLogin(params, usersService);
}
+
+
+
+// /**
+// * 获取用户基本信息接口
+// *
+// * @param request HTTP请求对象
+// * @return 用户基本信息
+// *
+// * 接口说明：
+// * - 通过token获取当前登录用户的基本信息
+// * - 返回完整的用户数据
+// * - 需要用户登录验证
+// *
+// */
+// @GetMapping(value = "/api/user/info")
+// public AjaxResult getUserInfo(HttpServletRequest request) {
+// try {
+// Map order_num = new HashMap<>();
+// Map goods_order_num = new HashMap<>();
+// // 1. 验证用户登录状态
+// String token = request.getHeader("token");
+// Map userValidation = AppletLoginUtil.validateUserToken(token, usersService);
+// if (!(Boolean) userValidation.get("valid")) {
+// return AppletControllerUtil.appletUnauthorized();
+// }
+//
+// // 2. 获取用户信息
+// Users user = (Users) userValidation.get("user");
+// if (user == null) {
+// return AppletControllerUtil.appletWarning("用户信息获取失败");
+// }
+//
+// // 3. 构建精简用户信息响应数据
+// Map userInfo = new HashMap<>();
+// userInfo.put("nickname", user.getNickname());
+// userInfo.put("phone", user.getPhone());
+// userInfo.put("ismember", user.getIsmember());
+// userInfo.put("member_begin", user.getMemberBegin());
+// userInfo.put("member_end", user.getMemberEnd());
+// userInfo.put("balance", user.getBalance());
+// userInfo.put("integral", user.getIntegral());
+// userInfo.put("shop_money", user.getConsumption());
+// userInfo.put("service_money", user.getServicefee());
+// userInfo.put("birthday", user.getBirthday());
+// userInfo.put("remember_token", userInfo.get("rememberToken"));
+//
+// // 头像处理
+// String avatar = user.getAvatar();
+// if (avatar != null && !avatar.isEmpty()) {
+// userInfo.put("avatar", AppletControllerUtil.buildImageUrl(avatar));
+// } else {
+// userInfo.put("avatar", "https://img.huafurenjia.cn/default/user_avatar.jpeg");
+// }
+// order_num.put("pending_accept", orderService.selectCountOrderByUid(user.getId(), 2L));
+// order_num.put("pending_service", orderService.selectCountOrderByUid(user.getId(), 3L));
+// order_num.put("in_service", orderService.selectCountOrderByUid(user.getId(), 4L));
+// order_num.put("other_status", orderService.selectAllCountOrderByUid(user.getId()));
+// userInfo.put("order_num", order_num);
+//
+//
+// goods_order_num.put("pending_accept", goodsOrderService.selectCountGoodsOrderByUid(user.getId(), 2L));
+// goods_order_num.put("pending_service", goodsOrderService.selectCountGoodsOrderByUid(user.getId(), 3L));
+// goods_order_num.put("in_service", goodsOrderService.selectCountGoodsOrderByUid(user.getId(), 5L));
+// goods_order_num.put("other_status", goodsOrderService.selectAllCountGoodsOrderByUid(user.getId()));
+// userInfo.put("goods_order_num", goods_order_num);
+// // 新增tx_time字段
+// List