diff --git a/cash-api/market-server/src/main/java/com/czg/task/MemberDeliverTask.java b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java similarity index 76% rename from cash-api/market-server/src/main/java/com/czg/task/MemberDeliverTask.java rename to cash-api/market-server/src/main/java/com/czg/task/MemberTask.java index 69c490dd..50f4107e 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/MemberDeliverTask.java +++ b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java @@ -15,6 +15,8 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.util.List; + /** * 订单定时任务 * @@ -23,7 +25,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class MemberDeliverTask { +public class MemberTask { @Resource private OrderInfoService orderInfoService; @DubboReference @@ -36,10 +38,19 @@ public class MemberDeliverTask { * order 过期 */ // @Scheduled(cron = "0 0 1 * * ? ") - public void run() { + public void deliver() { shopUserService.list(new QueryWrapper().eq(ShopUser::getIsVip, 1).lt(ShopUser::getNextDeliverTime, DateUtil.date().toLocalDateTime())).forEach(item -> { memberConfigService.deliver(item.getSourceShopId(), item.getUserId(), TableValueConstant.MemberExpFlow.Type.MEMBER_TASK, null, null, null); }); } + + public void check() { + List shopUsers = shopUserService.list(new QueryWrapper().isNotNull(ShopUser::getEndTime).eq(ShopUser::getIsVip, 1).lt(ShopUser::getEndTime, DateUtil.date())); + shopUsers.forEach(item -> { + item.setIsVip(0); + }); + + shopUserService.updateBatch(shopUsers); + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java index 4d5ad587..8bbd841e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java @@ -38,7 +38,7 @@ public interface TbMemberConfigService extends IService { * @return 是否加入成功 */ boolean joinMember(Long shopId, Long userId, Long memberOrderId); - boolean joinMemberByCOndition(Long shopId, Long userId); + boolean joinMemberByCondition(Long shopId, Long userId); /** * 发放会员奖励 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index afa2610e..b1c52e60 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -353,7 +353,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl