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-04-09 16:01:14 +08:00
parent 708b48c886
commit 46a0106ab7
5 changed files with 18 additions and 3 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

@ -602,6 +602,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
canUserCardFavorableList.add(cardFavorableRecordVO);
}else if(!paymentActiveDTO.getType().equals("0")){
canUserCardFavorableList.add(cardFavorableRecordVO);
}else if (paymentActiveDTO.getType().equals("0") && ObjectUtils.isEmpty(cardFavorableRecordVO.getExclusiveFunction())){
canUserCardFavorableList.add(cardFavorableRecordVO);
}
}
/* if () {
@ -665,6 +667,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
}else if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && !cardFavorableRecordVO.getExclusiveFunction().contains("2")){
cardFavorableRecordVOS.add(cardFavorableRecordVO);
}else if (StringUtils.isEmpty(cardFavorableRecordVO.getExclusiveFunction())){
cardFavorableRecordVOS.add(cardFavorableRecordVO);
}
}
}

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

@ -123,7 +123,7 @@
LEFT JOIN card_exchange ce ON cer.card_exchange_id = ce.id
WHERE
cer.mt_user_id = #{cardFavorableDTOS.id}
and ce.type = 0
and ce.type = 0 or ce.type = 1
<if test="cardFavorableDTOS.useStatus!=null and cardFavorableDTOS.useStatus != ''">
and cer.status = #{cardFavorableDTOS.useStatus}
</if>

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

@ -301,7 +301,12 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
}
cardFavorableService.updateById(cardFavorable);
cardFavorableRecord.setSatisfiedAmount(cardFavorable.getSatisfiedAmount());
if (cardFavorable.getDiscountType().equals("1")){
double v = cardFavorable.getSatisfiedAmount() * (1 - (cardFavorable.getSpecialDiscount() * 0.1));
cardFavorableRecord.setDiscountAmount(v);
}else {
cardFavorableRecord.setDiscountAmount(cardFavorable.getDiscountAmount());
}
return save(cardFavorableRecord);
}

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

@ -948,7 +948,12 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
}
}
cardFavorableRecord.setSatisfiedAmount(cardValueVoucher.getSatisfiedAmount());
if (cardValueVoucher.getDiscountType().equals("1")){
double v = cardValueVoucher.getSatisfiedAmount() * (1 - (cardValueVoucher.getSpecialDiscount() * 0.1));
cardFavorableRecord.setDiscountAmount(v);
}else {
cardFavorableRecord.setDiscountAmount(cardValueVoucher.getDiscountAmount());
}
cardFavorableRecordService.save(cardFavorableRecord);
}
/*

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -485,6 +485,7 @@
where ac.store_id = #{storeId}
and ac.status = 0
and ac.participation_condition_money &lt;= #{amount}
and ac.active_end_time > CURRENT_TIMESTAMP
group by ac.id
</select>
<select id="orderStatistics" resultType="java.util.Map">