diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java index d6f754e06..c416060f7 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UChatCouponController.java @@ -24,7 +24,7 @@ public class UChatCouponController { */ @PostMapping("/grant") public CzgResult grantChatCoupon(@RequestBody ChatCouponGrantDTO chatCouponGrant) { - chatCouponService.grantChatCoupon(chatCouponGrant.getId(), chatCouponGrant.getShopUserId(), chatCouponGrant.getUserId()); + chatCouponService.grantChatCoupon(chatCouponGrant.getId(), chatCouponGrant.getShopId(), chatCouponGrant.getUserId()); return CzgResult.success(true); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java index 245e1e448..aab84975a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java @@ -31,6 +31,11 @@ public interface ShopUserService extends IService { */ Page getInviteUser(Long getDistributionUserId, Long shopId, Long shopUserId, Long distributionLevelId, Integer page, Integer size); + /** + * 会自动获取到用户的主店铺id 然后获取用户信息 + * 获取用户信息 + */ + ShopUser getUserInfo(Long shopId, Long userId); boolean updateInfo(ShopUser shopUser); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ChatCouponGrantDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ChatCouponGrantDTO.java index e64a8d758..ac20baf59 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ChatCouponGrantDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ChatCouponGrantDTO.java @@ -17,6 +17,10 @@ public class ChatCouponGrantDTO { * 店铺用户ID */ private Long shopUserId; + /** + * 店铺ID + */ + private Long shopId; /** * 用户ID */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java index 7cdf960a5..9a6e27b36 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/ChatCouponService.java @@ -33,7 +33,7 @@ public interface ChatCouponService extends IService { /** * 发放优惠券 */ - void grantChatCoupon(Long id, Long shopUserId, Long userId); + void grantChatCoupon(Long id, Long shopId, Long userId); /** * 分页查询优惠券发放记录 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index 51ff8b6ed..1ec59a280 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -63,6 +63,12 @@ public class ShopUserServiceImpl extends ServiceImpl i return shopUser; } + @Override + public ShopUser getUserInfo(Long shopId, Long userId) { + Long mainShopId = shopInfoService.getMainIdByShopId(shopId); + return getOne(QueryWrapper.create().eq(ShopUser::getUserId, userId).eq(ShopUser::getMainShopId, mainShopId)); + } + @Override public boolean updateInfo(ShopUser shopUser) { return super.updateById(shopUser); @@ -71,13 +77,9 @@ public class ShopUserServiceImpl extends ServiceImpl i @Override public ShopUser getShopUserInfo(Long shopId, long userId) { - Long mainShopId = shopInfoService.getMainIdByShopId(shopId); - ShopUser shopUser = queryChain().eq(ShopUser::getUserId, userId).and(q -> { - q.eq(ShopUser::getMainShopId, mainShopId).or(q1 -> { - q1.eq(ShopUser::getSourceShopId, shopId); - }); - }).one(); + ShopUser shopUser = getUserInfo(shopId, userId); if (shopUser == null) { + Long mainShopId = shopInfoService.getMainIdByShopId(shopId); shopUser = new ShopUser(); UserInfo userInfo = userInfoService.getById(userId); BeanUtil.copyProperties(userInfo, shopUser); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index 1a472f880..a8b2a1ce6 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -1,6 +1,8 @@ package com.czg.service.market.service.impl; import com.alibaba.fastjson2.JSONObject; +import com.czg.account.entity.ShopUser; +import com.czg.account.service.ShopUserService; import com.czg.exception.CzgException; import com.czg.market.dto.ChatCouponDTO; import com.czg.market.dto.MkShopCouponGiftDTO; @@ -17,6 +19,7 @@ import com.czg.market.service.ChatCouponService; import com.czg.service.market.mapper.ChatCouponMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +36,9 @@ public class ChatCouponServiceImpl extends ServiceImpl