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

bug

Browse Source
This commit is contained in:
齐天大圣 2024-01-19 11:33:51 +08:00
parent 3cc355b4b9
commit 3ef9ad404b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,7 +485,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
} }
//折扣+优惠券 //折扣+优惠券
for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) { for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) {
if (activeDiscountPayVO.getParticipationCondition().equals("0")){ if (activeDiscountPayVO.getParticipationCondition().equals("1")){
for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) {
if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){
ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO();
@ -522,7 +522,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
} }
//满减+优惠券 //满减+优惠券
for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) {
if (activeDiscountPayVO.getParticipationCondition().equals("0")){ if (activeDiscountPayVO.getParticipationCondition().equals("1")){
for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) {
if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){
ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO();

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
View File

@ -128,7 +128,7 @@
cf.exclusive_function exclusiveFunction, cf.exclusive_function exclusiveFunction,
(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
else 10 end) as amount end) as amount
FROM FROM
card_favorable cf card_favorable cf
LEFT JOIN card_favorable_record cfr ON cf.id = cfr.card_favorable_id LEFT JOIN card_favorable_record cfr ON cf.id = cfr.card_favorable_id
@ -136,7 +136,7 @@
cfr.mt_user_id = #{paymentActiveDTO.userId} cfr.mt_user_id = #{paymentActiveDTO.userId}
AND cfr.store_id = #{paymentActiveDTO.storeId} AND cfr.store_id = #{paymentActiveDTO.storeId}
AND cf.type != 1 AND cf.type != 1
AND cf.satisfied_amount <![CDATA[ <= ]]> 350 AND cf.satisfied_amount <![CDATA[ <= ]]> #{paymentActiveDTO.amount}
AND now() BETWEEN cfr.start_time AND now() BETWEEN cfr.start_time
AND cfr.end_time AND cfr.end_time
AND cfr.status = 0 AND cfr.status = 0