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 79c3331ca..21db756ed 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 @@ -485,7 +485,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //折扣+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) { - if (activeDiscountPayVO.getParticipationCondition().equals("0")){ + if (activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); @@ -522,7 +522,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //满减+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { - if (activeDiscountPayVO.getParticipationCondition().equals("0")){ + if (activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml index 06348c748..407ec9bec 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml @@ -128,7 +128,7 @@ cf.exclusive_function exclusiveFunction, (case discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount})) when '0' then cf.discount_amount - else 10 end) as amount + end) as amount FROM card_favorable cf LEFT JOIN card_favorable_record cfr ON cf.id = cfr.card_favorable_id @@ -136,7 +136,7 @@ cfr.mt_user_id = #{paymentActiveDTO.userId} AND cfr.store_id = #{paymentActiveDTO.storeId} AND cf.type != 1 - AND cf.satisfied_amount 350 + AND cf.satisfied_amount #{paymentActiveDTO.amount} AND now() BETWEEN cfr.start_time AND cfr.end_time AND cfr.status = 0