diff --git a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java index f7e2857c2..a64de374f 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java +++ b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java @@ -40,7 +40,7 @@ public class MemberTask { // @Scheduled(cron = "0 0 1 * * ? ") public void task() { 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); + memberConfigService.deliver(item, TableValueConstant.MemberExpFlow.Type.MEMBER_TASK, null, null, null); }); } 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 8bbd841e4..52fb74d60 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 @@ -1,5 +1,6 @@ package com.czg.market.service; +import com.czg.account.entity.ShopUser; import com.czg.constant.TableValueConstant; import com.czg.exception.ApiNotPrintException; import com.czg.market.dto.MemberConfigDTO; @@ -46,7 +47,7 @@ public interface TbMemberConfigService extends IService { * @param expVal 经验值,只有当type为pay的时候才生效 * @return 是否成功 */ - boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId); + boolean deliver(ShopUser shopUser, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId); /** * 获取用户会员列表 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 5a315b0f8..a597c7a0f 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 @@ -297,18 +297,17 @@ public class TbMemberConfigServiceImpl extends ServiceImpl { - shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId()) + shopCouponRecordService.grant(shopUser.getMainShopId(), new MkRewardCouponDTO().setCouponId(item.getCoupon().getId()) .setNum(item.getNum()) .setUserId(shopUser.getUserId()) - .setShopId(shopId)); + .setShopId(shopUser.getMainShopId())); }); // couponGiftService.addCouponGift(memberOrderId, "会员开通赠券", 1, giftDTOS); @@ -371,8 +370,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl= nextConfig.getExperienceValue()) { shopUser.setMemberLevelId(nextConfig.getId()); @@ -388,7 +387,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl