diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java index ba27d78e1..242f22a54 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UCarouselController.java @@ -2,6 +2,7 @@ package com.czg.controller.user; import com.czg.market.dto.MkCarouselDTO; import com.czg.market.entity.MkCarousel; +import com.czg.market.entity.MkShareBase; import com.czg.market.service.MkCarouselService; import com.czg.market.service.MkShareBaseService; import com.czg.resp.CzgResult; @@ -48,6 +49,13 @@ public class UCarouselController { public record ShareClaim(String tagType, Long shopId, Long fromUserId, Long toUserId) { } + /** + * 分享 基础配置 + */ + @PostMapping("/share") + public CzgResult share(@RequestParam Long shopId) { + return CzgResult.success(mkShareBaseService.getShareBase(shopId)); + } /** * 分享 领取触发 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShareBase.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShareBase.java index 893f85d8d..1984660dd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShareBase.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShareBase.java @@ -1,5 +1,6 @@ package com.czg.market.entity; +import com.czg.market.dto.ShopCouponDTO; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; @@ -57,6 +58,11 @@ public class MkShareBase implements Serializable { * 分享人奖励的优惠券ID,关联优惠券表 */ private Long sharerCouponId; + /** + * 分享人奖励的优惠券信息 + */ + @Column(ignore = true) + private ShopCouponDTO sharerCoupon; /** * 分享人奖励的优惠券名称 */ diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java index f27b7f769..14877efb1 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java @@ -39,6 +39,7 @@ public class MkShareBaseServiceImpl extends ServiceImpl