caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

展示优惠券活动下的优惠券列表详情

Browse Source
This commit is contained in:
lifenlong 2021-06-18 11:27:38 +08:00
parent 24be8f342d
commit b361fe7d95
8 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
View File

@ -56,10 +56,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
switch (orderMessage.getNewStatus()) {
case PAID: {
<<<<<<< HEAD
=======
//获取订单详情
>>>>>>> master
OrderDetailVO order = orderService.queryDetail(orderMessage.getOrderSn());
//库存key 和 扣减数量
List<String> keys = new ArrayList<>();
@ -87,10 +84,7 @@ public class StockUpdateExecute implements OrderStatusChangeEvent {
break;
}
case CANCELLED: {
<<<<<<< HEAD
=======
//获取订单详情
>>>>>>> master
OrderDetailVO order = orderService.queryDetail(orderMessage.getOrderSn());
//判定是否已支付 并且 非库存不足导致库存回滚 则需要考虑订单库存返还业务
if (order.getOrder().getPayStatus().equals(PayStatusEnum.PAID.name()) && order.getOrder().getCancelReason().equals(outOfStockMessage)) {

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
View File

@ -28,14 +28,14 @@ public class CouponActivity extends BasePromotion {
* @see CouponActivityTypeEnum
*/
@NotNull(message = "优惠券活动类型不能为空")
@ApiModelProperty(value = "优惠券活动类型")
@ApiModelProperty(value = "优惠券活动类型", allowableValues = "REGISTERED:新人赠券,SPECIFY：精确发券")
private String couponActivityType;
@NotNull(message = "请选择活动范围")
@ApiModelProperty(value = "活动范围", allowableValues = "ALL:全部会员,DESIGNATED：指定会员")
private String activityScope;
@ApiModelProperty(value = "活动范围详情")
@ApiModelProperty(value = "活动范围详情,只有精准发券使用")
private String activityScopeInfo;
}

30
framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java Normal file
View File

@ -0,0 +1,30 @@
package cn.lili.modules.promotion.entity.vos;
import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
import io.swagger.annotations.ApiModelProperty;
/**
* 优惠券活动的优惠券VO
*
* @author Bulbasaur
* @date: 2021/6/18 11:00 上午
*/
public class CouponActivityItemVO extends CouponActivityItem {
@ApiModelProperty(value = "优惠券名称")
private String couponName;
@ApiModelProperty(value = "面额")
private Double price;
/**
* POINT("打折"), PRICE("减免现金");
*
* @see cn.lili.modules.promotion.entity.enums.CouponTypeEnum
*/
@ApiModelProperty(value = "优惠券类型")
private String couponType;
@ApiModelProperty(value = "折扣")
private Double couponDiscount;
}

4
framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
View File

@ -20,9 +20,9 @@ import java.util.List;
public class CouponActivityVO extends CouponActivity {
@ApiModelProperty(value = "优惠券活动下的优惠券列表")
private List<CouponActivityItem> couponActivityItems;
private List<CouponActivityItemVO> couponActivityItems;
public CouponActivityVO(CouponActivity couponActivity, List<CouponActivityItem> couponActivityItems) {
public CouponActivityVO(CouponActivity couponActivity, List<CouponActivityItemVO> couponActivityItemVOS) {
BeanUtil.copyProperties(couponActivity, this);
this.couponActivityItems = couponActivityItems;
}

8
framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java
View File

@ -1,7 +1,12 @@
package cn.lili.modules.promotion.mapper;
import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
import cn.lili.modules.promotion.entity.vos.CouponActivityItemVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
* 优惠券活动
@ -11,5 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface CouponActivityItemMapper extends BaseMapper<CouponActivityItem> {
@Select("SELECT cai.*,c.coupon_name,c.price,c.coupon_type,c.coupon_discount FROM li_coupon_activity_item cai INNER JOIN li_coupon c ON cai.coupon_id = c.id WHERE cai.activity_id= #{activityId} ")
List<CouponActivityItemVO> getCouponActivityItemListVO(String activityId);
}

8
framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java
View File

@ -1,6 +1,7 @@
package cn.lili.modules.promotion.service;
import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
import cn.lili.modules.promotion.entity.vos.CouponActivityItemVO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
@ -20,4 +21,11 @@ public interface CouponActivityItemService extends IService<CouponActivityItem>
* @return 优惠券关联优惠券列表
*/
List<CouponActivityItem> getCouponActivityList(String activityId);
/**
* 获取优惠券活动关联优惠券列表VO
*
* @param activityId 优惠券活动ID
* @return 优惠券关联优惠券列表
*/
List<CouponActivityItemVO> getCouponActivityItemListVO(String activityId);
}

8
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
View File

@ -1,6 +1,7 @@
package cn.lili.modules.promotion.serviceimpl;
import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
import cn.lili.modules.promotion.entity.vos.CouponActivityItemVO;
import cn.lili.modules.promotion.mapper.CouponActivityItemMapper;
import cn.lili.modules.promotion.service.CouponActivityItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -16,8 +17,15 @@ import java.util.List;
*/
@Service
public class CouponActivityItemServiceImpl extends ServiceImpl<CouponActivityItemMapper, CouponActivityItem> implements CouponActivityItemService {
@Override
public List<CouponActivityItem> getCouponActivityList(String activityId) {
return this.list(this.lambdaQuery().eq(CouponActivityItem::getActivityId, activityId));
}
@Override
public List<CouponActivityItemVO> getCouponActivityItemListVO(String activityId) {
return this.baseMapper.getCouponActivityItemListVO(activityId);
}
}

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
View File

@ -74,7 +74,7 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
@Override
public CouponActivityVO getCouponActivityVO(String couponActivityId) {
CouponActivity couponActivity = this.getById(couponActivityId);
CouponActivityVO couponActivityVO = new CouponActivityVO(couponActivity, couponActivityItemService.getCouponActivityList(couponActivityId));
CouponActivityVO couponActivityVO = new CouponActivityVO(couponActivity, couponActivityItemService.getCouponActivityItemListVO(couponActivityId));
return couponActivityVO;
}