Skip to content

C
cloud-platform
Commit eb0e6718 authored by 周健威's avatar 周健威
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 3ae9a1f6 83c4c96d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodSpeBiz.java
View file @ eb0e6718
...@@ -124,12 +124,14 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP ...@@ -124,12 +124,14 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
long startDateTime = dateFormat.parse(dateFormat.format(startTime)).getTime(); long startDateTime = dateFormat.parse(dateFormat.format(startTime)).getTime();
long endDateTime = dateFormat.parse(dateFormat.format(endTime)).getTime(); long endDateTime = dateFormat.parse(dateFormat.format(endTime)).getTime();
if (startDateTime<=endDateTime){ log.info("----startDateTime==="+startDateTime+"----endDateTime===="+endDateTime);
if (startDateTime<endDateTime){
return false; return false;
} }
int days=(int)((startDateTime - endDateTime) / (1000 * 3600 * 24)); int days=(int)((startDateTime - endDateTime) / (1000 * 3600 * 24));
int tourDays=goodDetailBiz.getTourDays(); int tourDays=goodDetailBiz.getTourDays();
if (days>0&&days>=tourDays){ log.info("----days==="+days+"----tourDays===="+tourDays);
if (days>=0&&days>=tourDays){
return true; return true;
} }
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment