From b2fc091877f56a16cf6cd1aec074ddf84437e397 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 29 二月 2024 17:06:30 +0800
Subject: [PATCH] 优化领取时间计算
---
phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java b/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
index ba54236..009d8ca 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
@@ -780,15 +780,13 @@
Date limitEndTime = null;
//鏈夐檺鍒舵椂闂磋鍒�
if (StringUtils.noNull(userMoneyUnclaimed.getMoneyRuleId())){
- //鏈夐鍙栭檺鍒�
- if (userMoneyUnclaimed.getReceiveMoneyLimit() != null && userMoneyUnclaimed.getReceiveMoneyLimit().equals(BaseEntity.YES)){
- //瑕侀鍙栫殑璧勯噾鍒ゆ柇鏄惁婊¤冻鏉′欢
- if (UserMoneyUnclaimed.OP_TYPE_RECEIVE == userMoneyUnclaimed.getOpType() && checkCanNotReceive(userMoneyUnclaimed)){
- throw new PlatTipsException(PlatformCode.ERROR_TIPS,"棰嗗彇澶辫触,鏈弧瓒抽鍙栨潯浠�");
- }
+ //闇�瑕侀鍙�,鏈夐鍙栭檺鍒� 鍒欐牎楠屾槸鍚︽弧瓒虫潯浠�
+ if (userMoneyUnclaimed.getReceiveMoneyLimit() != null && userMoneyUnclaimed.getReceiveMoneyLimit().equals(BaseEntity.YES)
+ && UserMoneyUnclaimed.OP_TYPE_RECEIVE == userMoneyUnclaimed.getOpType() && checkCanNotReceive(userMoneyUnclaimed)){
+ throw new PlatTipsException(PlatformCode.ERROR_TIPS,"棰嗗彇澶辫触,鏈弧瓒抽鍙栨潯浠�");
}
+ //鏈夐鍙栧悗鐨勬椂闂撮檺鍒�,闄愬埗缁撴潫鏃堕棿璁＄畻
if (userMoneyUnclaimed.getReceiveMoneyLimit() != null && userMoneyUnclaimed.getReceiveMoneyLimit().equals(BaseEntity.YES)){
- //鏈夐檺鍒�,闄愬埗缁撴潫鏃堕棿璁＄畻
logger.info("鎿嶄綔寰呴鍙栬祫閲�-鍏宠仈瑙勫垯闄愬埗鏈夋晥澶╂暟{},鏁版嵁id:{}",userMoneyUnclaimed.getId(),userMoneyUnclaimed.getReceiveMoneyLimitDay());
limitEndTime = DateUtil.addDay(userMoneyUnclaimed.getLimitStartTime(),userMoneyUnclaimed.getReceiveMoneyLimitDay());
}else {
--
Gitblit v1.8.0