|
|
@@ -111,6 +111,7 @@ import com.ejlchina.searcher.util.MapUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.apache.commons.lang3.time.DateUtils;
|
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -2717,8 +2718,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
if (groupsRelation != null) {
|
|
|
Date expiryTime = groupsRelation.getExpiryTime();
|
|
|
|
|
|
- //mj续费订单当天过期直接加次数
|
|
|
- if (expiryTime != null && DateUtil.isSameDay(new Date(), expiryTime)) {
|
|
|
+ //mj续费订单当天过期和已过期续费直接加次数
|
|
|
+ if (expiryTime != null && new Date().after(DateUtil.beginOfDay(expiryTime))) {
|
|
|
mjRenewOrder(orderDon);
|
|
|
}
|
|
|
//同步user时间
|
zwhui