diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
index bb024900..c8449df3 100644
--- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java
@@ -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)) {
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
index bec05f38..18e46793 100644
--- 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
@@ -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;
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java
new file mode 100644
index 00000000..47dc2630
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java
@@ -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;
+}
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
index 956c9f8c..aeaa37a8 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java
@@ -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;
     }
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
index 000d8b5c..ec251625 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java
@@ -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);
 }
\ 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
index 5616b7c8..f85206dc 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java
@@ -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);
 }
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
index b5993abc..c8c1cd5a 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
@@ -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);
+    }
+
 }
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
index 8bf5734f..3dd081c6 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
@@ -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;
     }