Pārlūkot izejas kodu

fix codex 抵扣兼容暂停原套餐

zoujiajian 1 mēnesi atpakaļ
vecāks
revīzija
e223bf4754

+ 2 - 1
netflix-service/src/main/java/com/cyksj/service/codex/impl/CodexServiceImpl.java

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