Merge remote-tracking branch 'origin/feature/九月迭代'

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/AppOrderApiServiceImpl.java

@@ -304,6 +304,10 @@ public class AppOrderApiServiceImpl implements AppOrderApiService {
             appOrderEndTime = now;
         }
         logger.info("已购买付费应用的到期时间:{},合同到期时间：{}",DateUtil.dateToStr(appOrderEndTime,DateUtil.FORMAT_DATETIME_19),DateUtil.dateToStr(endTime,DateUtil.FORMAT_DATETIME_19));
+       //如果过期时间小于当前时间，取当前时间
+        if (now.after(appOrderEndTime)){
+            appOrderEndTime = now;
+        }
         int i = DateUtil.daysBetween(appOrderEndTime, endTime);
         if(i< 0){
             i = 0;