diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareCouponDTO.java new file mode 100644 index 00000000..0d3a3fdd --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareCouponDTO.java @@ -0,0 +1,24 @@ +package com.czg.account.dto; + +import jakarta.validation.constraints.Min; +import lombok.Data; + +/** + * @author Administrator + */ +@Data +public class ShopShareCouponDTO { + /** + * 券id + */ + private Long id; + /** + * 名称 + */ + private String name; + /** + * 数量 + */ + @Min(1) + private Integer num; +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java index 7ad7f81b..6f98d971 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopShareDTO.java @@ -67,7 +67,7 @@ public class ShopShareDTO implements Serializable { /** * 新用户获得券 */ - private List newCouponList; + private List newCouponList; /** * 邀请人数 @@ -77,7 +77,7 @@ public class ShopShareDTO implements Serializable { /** * 奖励券 */ - private List rewardCouponList; + private List rewardCouponList; /** * 获取方法 get-新用户领取获得 use-新用户使用获得 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/ShopShareVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/ShopShareVO.java index 9d9fe8d4..fd0a5da1 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/ShopShareVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/ShopShareVO.java @@ -1,6 +1,6 @@ package com.czg.account.vo; -import com.czg.account.entity.ShopCoupon; +import com.czg.account.dto.ShopShareCouponDTO; import com.czg.account.entity.ShopShare; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,9 +17,9 @@ public class ShopShareVO extends ShopShare { /** * 新人奖励优惠券信息 */ - private List newCouponList = new ArrayList<>(); + private List newCouponList = new ArrayList<>(); /** * 邀请人奖励优惠券信息 */ - private List rewardCouponList = new ArrayList<>(); + private List rewardCouponList = new ArrayList<>(); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java index 3844657d..094a3510 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopShareServiceImpl.java @@ -3,6 +3,8 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.czg.account.dto.ShopShareCouponDTO; import com.czg.account.dto.ShopShareDTO; import com.czg.account.entity.ShopCoupon; import com.czg.account.service.ShopCouponService; @@ -42,11 +44,13 @@ public class ShopShareServiceImpl extends ServiceImpl