This commit is contained in:
齐天大圣 2024-03-14 16:00:44 +08:00
parent f73ae86ba0
commit e65c175ef6
3 changed files with 8 additions and 3 deletions

View File

@ -634,12 +634,15 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
cardFavorableRecordVOS.add(cardFavorableRecordVO);
}
if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")) {
// paymentActiveDTO.getMtUserLevel()
String membershipLevel = cardFavorableRecordVO.getMembershipLevel();
for (String s : membershipLevel.split(",")) {
if (paymentActiveDTO.getMtUserLevel().equals(s)){
cardFavorableRecordVOS.add(cardFavorableRecordVO);
}
}
}
}
}
//折扣+优惠券
for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) {
if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getParticipationCondition())

View File

@ -163,6 +163,7 @@
cf.oil_type oilType,
cf.satisfied_amount satisfiedAmount,
cf.exclusive_function exclusiveFunction,
cf.membership_level membershipLevel
(case discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount}))
when '0' then cf.discount_amount
end) as amount

View File

@ -35,6 +35,7 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
* 互斥功能 0满减活动 1储值卡付款
*/
private String exclusiveFunction;
private String membershipLevel;
/**
* 可用油品
*/