bug
This commit is contained in:
parent
f73ae86ba0
commit
e65c175ef6
@ -634,9 +634,12 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
cardFavorableRecordVOS.add(cardFavorableRecordVO);
|
cardFavorableRecordVOS.add(cardFavorableRecordVO);
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")) {
|
if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")) {
|
||||||
// paymentActiveDTO.getMtUserLevel()
|
String membershipLevel = cardFavorableRecordVO.getMembershipLevel();
|
||||||
|
for (String s : membershipLevel.split(",")) {
|
||||||
cardFavorableRecordVOS.add(cardFavorableRecordVO);
|
if (paymentActiveDTO.getMtUserLevel().equals(s)){
|
||||||
|
cardFavorableRecordVOS.add(cardFavorableRecordVO);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -163,6 +163,7 @@
|
|||||||
cf.oil_type oilType,
|
cf.oil_type oilType,
|
||||||
cf.satisfied_amount satisfiedAmount,
|
cf.satisfied_amount satisfiedAmount,
|
||||||
cf.exclusive_function exclusiveFunction,
|
cf.exclusive_function exclusiveFunction,
|
||||||
|
cf.membership_level membershipLevel
|
||||||
(case discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount}))
|
(case discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount}))
|
||||||
when '0' then cf.discount_amount
|
when '0' then cf.discount_amount
|
||||||
end) as amount
|
end) as amount
|
||||||
|
@ -35,6 +35,7 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
|
|||||||
* 互斥功能 0:满减活动 1:储值卡付款
|
* 互斥功能 0:满减活动 1:储值卡付款
|
||||||
*/
|
*/
|
||||||
private String exclusiveFunction;
|
private String exclusiveFunction;
|
||||||
|
private String membershipLevel;
|
||||||
/**
|
/**
|
||||||
* 可用油品
|
* 可用油品
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user