diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java index 8337db25..7c514764 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java @@ -78,7 +78,6 @@ public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommen Double point= CurrencyUtil.mul(experienceSetting.getMoney(),order.getFlowPrice(),0); //赠送会员经验值 memberService.updateMemberExperience(point.longValue(), true, order.getMemberId(), "会员下单，赠送经验值" + point + "分"); - } } diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 25330b74..c5ad83f6 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -401,6 +401,7 @@ public class MemberServiceImpl extends ServiceImpl impleme currentExperience = CurrencyUtil.sub(member.getPoint(), experience) < 0 ? 0 : new Double(CurrencyUtil.sub(member.getExperience(), experience)).longValue(); } member.setExperience(currentExperience); + return this.updateById(member); } throw new ServiceException(ResultCode.USER_NOT_EXIST); diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java index ae410350..f26919dc 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java @@ -20,7 +20,7 @@ import javax.persistence.Table; @Entity @Table(name = "li_coupon") @TableName("li_coupon") -@ApiModel(value = "优惠券活动实体类") +@ApiModel(value = "优惠券实体类") public class Coupon extends BasePromotion { @@ -35,7 +35,7 @@ public class Coupon extends BasePromotion { * * @see cn.lili.modules.promotion.entity.enums.CouponTypeEnum */ - @ApiModelProperty(value = "活动类型") + @ApiModelProperty(value = "优惠券类型") private String couponType; /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java new file mode 100644 index 00000000..122d8249 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java @@ -0,0 +1,34 @@ +package cn.lili.modules.promotion.entity.dos; + +import cn.lili.modules.promotion.entity.dto.BasePromotion; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * 优惠券活动实体类 + * + * @author Chopper + * @date 2020-03-19 10:44 上午 + */ +@Data +@Entity +@Table(name = "li_coupon_activity") +@TableName("li_coupon_activity") +@ApiModel(value = "优惠券活动实体类") +public class CouponActivity extends BasePromotion { + + @ApiModelProperty(value = "优惠券活动类型") + private String couponActivityType; + + @ApiModelProperty(value = "活动范围", allowableValues = "ALL:全部会员,DESIGNATED：指定会员") + private String activityScope; + + @ApiModelProperty(value = "活动范围") + private String activityScopeInfo; + +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java new file mode 100644 index 00000000..c2cede81 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java @@ -0,0 +1,35 @@ +package cn.lili.modules.promotion.entity.dos; + +import cn.lili.base.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * 优惠券活动实体类 + * + * @author Chopper + * @date 2020-03-19 10:44 上午 + */ +@Data +@Entity +@Table(name = "li_coupon_activity_item") +@TableName("li_coupon_activity_item") +@ApiModel(value = "优惠券活动-优惠券关联实体类") +public class CouponActivityItem extends BaseEntity { + + @ApiModelProperty(value = "优惠券活动ID") + private String activityId; + + @ApiModelProperty(value = "优惠券ID") + private String couponId; + + @ApiModelProperty(value = "优惠券数量") + private Integer num; + + +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/ActivityRangeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/ActivityRangeEnum.java new file mode 100644 index 00000000..33c16f07 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/ActivityRangeEnum.java @@ -0,0 +1,23 @@ +package cn.lili.modules.promotion.entity.enums; + +/** + * 优惠券活动范围枚举 + * + * @author Bulbasaur + * @date: 2021/5/20 6:05 下午 + */ +public enum ActivityRangeEnum { + + ALL("新人赠券"), + DESIGNATED("精确发券"); + + private final String description; + + ActivityRangeEnum(String str) { + this.description = str; + } + + public String description() { + return description; + } +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java new file mode 100644 index 00000000..323d38f7 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java @@ -0,0 +1,23 @@ +package cn.lili.modules.promotion.entity.enums; + +/** + * 优惠券活动类型枚举 + * + * @author Bulbasaur + * @date: 2021/5/20 5:47 下午 + */ +public enum CouponActivityTypeEnum { + + REGISTERED("新人赠券"), + SPECIFY("精确发券"); + + private final String description; + + CouponActivityTypeEnum(String str) { + this.description = str; + } + + public String description() { + return description; + } +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java new file mode 100644 index 00000000..9a42d55a --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java @@ -0,0 +1,15 @@ +package cn.lili.modules.promotion.mapper; + +import cn.lili.modules.promotion.entity.dos.CouponActivity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 优惠券活动 + * @author Bulbasaur + * @date: 2021/5/20 6:11 下午 + * + */ +public interface CouponActivityItemMapper extends BaseMapper { + + +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java new file mode 100644 index 00000000..256e78e4 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java @@ -0,0 +1,15 @@ +package cn.lili.modules.promotion.mapper; + +import cn.lili.modules.promotion.entity.dos.CouponActivity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 优惠券活动 + * @author Bulbasaur + * @date: 2021/5/20 6:11 下午 + * + */ +public interface CouponActivityMapper extends BaseMapper { + + +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java new file mode 100644 index 00000000..337e0488 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java @@ -0,0 +1,13 @@ +package cn.lili.modules.promotion.service; + +import cn.lili.modules.promotion.entity.dos.CouponActivityItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 优惠券活动-优惠券业务层 + * + * @author Bulbasaur + * @date: 2021/5/20 6:10 下午 + */ +public interface CouponActivityItemService extends IService { +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java new file mode 100644 index 00000000..91e3d0e2 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java @@ -0,0 +1,27 @@ +package cn.lili.modules.promotion.service; + +import cn.lili.modules.promotion.entity.dos.CouponActivity; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 优惠券活动业务层 + * + * @author Bulbasaur + * @date: 2021/5/20 6:10 下午 + */ +public interface CouponActivityService extends IService { + + //创建优惠券活动--精准发券、新人赠券、会员等级赠券 + + //编辑优惠券活动 + + //删除优惠券活动 + + //关闭优惠券活动 + + //开启优惠券活动 + + //查看优惠券活动 + + //查看优惠券活动 +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java new file mode 100644 index 00000000..cc75a1ad --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java @@ -0,0 +1,15 @@ +package cn.lili.modules.promotion.serviceimpl; + +import cn.lili.modules.promotion.entity.dos.CouponActivity; +import cn.lili.modules.promotion.mapper.CouponActivityMapper; +import cn.lili.modules.promotion.service.CouponActivityService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 优惠券活动业务层实现 + * + * @author Bulbasaur + * @date: 2021/5/20 6:10 下午 + */ +public class CouponActivityServiceImpl extends ServiceImpl implements CouponActivityService { +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index 09b7672d..da679bce 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java @@ -53,7 +53,6 @@ import java.util.stream.Collectors; */ @Service @Transactional(rollbackFor = Exception.class) - public class CouponServiceImpl extends ServiceImpl implements CouponService { //延时任务