czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

This commit is contained in:
GYJ 2025-01-05 09:49:36 +08:00
parent b00fce8e75 1bf1897f00
commit 65b20b344d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/sqx/modules/app/controller/app/AppController.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.sqx.common.annotation.Debounce;
import com.sqx.common.exception.SqxException;
@ -77,7 +78,7 @@ public class AppController {
return Result.error("新密码不能与旧密码相同！");
}
user.setPassword(DigestUtils.sha256Hex(pwd));
userService.updateById(user);
userService.update(user, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, user.getUserId()));
return Result.success();
}
@ -127,7 +128,7 @@ public class AppController {
if (errMsg == null) {
userEntity.setZhiFuBao(zhiFuBao);
userEntity.setZhiFuBaoName(certName);
userService.updateById(userEntity);
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
}
}
@ -163,7 +164,7 @@ public class AppController {
userInfo.setCertName(certName);
userInfo.setCertNo(certNum);
userInfo.setUpdateTime(DateUtil.date());
userInfoService.updateById(userInfo);
userInfoService.update(userInfo, new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, userId));
}
if (errMsg != null) {
@ -183,7 +184,7 @@ public class AppController {
@ResponseBody
public Result updateUsers(@RequestAttribute("userId") Long userId, @RequestBody UserEntity userEntity) {
userEntity.setUserId(userId);
userService.updateById(userEntity);
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
return Result.success();
}
@ -209,7 +210,7 @@ public class AppController {
@ResponseBody
public Result updateUserImageUrl(@LoginUser UserEntity user, String avatar) {
user.setAvatar(avatar);
userService.updateById(user);
userService.update(user, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, user.getUserId()));
return Result.success();
}
@ -219,7 +220,7 @@ public class AppController {
@ResponseBody
public Result updateUserName(@LoginUser UserEntity user, String userName) {
user.setUserName(userName);
userService.updateById(user);
userService.update(user, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, user.getUserId()));
return Result.success();
}
@ -257,7 +258,7 @@ public class AppController {
userEntity.setSysPhone(sysPhone);
userEntity.setUserId(userId);
userEntity.setClientid(clientId);
userService.updateById(userEntity);
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
return Result.success();
}

9
src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
View File

@ -128,10 +128,12 @@ public class TempOrdersTask {
logger.info("订单未支付，修改状态: {}", details.getTradeNo());
if (orders != null) {
orders.setStatus(3);
ordersDao.updateById(orders);
ordersDao.update(orders, new LambdaQueryWrapper<Orders>()
.eq(Orders::getOrdersId, orders.getOrdersId()).eq(Orders::getUserId, orders.getUserId()));
}
details.setState(2);
payDetailsDao.updateById(details);
payDetailsDao.update(details, new LambdaQueryWrapper<PayDetails>()
.eq(PayDetails::getId, details.getId()).eq(PayDetails::getUserId, details.getUserId()));
}
} catch (Exception e) {
e.printStackTrace();
@ -154,7 +156,8 @@ public class TempOrdersTask {
order.setStatus(1);
order.setPayTime(DateUtils.format(new Date()));
ordersService.updateById(order);
ordersService.update(order, new LambdaQueryWrapper<Orders>()
.eq(Orders::getOrdersId, order.getOrdersId()).eq(Orders::getUserId, order.getUserId()));
ordersService.insertOrders(order);
UserEntity user = userService.selectUserById(order.getUserId());