Skip to content

O
order-group
Commit ab493ea0 by 刘鹏飞
Options

Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

parents 7efc087d 4bca1c93
Showing with 1 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/order/impl/CocoOrderRelationServiceImpl.java
...@@ -63,7 +63,7 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService { ...@@ -63,7 +63,7 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
Date todayEnd = DateUtil.setEndDay(new Date()); Date todayEnd = DateUtil.setEndDay(new Date());
if(todayEnd.before(takeMealDateTime)){ if(takeMealDateTime != null && todayEnd.before(takeMealDateTime)){
return; return;
} }
......
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