|
@@ -836,7 +836,8 @@ public class CodexServiceImpl implements CodexService {
|
|
|
Date deductStartTime = DateUtil.offsetMonth(now, -deductMonth);
|
|
Date deductStartTime = DateUtil.offsetMonth(now, -deductMonth);
|
|
|
Date cutoffTime = deductStartTime;
|
|
Date cutoffTime = deductStartTime;
|
|
|
if (oriOrderDon != null) {
|
|
if (oriOrderDon != null) {
|
|
|
- cutoffTime = DateUtil.compare(oriOrderDon.getCreatedTime(), deductStartTime) > 0 ? oriOrderDon.getCreatedTime() : deductStartTime;
|
|
|
|
|
|
|
+ // 原套餐可能在续费升级期间暂停,订单虽早但剩余价值仍有效。
|
|
|
|
|
+ cutoffTime = oriOrderDon.getCreatedTime();
|
|
|
queryWrapper.ge(OrderDon::getCreatedTime, cutoffTime);
|
|
queryWrapper.ge(OrderDon::getCreatedTime, cutoffTime);
|
|
|
} else {
|
|
} else {
|
|
|
queryWrapper.ge(OrderDon::getCreatedTime, deductStartTime);
|
|
queryWrapper.ge(OrderDon::getCreatedTime, deductStartTime);
|