修复满优惠券活动赠优惠券/积分/商品不生效问题

framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java

@@ -4,6 +4,7 @@ import cn.lili.modules.goods.entity.dos.GoodsSku;
 import cn.lili.modules.promotion.entity.dos.FullDiscount;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author Chopper
  * @since 2020-04-01 10:42 上午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class FullDiscountVO extends FullDiscount {
 
@@ -47,6 +49,9 @@ public class FullDiscountVO extends FullDiscount {
         if (Boolean.TRUE.equals(this.getIsPoint())) {
             stringBuffer.append(" 赠").append(this.getPoint()).append("积分 ");
         }
+        if (Boolean.TRUE.equals(this.getIsCoupon())) {
+            stringBuffer.append(" 赠").append("优惠券 ");
+        }
         if (Boolean.TRUE.equals(this.getIsGift() && giftSku != null)) {
             stringBuffer.append(" 赠品[").append(giftSku.getGoodsName()).append("]");
         }

framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.NotEmpty;
@@ -16,6 +17,7 @@ import javax.validation.constraints.NotNull;
  * @author Chopper
  * @since 2020-03-19 10:44 上午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("li_full_discount")
 @ApiModel(value = "满优惠活动")