|
|
@@ -4305,7 +4305,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
* 2.查询当前时间，该门店是否有活动，如果有活动，查询开启了哪些营销方式
|
|
|
* 参数： 当前时间 门店id
|
|
|
*/
|
|
|
- List<MkActivitiesEntity> mkActivitiesEntityList = mkActivitiesService.queryByNow(storeId, DateUtils.format(new Date(), "yyyy-MM-dd"));
|
|
|
+ List<MkActivitiesEntity> mkActivitiesEntityList = mkActivitiesService.queryByNow(storeId, DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
// 活动优先级判定，特价>打折>满减/满赠>优惠券>积分抵扣;
|
|
|
// List<Constants.ActivityTopicEnum> activityTopicEnums = Arrays.asList(Constants.ActivityTopicEnum.values());
|
|
|
// for (MkActivitiesEntity mkActivitiesEntity : mkActivitiesEntityList) {
|
