dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
齐天大圣 2024-01-20 12:01:11 +08:00
parent 3cc44f8272
commit acc85b1fa6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/dto/PaymentActiveDTO.java
View File

@ -7,7 +7,7 @@ import java.math.BigDecimal;
@Data @Data
public class PaymentActiveDTO implements Serializable { public class PaymentActiveDTO implements Serializable {
//支付类型 0：储值卡 1：囤油卡 2：现金 //支付类型 0：储值卡 1：没用储值卡
private String type; private String type;
//支付金额 //支付金额
private BigDecimal amount; private BigDecimal amount;

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -451,6 +451,11 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
//优惠券 //优惠券
paymentActiveDTO.setUserId(userId); paymentActiveDTO.setUserId(userId);
List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO); List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
//如果是储值卡付款，直接过滤掉
if(paymentActiveDTO.getType().equals("0")){
canUserCardFavorableList = canUserCardFavorableList.stream().filter(cardFavorableRecordVO -> cardFavorableRecordVO.getExclusiveFunction().equals("1"))
.collect(Collectors.toList());
}
//会员等级当前优惠力度最大 //会员等级当前优惠力度最大
//无限制条件的活动列表 //无限制条件的活动列表