admin1/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin1:f4af1dd85597ab9fe3226b2ab4f7d6b63174618c
Branches Tags
admin1:master
admin1:practice-yyt
admin1:dev
admin1:青橙1.0.0
..
compare: admin1:c76002d293091b9f05dec5c3985b4442daaf532d
Branches Tags
admin1:practice-yyt
admin1:dev
admin1:master
admin1:青橙1.0.0

No commits in common. "f4af1dd85597ab9fe3226b2ab4f7d6b63174618c" and "c76002d293091b9f05dec5c3985b4442daaf532d" have entirely different histories.
f4af1dd855 ... c76002d293

2 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/greenorange/promotion/controller/project/ProjectController.java
View File

@ -106,7 +106,7 @@ public class ProjectController {
} }
projectPriceMap.put(projectId, projectPrice); projectPriceMap.put(projectId, projectPrice);
} }
List<Project> projectList = commonService.findByFieldEqTargetField(Project::getIsShelves, 1, projectService); List<Project> projectList = projectService.list();
for (Project project : projectList) { for (Project project : projectList) {
BigDecimal projectPrice = projectPriceMap.get(project.getId()); BigDecimal projectPrice = projectPriceMap.get(project.getId());
project.setProjectPrice(projectPrice); project.setProjectPrice(projectPrice);

5
src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
View File

@ -203,12 +203,9 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
ThrowUtils.throwIf(RegexUtils.isPhoneInvalid(phoneNumber), ErrorCode.PARAMS_ERROR, "手机号格式无效"); ThrowUtils.throwIf(RegexUtils.isPhoneInvalid(phoneNumber), ErrorCode.PARAMS_ERROR, "手机号格式无效");
String userPassword = userInfoMiniPasswordLoginRequest.getUserPassword(); String userPassword = userInfoMiniPasswordLoginRequest.getUserPassword();
LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(UserInfo::getPhoneNumber, phoneNumber); lambdaQueryWrapper.eq(UserInfo::getPhoneNumber, phoneNumber).eq(UserInfo::getUserPassword, userPassword);
UserInfo userInfo = this.getOne(lambdaQueryWrapper); UserInfo userInfo = this.getOne(lambdaQueryWrapper);
ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "手机号未注册"); ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "手机号未注册");
lambdaQueryWrapper.eq(UserInfo::getUserPassword, userPassword);
userInfo = this.getOne(lambdaQueryWrapper);
ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "密码不正确");
Map<String, String> payload = new HashMap<>(); Map<String, String> payload = new HashMap<>();
payload.put("userAccount", phoneNumber); payload.put("userAccount", phoneNumber);