diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 58f2f88fc..78c052b2b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -482,6 +482,9 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { Integer storeId = paymentActiveDTO.getStoreId(); double finalAmount = 0.00; Integer userId = TokenUtil.getNowAccountInfo().getId(); + if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){ + userId = paymentActiveDTO.getUserId(); + } //获取今日是周几 DayOfWeek dayOfWeek = LocalDate.now().getDayOfWeek(); String displayName = dayOfWeek.getDisplayName(TextStyle.FULL, Locale.getDefault()); @@ -630,6 +633,11 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("0")) { cardFavorableRecordVOS.add(cardFavorableRecordVO); } + if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")) { + // paymentActiveDTO.getMtUserLevel() + + cardFavorableRecordVOS.add(cardFavorableRecordVO); + } } } //折扣+优惠券 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableDTO.java index f67633fb3..976546b63 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableDTO.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -15,6 +16,7 @@ import java.util.Date; * @since 2023-11-07 11:02:06 */ @SuppressWarnings("serial") +@Data public class CardFavorableDTO extends Model { //主键id @TableId(type = IdType.AUTO) @@ -25,6 +27,7 @@ public class CardFavorableDTO extends Model { private Integer storeId; //是否在线 0:在线 1: 下线 private String isonline; + private String[] membershipLevel; //优惠券名称 private String name; //卡券类型 0:油品券 1:商品券 2:通用券 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java index b1e29c7cb..d3e17c411 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorable.java @@ -28,6 +28,7 @@ public class CardFavorable extends Model { //是否在线 0:在线 1: 下线 private String isonline; private String cardDetail; + private String membershipLevel; //优惠券名称 private String name; //卡券类型 0:油品券 1:商品券 2:通用券 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java index 4cfdd0538..f8a50f707 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java @@ -76,6 +76,13 @@ public class CardFavorableServiceImpl extends ServiceImpl { private Integer storeId; //是否在线 0:在线 1: 下线 private String isonline; + private String[] membershipLevel; //优惠券名称 private String name; //卡券类型 0:油品券 1:商品券 2:通用券