categoryList = serviceCateService.selectServiceCateList(serviceCateQuery);
@@ -244,8 +240,6 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletError("获取配置信息失败:" + e.getMessage());
}
}
-
-
/**
* 查询用户收货地址列表
*
@@ -258,22 +252,6 @@ public class AppletController extends BaseController {
* - limit: 每页显示数量,默认15
* - page: 页码,默认1
*
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "OK",
- * "data": {
- * "current_page": 1,
- * "data": [...],
- * "from": 1,
- * "last_page": 1,
- * "next_page_url": null,
- * "per_page": "15",
- * "prev_page_url": null,
- * "to": 1,
- * "total": 1
- * }
- * }
*/
@GetMapping("/api/user/address/list")
public AjaxResult getaddresslist(
@@ -321,7 +299,6 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletError("查询地址列表失败:" + e.getMessage());
}
}
-
/**
* 根据地址ID查询用户收货地址详情
*
@@ -334,25 +311,6 @@ public class AppletController extends BaseController {
* - 验证用户登录状态和地址归属权
* - 返回AddressApple格式的地址数据,用于前端修改页面
*
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": {
- * "id": 160,
- * "uid": 302,
- * "name": "赵先生",
- * "phone": "18709185987",
- * "latitude": "34.15643",
- * "longitude": "108.86683",
- * "address_name": "陕西省西安市长安区榆林北段与建设大道交叉口处北侧",
- * "address_info": "陕西省西安市长安区榆林北段与建设大道交叉口处",
- * "info": "14号楼2302",
- * "is_default": 0,
- * "created_at": null,
- * "updated_at": null
- * }
- * }
*/
@GetMapping("/api/user/address/info/{id}")
public AjaxResult getAddressInfo(@PathVariable("id") Long id, HttpServletRequest request) {
@@ -403,32 +361,11 @@ public class AppletController extends BaseController {
* @param params 地址修改参数
* @param request HTTP请求对象
* @return 修改结果
- *
- * 请求参数格式:
- * {
- * "id": 160,
- * "name": "赵先生",
- * "phone": "18709185987",
- * "address_name": "陕西省西安市长安区榆林北段与建设大道交叉口处北侧",
- * "address_info": "海菱路8号",
- * "info": "14号楼2302",
- * "is_default": 1,
- * "latitude": "34.15643",
- * "longitude": "108.86683"
- * }
- *
* 接口说明:
* - 验证用户登录状态和地址归属权
* - 支持修改地址的所有字段
* - 自动处理默认地址逻辑(设为默认时会取消其他默认地址)
* - 返回修改后的地址信息
- *
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": "地址修改成功"
- * }
*/
@PostMapping("/api/user/address/edit")
public AjaxResult editAddress(@RequestBody Map params, HttpServletRequest request) {
@@ -508,31 +445,11 @@ public class AppletController extends BaseController {
* @param params 地址新增参数
* @param request HTTP请求对象
* @return 新增结果
- *
- * 请求参数格式:
- * {
- * "name": "何飞飞",
- * "phone": "15002954325",
- * "address_name": "陕西省西安市未央区未央路3号(龙首原地铁站C出口步行180米)",
- * "address_info": "凤鑫城购物中心(未央路店)",
- * "info": "458",
- * "is_default": true,
- * "latitude": 34.294248,
- * "longitude": 108.948261
- * }
- *
* 接口说明:
* - 验证用户登录状态
* - 支持新增地址的所有字段
* - 自动处理默认地址逻辑(设为默认时会取消其他默认地址)
* - 返回新增后的地址信息
- *
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": "地址新增成功"
- * }
*/
@PostMapping("/api/user/address/add")
public AjaxResult addAddress(@RequestBody Map params, HttpServletRequest request) {
@@ -724,8 +641,6 @@ public class AppletController extends BaseController {
if (StringUtils.isNotNull(status) && !"".equals(status)) {
order.setStatus(Long.valueOf(status));
}
-
-
List orderList = orderService.selectOrderAppleList(order);
for (OrderApple orderdata : orderList) {
Map jsonObject = new HashMap<>();
@@ -763,47 +678,6 @@ public class AppletController extends BaseController {
* - 支持按订单状态筛选
* - 返回带分页信息的订单列表
* - 包含完整的商品信息和订单状态文本
- *
- * 请求参数格式:
- * {
- * "limit": 15,
- * "page": 1,
- * "status": "2"
- * }
- *
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "OK",
- * "data": {
- * "current_page": 1,
- * "data": [
- * {
- * "id": 1,
- * "order_id": "C307236827627129",
- * "order_no": "C307236827627129",
- * "status": 2,
- * "status_text": "待发货",
- * "total_price": "4.90",
- * "num": 1,
- * "pay_time": "2024-08-31 12:02:07",
- * "created_at": "2024-08-31 12:02:07",
- * "product": {
- * "id": 86,
- * "title": "长青泉·饮用天然泉水",
- * "sub_title": "长青泉 1.5L*1瓶 4.9元",
- * "icon": "https://img.huafurenjia.cn/images/...",
- * "price": "4.90",
- * "num": 1
- * }
- * }
- * ],
- * "total": 3,
- * "per_page": 15,
- * "current_page": 1,
- * "last_page": 1
- * }
- * }
*/
@PostMapping("/api/goods/order/lst")
public AjaxResult getgoodsorderlst(@RequestBody Map params,
@@ -896,13 +770,10 @@ public class AppletController extends BaseController {
orderData.put("product", productInfo);
}
}
-
resultList.add(orderData);
}
-
// 8. 构建分页信息
PageInfo pageInfo = new PageInfo<>(orderList);
-
// 9. 构建返回数据格式(简化版本,更适合小程序)
Map responseData = new HashMap<>();
responseData.put("current_page", pageInfo.getPageNum());
@@ -929,7 +800,6 @@ public class AppletController extends BaseController {
if (status == null) {
return "未知状态";
}
-
switch (status.intValue()) {
case 1:
return "待付款";
@@ -1043,9 +913,6 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletWarning("查询服务商品列表失败:" + e.getMessage());
}
}
-
-
-
/**
* 获取服务商品详细信息
*
@@ -1087,13 +954,6 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletError("查询商品详情失败:" + e.getMessage());
}
}
-
-
-
-
-
-
-
/**
* 获取广告图片列表
*
@@ -1131,37 +991,12 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletWarning("获取广告图片失败:" + e.getMessage());
}
}
-
/**
* 微信用户登录接口
*
* @param params 请求参数
* @param request HTTP请求对象
* @return 登录结果
- *
- * 请求参数格式:
- * {
- * "usercode": "微信小程序登录code",
- * "code": "手机号授权code"
- * }
- *
- * 返回数据格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": {
- * "user": {
- * "id": 用户ID,
- * "phone": "手机号",
- * "name": "用户名",
- * "openid": "微信openid",
- * "remember_token": "用户token",
- * "avatar": "头像地址",
- * "isNewUser": true/false
- * }
- * }
- * }
- *
* 登录流程:
* 1. 验证请求参数
* 2. 通过usercode获取微信openid
@@ -1174,20 +1009,6 @@ public class AppletController extends BaseController {
// 使用AppletLoginUtil执行完整的微信登录流程
return AppletLoginUtil.executeWechatLogin(params, usersService);
}
-
-
- /**
- * 获取用户详细信息接口
- *
- * @param request HTTP请求对象
- * @return 返回用户详细信息包含订单统计
- *
- * 功能说明:
- * - 通过token获取用户基本信息
- * - 返回用户的服务订单和商品订单统计数据
- * - 包含各种订单状态的数量统计
- * - 用于用户中心页面显示
- */
/**
* 获取用户基本信息接口
*
@@ -1199,28 +1020,6 @@ public class AppletController extends BaseController {
* - 返回完整的用户数据
* - 需要用户登录验证
*
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "OK",
- * "data": {
- * "id": 302,
- * "name": "微信用户",
- * "nickname": null,
- * "phone": "18709185987",
- * "avatar": "https://img.huafurenjia.cn/default/user_avatar.jpeg",
- * "commission": 0,
- * "created_at": "2024-08-31 12:02:07",
- * "integral": 0,
- * "openid": "oHIYB7DYezs7Myzn-yaF0amC3Bpc",
- * "remember_token": "G88BSThmFCprrT0uTZ9ghDzW7QHj19CrwSwdq3e",
- * "service_city_ids": ["2", "5", "7", "10", "11", "12", "13", "14", "15", "16", "17"],
- * "skill_ids": ["19", "21", "25", "28", "35"],
- * "status": 1,
- * "total_integral": 100,
- * "updated_at": "2025-06-11 10:35:44"
- * }
- * }
*/
@GetMapping(value = "/api/user/info")
public AjaxResult getUserInfo(HttpServletRequest request) {
@@ -1291,7 +1090,6 @@ public class AppletController extends BaseController {
}
-
/**
* 构建用户信息响应数据
*
@@ -1394,39 +1192,6 @@ public class AppletController extends BaseController {
* - 自动处理服务城市ID和技能ID数组
* - 需要用户登录验证
*
- * 请求参数格式:
- * {
- * "id": 302,
- * "name": "微信用户P44455",
- * "nickname": null,
- * "phone": "18709185987",
- * "avatar": "https://img.huafurenjia.cn/default/user_avatar.jpeg",
- * "commission": 0,
- * "integral": 0,
- * "is_stop": 1,
- * "job_number": null,
- * "level": null,
- * "login_status": 2,
- * "margin": 0,
- * "middle_auth": null,
- * "openid": "oHIYB7DYezs7Myzn-yaF0amC3Bpc",
- * "prohibit_time": null,
- * "propose": "0.00",
- * "service_city_ids": ["2", "5", "7", "10", "11", "12", "13", "14", "15", "16", "17"],
- * "skill_ids": ["19", "21", "25", "20", "35"],
- * "status": 1,
- * "total_comm": 0,
- * "total_integral": 100,
- * "type": "1",
- * "worker_time": null
- * }
- *
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "OK",
- * "data": []
- * }
*/
@PostMapping(value = "/api/user/edit/info")
public AjaxResult editUserInfo(@RequestBody Map params, HttpServletRequest request) {
@@ -1459,10 +1224,10 @@ public class AppletController extends BaseController {
}
// 5. 构建更新用户对象
- Users updateUser = buildUpdateUserFromParams(params, currentUser.getId());
+ Users updateUser = AppletControllerUtil.buildUpdateUserFromdataParams(params, currentUser.getId());
// 6. 验证必要字段
- String validationResult = validateUserEditParams(updateUser);
+ String validationResult = validateUserEditdataParams(updateUser);
if (validationResult != null) {
return AppletControllerUtil.appletWarning(validationResult);
}
@@ -1482,142 +1247,10 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletError("修改用户信息失败:" + e.getMessage());
}
}
-
- /**
- * 从请求参数构建更新用户对象
- *
- * @param params 请求参数
- * @param userId 用户ID
- * @return 用户更新对象
- */
- private Users buildUpdateUserFromParams(Map params, Long userId) {
- Users updateUser = new Users();
- updateUser.setId(userId);
-
- // 基本信息字段
- if (params.get("name") != null) {
- updateUser.setName(params.get("name").toString().trim());
- }
-
- if (params.get("nickname") != null && !params.get("nickname").toString().trim().isEmpty()) {
- updateUser.setNickname(params.get("nickname").toString().trim());
- }
-
- if (params.get("phone") != null) {
- updateUser.setPhone(params.get("phone").toString().trim());
- }
-
- // 头像处理 - 去掉CDN前缀保存相对路径
- if (params.get("avatar") != null) {
- String avatar = params.get("avatar").toString().trim();
- if (avatar.startsWith("https://img.huafurenjia.cn/")) {
- avatar = avatar.replace("https://img.huafurenjia.cn/", "");
- }
- updateUser.setAvatar(avatar);
- }
-
- // 数值字段 - 根据Users实体类的实际字段类型
- if (params.get("integral") != null) {
- updateUser.setIntegral(parseToLongForEdit(params.get("integral")));
- }
-
- if (params.get("is_stop") != null) {
- Integer isStop = parseToIntegerForEdit(params.get("is_stop"));
- updateUser.setIsStop(isStop);
- }
-
- if (params.get("login_status") != null) {
- Integer loginStatus = parseToIntegerForEdit(params.get("login_status"));
- updateUser.setLoginStatus(loginStatus);
- }
-
- if (params.get("status") != null) {
- Integer status = parseToIntegerForEdit(params.get("status"));
- updateUser.setStatus(status);
- }
-
- if (params.get("total_integral") != null) {
- updateUser.setTotalIntegral(parseToLongForEdit(params.get("total_integral")));
- }
-
- // 字符串和其他字段
- if (params.get("job_number") != null && !params.get("job_number").toString().trim().isEmpty()) {
- Integer jobNumber = parseToIntegerForEdit(params.get("job_number"));
- updateUser.setJobNumber(jobNumber);
- }
-
- if (params.get("level") != null && !params.get("level").toString().trim().isEmpty()) {
- Integer level = parseToIntegerForEdit(params.get("level"));
- updateUser.setLevel(level);
- }
-
- if (params.get("middle_auth") != null && !params.get("middle_auth").toString().trim().isEmpty()) {
- Integer middleAuth = parseToIntegerForEdit(params.get("middle_auth"));
- updateUser.setMiddleAuth(middleAuth);
- }
-
- if (params.get("propose") != null) {
- // propose字段是BigDecimal类型,需要转换
- String proposeStr = params.get("propose").toString().trim();
- try {
- BigDecimal propose = new BigDecimal(proposeStr);
- updateUser.setPropose(propose);
- } catch (NumberFormatException e) {
- // 忽略格式错误,保持原值
- }
- }
-
- if (params.get("type") != null) {
- // type字段是String类型
- updateUser.setType(params.get("type").toString().trim());
- }
-
- // 处理服务城市ID数组
- if (params.get("service_city_ids") != null) {
- List serviceCityIds = (List) params.get("service_city_ids");
- if (!serviceCityIds.isEmpty()) {
- updateUser.setServiceCityIds(String.join(",", serviceCityIds));
- }
- }
-
- // 处理技能ID数组
- if (params.get("skill_ids") != null) {
- List skillIds = (List) params.get("skill_ids");
- if (!skillIds.isEmpty()) {
- updateUser.setSkillIds(String.join(",", skillIds));
- }
- }
-
- // 设置更新时间
- updateUser.setUpdatedAt(new Date());
-
- return updateUser;
- }
-
- /**
- * 解析对象为Long类型(用于编辑接口)
- */
- private Long parseToLongForEdit(Object value) {
- if (value == null) return null;
-
- if (value instanceof Integer) {
- return ((Integer) value).longValue();
- } else if (value instanceof Long) {
- return (Long) value;
- } else if (value instanceof String) {
- try {
- return Long.parseLong((String) value);
- } catch (NumberFormatException e) {
- return null;
- }
- }
- return null;
- }
-
/**
* 解析对象为Integer类型(用于编辑接口)
*/
- private Integer parseToIntegerForEdit(Object value) {
+ private Integer parseToIntegerdataForEdit(Object value) {
if (value == null) return null;
if (value instanceof Integer) {
@@ -1633,26 +1266,23 @@ public class AppletController extends BaseController {
}
return null;
}
-
/**
* 验证用户编辑参数
*
* @param user 用户对象
* @return 验证结果,null表示验证通过
*/
- private String validateUserEditParams(Users user) {
+ private String validateUserEditdataParams(Users user) {
// 验证手机号格式(如果提供了的话)
if (user.getPhone() != null && !user.getPhone().isEmpty()) {
if (!user.getPhone().matches("^1[3-9]\\d{9}$")) {
return "手机号格式不正确";
}
}
-
// 验证用户名长度
if (user.getName() != null && user.getName().length() > 50) {
return "用户名长度不能超过50个字符";
}
-
// 验证昵称长度
if (user.getNickname() != null && user.getNickname().length() > 50) {
return "昵称长度不能超过50个字符";
@@ -1667,22 +1297,6 @@ public class AppletController extends BaseController {
* @param request HTTP请求对象
* @return 验证结果
*
- * 请求头格式:
- * Authorization: Bearer
- * 或
- * token:
- *
- * 返回数据格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": {
- * "valid": true,
- * "userInfo": {...},
- * "message": "token验证成功"
- * }
- * }
- *
* 接口说明:
* - 验证用户token的有效性
* - 返回用户基本信息
@@ -1718,42 +1332,12 @@ public class AppletController extends BaseController {
}
}
-
-
-
-
/**
* 微信支付统一下单接口
*
* @param params 支付参数
* @param request HTTP请求对象
* @return 支付结果
- *
- * 请求参数格式:
- * {
- * "orderNo": "订单号",
- * "openid": "用户openid",
- * "totalFee": 支付金额(分),
- * "body": "商品描述",
- * "notifyUrl": "回调地址"
- * }
- *
- * 返回数据格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": {
- * "success": true,
- * "payParams": {
- * "timeStamp": "时间戳",
- * "nonceStr": "随机字符串",
- * "package": "prepay_id=xxx",
- * "signType": "MD5",
- * "paySign": "签名"
- * },
- * "prepayId": "预支付交易会话ID"
- * }
- * }
*/
@PostMapping(value = "/api/pay/unifiedorder")
public AjaxResult createPayOrder(@RequestBody Map params, HttpServletRequest request) {
@@ -1820,17 +1404,6 @@ public class AppletController extends BaseController {
* @param params 代付参数
* @param request HTTP请求对象
* @return 代付结果
- *
- * 请求参数格式:
- * {
- * "orderNo": "原订单号",
- * "payerOpenid": "代付人openid",
- * "payeeOpenid": "被代付人openid",
- * "totalFee": 代付金额(分),
- * "body": "商品描述",
- * "notifyUrl": "回调地址",
- * "remark": "代付备注"
- * }
*/
@PostMapping(value = "/api/pay/payfor")
public AjaxResult createPayForOrder(@RequestBody Map params, HttpServletRequest request) {
@@ -1938,10 +1511,6 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletWarning("申请退款失败:" + e.getMessage());
}
}
-
-
-
-
/**
* 查询用户售后返修列表
*
@@ -2047,21 +1616,6 @@ public class AppletController extends BaseController {
* - 保存合作申请记录
* - 设置默认状态为待处理
*
- * 请求参数格式:
- * {
- * "company": "河南公司",
- * "name": "王令兵",
- * "phone": "15002954234",
- * "address": "来宾",
- * "info": "情感咨询"
- * }
- *
- * 返回格式:
- * {
- * "code": 200,
- * "msg": "操作成功",
- * "data": "合作申请提交成功,我们会尽快联系您"
- * }
*/
@PostMapping("/api/form/cooperate")
public AjaxResult submitCooperateApplication(@RequestBody Map params, HttpServletRequest request) {
@@ -2142,8 +1696,6 @@ public class AppletController extends BaseController {
return AppletControllerUtil.appletWarning("合作申请提交失败:" + e.getMessage());
}
}
-
-
/**
* 查询用户优惠券列表
*
@@ -2171,75 +1723,65 @@ public class AppletController extends BaseController {
Integer status = params.get("status") != null ? Integer.parseInt(params.get("status").toString()) : null;
String productId = params.get("product_id") != null ? params.get("product_id").toString() : null;
BigDecimal totalPrice = params.get("price") != null ? new BigDecimal(params.get("price").toString()) : null;
- // 过期的优惠券标记为已过期
+ // 过期的优惠券标记为已过期
CouponUser couponUser = new CouponUser();
couponUser.setStatus(1L);
couponUser.setUid(user.getId());
- List couponUserList = couponUserService.selectCouponUserNoList(couponUser);
- for (CouponUser c: couponUserList){
- c.setStatus(3L);
- couponUserService.updateCouponUser(c);
- }
- //安状态进行赋值
- //待领取优惠券
- if (status==4){
+ List couponUserList = couponUserService.selectCouponUserNoList(couponUser);
+ for (CouponUser c: couponUserList){
+ c.setStatus(3L);
+ couponUserService.updateCouponUser(c);
+ }
+ //安状态进行赋值
+ //待领取优惠券
+ if (status==4){
// Coupons coupons = new Coupons();
// coupons.setSearchValue("12");
List couponsList =CouponUtil.iscoupon(userId,couponsService,couponUserService);
if (!couponsList.isEmpty()){
- return AppletControllerUtil.appletSuccess(AppletControllerUtil.buildCouponDataList(couponsList,serviceCateService,serviceGoodsService));
+ return AppletControllerUtil.appletSuccess(AppletControllerUtil.buildCouponDataList(couponsList,serviceCateService,serviceGoodsService));
}
- }else{
- CouponUser couponUserData = new CouponUser();
- couponUserData.setStatus(Long.valueOf(status));
- couponUserData.setUid(user.getId());
-
-
- List couponUserDataList = couponUserService.selectCouponUserList(couponUserData);
- if (couponUserDataList!=null){
- return AppletControllerUtil.appletSuccess(AppletControllerUtil.buildCouponUserList(couponUserDataList,serviceCateService,serviceGoodsService,productId,totalPrice));
- }
-
-
- }
+ }else{
+ CouponUser couponUserData = new CouponUser();
+ couponUserData.setStatus(Long.valueOf(status));
+ couponUserData.setUid(user.getId());
+ List couponUserDataList = couponUserService.selectCouponUserList(couponUserData);
+ if (couponUserDataList!=null){
+ return AppletControllerUtil.appletSuccess(AppletControllerUtil.buildCouponUserList(couponUserDataList,serviceCateService,serviceGoodsService,productId,totalPrice));
+ }
+ }
// 按is_use排序
-
return AjaxResult.success();
}
-
-
-
/**
* 积分订单收货确认接口
* @param request
* @return AjaxResult
* 订单状态 1:待支付 2:已支付,待发货3:待收货 4:待评价 5:已收货 6:取消 20:申请退款 21:同意退款 22:驳回退款
*/
-
@GetMapping("/api/integral/user/order/confirm/{id}")
public AjaxResult confirmOrder(@PathVariable("id") String id,HttpServletRequest request) {
- // 1. 验证用户登录状态
- String token = request.getHeader("token");
- Map userValidation = AppletLoginUtil.validateUserToken(token, usersService);
- if (!(Boolean) userValidation.get("valid")) {
- return AppletControllerUtil.appletWarning("用户未登录或token无效");
- }
-
- // 2. 获取用户信息
- Users user = (Users) userValidation.get("user");
- if (user == null) {
- return AppletControllerUtil.appletWarning("用户信息获取失败");
- }
- IntegralOrder integralOrder = integralOrderService.selectIntegralOrderById(Long.valueOf(id));
- if (integralOrder==null){
- return AppletControllerUtil.appletWarning("订单不存在");
- }
- if(!user.getId().equals(integralOrder.getUid())){
- return AppletControllerUtil.appletWarning("确认收货失败,收货人和操作人应为同一人,请确认后再进行操作");
- }
- if (!integralOrder.getStatus().equals("2")){
- return AppletControllerUtil.appletWarning("订单状态错误");
- }
+ // 1. 验证用户登录状态
+ String token = request.getHeader("token");
+ Map userValidation = AppletLoginUtil.validateUserToken(token, usersService);
+ if (!(Boolean) userValidation.get("valid")) {
+ return AppletControllerUtil.appletWarning("用户未登录或token无效");
+ }
+ // 2. 获取用户信息
+ Users user = (Users) userValidation.get("user");
+ if (user == null) {
+ return AppletControllerUtil.appletWarning("用户信息获取失败");
+ }
+ IntegralOrder integralOrder = integralOrderService.selectIntegralOrderById(Long.valueOf(id));
+ if (integralOrder==null){
+ return AppletControllerUtil.appletWarning("订单不存在");
+ }
+ if(!user.getId().equals(integralOrder.getUid())){
+ return AppletControllerUtil.appletWarning("确认收货失败,收货人和操作人应为同一人,请确认后再进行操作");
+ }
+ if (!integralOrder.getStatus().equals("2")){
+ return AppletControllerUtil.appletWarning("订单状态错误");
+ }
integralOrder.setStatus("3");
integralOrderService.updateIntegralOrder(integralOrder);
IntegralOrderLog integralOrderLog = new IntegralOrderLog();
@@ -2258,9 +1800,6 @@ public class AppletController extends BaseController {
}
}
-
-
-
/**
* 商品订单评价接口
* @param param {order_id, content, num, images}
@@ -2311,2247 +1850,1735 @@ public class AppletController extends BaseController {
comment.setContent(content);
comment.setNum((long) num);
comment.setUid(goodsOrder.getUid()); // 或uid
- comment.setImages(imagesObj != null ? com.alibaba.fastjson2.JSON.toJSONString(imagesObj) : null);
+ comment.setImages(imagesObj != null ? JSON.toJSONString(imagesObj) : null);
comment.setNumType(numType);
comment.setCreatedAt(new java.util.Date());
comment.setUpdatedAt(new java.util.Date());
comment.setStatus(1); // 显示
int result = orderCommentService.insertOrderComment(comment);
if (result > 0) {
- goodsOrder.setStatus(5L); // 订单状态改为已收货
- goodsOrderService.updateGoodsOrder(goodsOrder);
+ goodsOrder.setStatus(5L); // 订单状态改为已收货
+ goodsOrderService.updateGoodsOrder(goodsOrder);
return AjaxResult.success();
} else {
return AjaxResult.error("操作失败");
}
}
-
-
-
-/**
- * 解析参数为Long类型
- */
-private Long parseParamToLong(Object param, String errorMsg) {
- if (param == null) return null;
-
- if (param instanceof Integer) {
- return ((Integer) param).longValue();
- } else if (param instanceof String && !((String) param).trim().isEmpty()) {
+ /**
+ * 查询用户积分日志列表
+ *
+ * @param params 请求参数,包含limit(每页数量)、page(页码)
+ * @param request HTTP请求对象
+ * @return 返回分页的积分日志列表
+ */
+ @PostMapping("/api/integral/user/log/lst")
+ public AjaxResult getUserIntegralLogList(@RequestBody Map params, HttpServletRequest request) {
try {
- return Long.parseLong((String) param);
- } catch (NumberFormatException e) {
- throw new RuntimeException(errorMsg);
+ // 1. 获取分页参数
+ int page = params.get("page") != null ? (Integer) params.get("page") : 1;
+ int limit = params.get("limit") != null ? (Integer) params.get("limit") : 15;
+ // 2. 验证分页参数
+ Map pageValidation = PageUtil.validatePageParams(page, limit);
+ if (!(Boolean) pageValidation.get("valid")) {
+ return AppletControllerUtil.appletWarning((String) pageValidation.get("message"));
+ }
+ // 3. 验证用户登录状态
+ String token = request.getHeader("token");
+ Map userValidation = AppletLoginUtil.validateUserToken(token, usersService);
+ if (!(Boolean) userValidation.get("valid")) {
+ return AppletControllerUtil.appletWarning("用户未登录或token无效");
+ }
+ // 4. 获取用户信息
+ Users user = (Users) userValidation.get("user");
+ if (user == null) {
+ return AppletControllerUtil.appletWarning("用户信息获取失败");
+ }
+ // 5. 设置分页参数
+ PageHelper.startPage(page, limit);
+ // 6. 构建查询条件并查询
+ IntegralLog integralLogQuery = new IntegralLog();
+ integralLogQuery.setUid(user.getId());
+ List integralLogList = integralLogService.selectIntegralLogList(integralLogQuery);
+
+ // 7. 构建分页信息
+ PageInfo pageInfo = new PageInfo<>(integralLogList);
+
+ // 8. 使用工具类处理数据格式化
+ List