From d07f43ac85889efc0a4e8e465b9b6777b24da192 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 16:22:58 +0800
Subject: [PATCH] 骑行时长减免和强制还车
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 4 ++--
server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java | 2 +-
server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java | 3 +++
server/services/src/main/java/com/doumee/dao/business/model/Refund.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java b/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
index ccc5df0..5ad6827 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
@@ -101,5 +101,8 @@
@ApiModelProperty(value = "鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触", example = "1")
@ExcelColumn(name="鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触")
private Integer result;
+ @ApiModelProperty(value = "鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触", example = "1")
+ @ExcelColumn(name="鎿嶄綔缁撴灉 0鎴愬姛 1澶辫触")
+ private Integer result;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
index cf5e7c8..cee6f51 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "鍙��閲戦", example = "1")
@ExcelColumn(name="鍙��鍥炴娂閲戯紙鍏冿級" )
- private BigDecimal canBanlance;
+ private BigDecimal canBalance;
@ApiModelProperty(value = "浜ゆ槗閲戦", example = "1")
@ExcelColumn(name="浜ゆ槗閲戦")
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 adfc35a..9e40183 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
@@ -218,11 +218,11 @@
throw new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝宸茶繕杞︿笖鏈粨绠楃殑鏁版嵁杩涜鎿嶄綔锛�" );
}
if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
- throw new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝锛�" );
+ throw new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏃堕暱鏈彂鐢熸敼鍙橈紝鏃犻渶淇敼锛�" );
}
int actTime = DateUtil.betweenMin(model.getRentDate(), model.getBackDate());
if(memberRides.getDuration() > actTime){
-
+ throw new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璁¤垂鏃堕暱涓嶈兘瓒呰繃瀹為檯鍊熷嚭鏃堕暱锛�" );
}
MemberRides update = new MemberRides();
update.setId(model.getId());
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
index 44f2f74..4218801 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/RefundServiceImpl.java
@@ -127,7 +127,7 @@
vo.setOpenid(order.getOpenid());
vo.setDoneDate(order.getDoneDate());
vo.setMoney(Constants.formatDecimalNum(order.getMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
- vo.setCanBanlance(Constants.formatDecimalNum(order.getCanBanlance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
+ vo.setCanBanlance(Constants.formatDecimalNum(order.getCanBalance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
vo.setOnlineOrderid(order.getOnlineOrderid());
vo.setPayOnlineOrderid(order.getPayOnlineOrderid());
vo.setCreatorName(order.getCreatorName());
--
Gitblit v1.9.3