diff --git a/src/main/java/com/mixi/common/enums/RolePermissionResourceEnum.java b/src/main/java/com/mixi/common/enums/RolePermissionResourceEnum.java index c39e5de..ef576cf 100644 --- a/src/main/java/com/mixi/common/enums/RolePermissionResourceEnum.java +++ b/src/main/java/com/mixi/common/enums/RolePermissionResourceEnum.java @@ -69,7 +69,7 @@ public enum RolePermissionResourceEnum { /** * Mi-Tu 报表 */ - REPORT_EXPORTING("Report Exporting","REPORT-EXPORTING",null,null,null,11), + REPORT_EXPORTING("Report Exporting","REPORT_EXPORTING",null,null,null,11), ; /** diff --git a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java index a52c438..55d7e67 100644 --- a/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java +++ b/src/main/java/com/mixi/common/tasks/MiTuExportScheduledTask.java @@ -58,7 +58,7 @@ public class MiTuExportScheduledTask { // weeklySellThrReport(); // WeeklyHeavyStockReport(); // QuarterlyProductGroupingReport(); - customerTypeAnalysis(); +// customerTypeAnalysis(); // getBestSell(); } diff --git a/src/main/java/com/mixi/model/dto/AppAccountLoginDTO.java b/src/main/java/com/mixi/model/dto/AppAccountLoginDTO.java index 8072651..12832e1 100644 --- a/src/main/java/com/mixi/model/dto/AppAccountLoginDTO.java +++ b/src/main/java/com/mixi/model/dto/AppAccountLoginDTO.java @@ -10,9 +10,9 @@ import javax.validation.constraints.NotBlank; @ApiModel("app登入") public class AppAccountLoginDTO { - @NotBlank(message = "User Phone cannot be empty!") - @ApiModelProperty("用户手机号") - private String userPhone; + @NotBlank(message = "User Account cannot be empty!") + @ApiModelProperty("用户账号") + private String userAccount; @NotBlank(message = "password cannot be empty!") @ApiModelProperty("密码") diff --git a/src/main/java/com/mixi/service/AccountService.java b/src/main/java/com/mixi/service/AccountService.java index b28409d..3a82213 100644 --- a/src/main/java/com/mixi/service/AccountService.java +++ b/src/main/java/com/mixi/service/AccountService.java @@ -224,7 +224,7 @@ public class AccountService extends ServiceImpl{ } @Transactional public AppAccountLoginVO appLogin(AppAccountLoginDTO accountLoginDTO) { - TAccount tAccount = getOneByPhone(accountLoginDTO.getUserPhone()); + TAccount tAccount = getOneByAccount(accountLoginDTO.getUserAccount()); Assert.notNull(tAccount,"User not registered!"); Assert.isTrue(accountLoginDTO.getPassword().equals(tAccount.getUserPassword()), "Password error!"); @@ -298,6 +298,12 @@ public class AccountService extends ServiceImpl{ queryWrapper.eq(TAccount.APP_USER, 1); return accountMapper.selectOne(queryWrapper); } + private TAccount getOneByAccount(String account) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(TAccount::getUserAccount, account); + queryWrapper.lambda().eq(TAccount::getAppUser, 1); + return accountMapper.selectOne(queryWrapper); + } public Boolean existByRoleId(Long roleId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(TAccount.ROLE_ID,roleId);