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-03-13 11:18:21 +08:00
parent de79de4b58
commit 854a3242bb
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,22 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
//支付金额
cardValueOrders.setAmount(cardValueRecordDTO.getBalance());
cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
}else if(ObjectUtils.isNotEmpty(cardValueRecordDTO.getTypes()) && cardValueRecordDTO.getTypes().equals("0") && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
//查询储值卡信息
cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
cardValueOrders.setCardValueId(cardValue.getId());
cardValueOrders.setRechargeType("1");
cardValueOrders.setBidBalance(cardValue.getBidBalance());
cardValueOrders.setRechargeBalance(cardValue.getRechargeBalance());
if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
cardValueOrders.setGiftBalance(cardValue.getGiftBalance());
}
cardValueOrders.setPoints(cardValue.getPoints());
cardValueOrders.setGrowthValue(cardValue.getGrowthValue());
if (ObjectUtils.isNotEmpty(cardValue.getFringeBenefit())){
cardValueOrders.setFringeBenefit(cardValue.getFringeBenefit());
}
}else {
//查询储值卡信息
cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
@ -244,6 +260,13 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
//支付金额
cardValueOrders.setPayAmount(cardValue.getRechargeBalance());
}
if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance()) && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
//订单金额
BigDecimal add = BigDecimal.valueOf(cardValue.getRechargeBalance()).add(BigDecimal.valueOf(cardValue.getGiftBalance()));
cardValueOrders.setAmount(add.doubleValue() + cardValueRecordDTO.getBalance());
//支付金额
cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
}
//支付金额
//优惠券id
if (ObjectUtils.isNotEmpty(cardValueRecordDTO.getCardFavorableId())){