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-15 15:40:37 +08:00
parent bebc6798da
commit 36bc1495bd
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -636,7 +636,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
oilBalanceChange.setChangeType("1"); oilBalanceChange.setChangeType("1");
oilBalanceChange.setFromType("囤油卡充值"); oilBalanceChange.setFromType("囤油卡充值");
oilBalanceChange.setOilBalance(cardFuleOrders.getIncomeLitres()); oilBalanceChange.setOilBalance(cardFuleOrders.getIncomeLitres());
oilBalanceChange.setType(cardFuleOrders.getType()); oilBalanceChange.setType(cardFuleOrders.getType()+" "+cardFuleOrders.getOilName());
oilBalanceChange.setOrderNo(cardFuleOrders.getOrderNo()); oilBalanceChange.setOrderNo(cardFuleOrders.getOrderNo());
oilBalanceChange.setOilType(cardFuleOrders.getOilType()); oilBalanceChange.setOilType(cardFuleOrders.getOilType());
oilBalanceChangeService.save(oilBalanceChange); oilBalanceChangeService.save(oilBalanceChange);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.cardValue.dto; package com.fuint.business.marketingActivity.cardValue.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
import lombok.Data; import lombok.Data;
@ -27,6 +28,7 @@ public class CardValueRecordDTO extends CardValueRecord {
private String paymentType; private String paymentType;
private String payStatus; private String payStatus;
private String types; private String types;
@JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
private Date expireTime; private Date expireTime;
// /** // /**

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

@ -132,6 +132,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
private ILJStoreService storeService; private ILJStoreService storeService;
@Resource @Resource
private MtUserGradeChildService userGradeChildService; private MtUserGradeChildService userGradeChildService;
@Resource
private GrowthValueChangeService growthValueChangeService;
/** /**
* 储值卡充值（新增） * 储值卡充值（新增）
@ -482,12 +484,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
@Resource @Resource
CardValueChildService cardValueChildService; CardValueChildService cardValueChildService;
@Resource @Resource
CardValueChildMapper cardValueChildMapper; CardValueChildMapper cardValueChildMapper;
@Resource
GrowthValueChangeService growthValueChangeService;
/** /**
* 查询支付状态 修改相关关联表 * 查询支付状态 修改相关关联表
* @param id * @param id
@ -987,7 +986,32 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
//成长值记录
GrowthValueChange growthValueChange = new GrowthValueChange();
growthValueChange.setUserId(cardValueOrders.getMtUserId());
growthValueChange.setChainStoreId(cardValueOrders.getChainStoreId());
growthValueChange.setStoreId(cardValueOrders.getStoreId());
growthValueChange.setChangeType("1");
growthValueChange.setFromType("储值卡充值");
growthValueChange.setGrowthValue(cardValueOrders.getGrowthValue());
if (ObjectUtils.isNotEmpty(userBalance) && ObjectUtils.isNotEmpty(userBalance.getGrowthValue())){
growthValueChange.setAfterTheChange(userBalance.getGrowthValue() + cardValueOrders.getGrowthValue());
}
growthValueChange.setOrderNo(cardValueOrders.getOrderNo());
growthValueChangeService.insertGrowthValueChange(growthValueChange);
//积分表变动
if (ObjectUtils.isNotEmpty(userBalance) && ObjectUtils.isNotEmpty(userBalance.getPoints()) && ObjectUtils.isNotEmpty(cardValueOrders.getPoints())) {
IntegralDetail integralDetail = new IntegralDetail();
integralDetail.setStoreId(cardValueRecord.getStoreId());
integralDetail.setChainStoreId(cardValueRecord.getChainStoreId());
integralDetail.setCreateBy(cardValueRecord.getMtStaffId().toString());
integralDetail.setPointsChange(Double.valueOf(cardValueOrders.getPoints()));
integralDetail.setCurrentPoints(userBalance.getPoints() + cardValueOrders.getPoints());
integralDetail.setChangeType("1");
integralDetail.setChangeReason("储值卡充值");
integralDetailService.insert2(integralDetail);
}
//生成充值记录 //生成充值记录
cardValueRecord.setMtUserId(cardValueOrders.getMtUserId()); cardValueRecord.setMtUserId(cardValueOrders.getMtUserId());
cardValueRecord.setName(cardValueOrders.getName()); cardValueRecord.setName(cardValueOrders.getName());