From ebccdd6417f65ace22f1e0d7a5572589aa80698a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:48 +0800
Subject: [PATCH] # 用户禁用
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 4 ++--
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 2 +-
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 6 ++++--
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java | 16 +++++++++++-----
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 71b740e..e47864a 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -53,7 +53,7 @@
* 娓│
* @throws Exception
*/
- @Scheduled(cron = "0 0 21 * * ? ")
+ @Scheduled(cron = "0 0/1 * * * ? ")
public void getYesterdayBill() throws Exception {
log.info("=====================寮�濮嬫瘡澶╄嚜鍔ㄧ粨绠�=======================");
goodsorderService.autoCloseOrder();
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
index 029f2f5..d151067 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
@@ -31,11 +31,11 @@
@ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
private Integer status;
- @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
- private Date rentDateStart;
-
- @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
- private Date rentDateEnd;
+// @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
+// private Date rentDateStart;
+//
+// @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
+// private Date rentDateEnd;
@ApiModelProperty(value = "鏄惁褰掕繕 [杞﹁締鍙栬繕璁板綍(绔欑偣) 鍏ュ弬]")
private Boolean hasBack;
@@ -44,4 +44,10 @@
@ApiModelProperty(value = "杩樿溅绫诲瀷 0姝ｅ父杩樿溅 1寮哄埗杩樿溅")
private Integer backType;
+
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿璧峰")
+ private Date startDate;
+
+ @ApiModelProperty(value = "鍊熷嚭鏃堕棿缁撴潫")
+ private Date endDate;
}
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 1b492b7..e8b7639 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
@@ -395,7 +395,7 @@
@Override
public void closeGoodsorder( Goodsorder goodsorder ,int type ) {
- LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+//
List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
//榛樿缁撶畻涓烘娂閲戦噾棰�
BigDecimal closeMoney = new BigDecimal(0.00);
@@ -426,6 +426,8 @@
if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
//濡傛灉鏄己鍒剁粨绠�
update.setCloseType(Constants.ONE);
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ update.setEditor(principal.getId());
}else if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
//濡傛灉鏄嚜琛岀祼绠�
update.setCloseType(Constants.ZERO);
@@ -443,7 +445,7 @@
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
- refundDTO.setCreator(principal.getId());
+ refundDTO.setCreator(update.getEditor());
refundDTO.setType(type);
Refund refund = wxMiniUtilService.wxRefund(refundDTO);
update.setCloseId(refund.getId());
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 7d70fe3..4560cf1 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
@@ -217,8 +217,8 @@
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
.like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
.like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
- queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
- queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
+ queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate());
+ queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,model.getEndDate());
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
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 8c22890..2c509ff 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,7 @@
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.getMessage());
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),e.getCause().getMessage());
}
}
--
Gitblit v1.9.3