From 908ef182637a3327f9211bc49fdd4b68f768e13b Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期六, 28 十月 2023 15:56:56 +0800
Subject: [PATCH] # 登录提示
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 11 ++++++++++-
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 5 ++++-
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 1 -
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 8 ++++++--
server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 2 +-
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 94a7e98..a5bb579 100644
--- a/server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -84,7 +84,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮佷笉姝ｇ‘锛�");
}
if(Objects.equals(user.getStatus(),Constants.ONE)){
- throw new AuthenticationException("鐢ㄦ埛宸茶绂佺敤锛岃鑱旂郴绠＄悊鍛�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐧诲綍璐﹀彿宸茬鐢紝璇疯仈绯荤鐞嗗憳锛�");
}
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 6482088..b9b315b 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -47,7 +47,6 @@
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "璁㈠崟缂栫爜")
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 89030a6..b1737da 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -635,8 +635,12 @@
}
}
QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.lambda().ge(param.getStartDate() !=null,Refund::getDoneDate,Utils.Date.getStart(param.getStartDate()));
- queryWrapper2.lambda().le(param.getEndDate() !=null,Refund::getDoneDate,Utils.Date.getEnd(param.getEndDate()));
+ if(Objects.nonNull(param.getStartDate())) {
+ queryWrapper2.lambda().ge(Refund::getDoneDate, Utils.Date.getStart(param.getStartDate()));
+ }
+ if(Objects.nonNull(param.getEndDate())) {
+ queryWrapper2.lambda().le(Refund::getDoneDate, Utils.Date.getEnd(param.getEndDate()));
+ }
queryWrapper2.lambda().eq(Refund::getIsdeleted, Constants.ZERO);
queryWrapper2.select( "count(id) as count_num"
,"sum(money) as money" );
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index cb690aa..7fe93bc 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -189,6 +189,15 @@
public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ MemberRidesQuery model = pageWrap.getModel();
+ //宸茶繕杞�
+ if (Objects.nonNull(model.getHasBack()) && model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.TWO);
+ }
+ //鏈綊杩樼殑
+ if (Objects.nonNull(model.getHasBack()) && !model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.ONE);
+ }
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
initBikeLogObj(bikeLogDTOIPage.getRecords());
return PageData.from(bikeLogDTOIPage);
@@ -221,7 +230,7 @@
queryWrapper.ge(MemberRides::getRentDate, Utils.Date.getStart(model.getStartDate()));
}
if (Objects.nonNull(model.getEndDate())) {
- queryWrapper.le(MemberRides::getRentDate, Utils.Date.getStart(model.getEndDate()));
+ queryWrapper.le(MemberRides::getRentDate, Utils.Date.getEnd(model.getEndDate()));
}
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 2c509ff..18b2ecc 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -120,7 +120,10 @@
loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
loginLog.setSuccess(Constants.ONE);
systemLoginLogService.create(loginLog);
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),e.getCause().getMessage());
+ if (e.getCause() instanceof BusinessException) {
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), e.getCause().getMessage());
+ }
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "鎻愮ず瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮侀敊璇紒");
}
}
--
Gitblit v1.9.3