This commit is contained in:
齐天大圣 2024-03-08 16:38:35 +08:00
parent dcb164e4fc
commit e59375cc91
2 changed files with 26 additions and 0 deletions

View File

@ -120,6 +120,9 @@ public class CardFuelDieselServiceImpl extends ServiceImpl<CardFuelDieselMapper,
List<CardFuelDiesel> records = page1.getRecords();
ArrayList<CardFuelDiesel> cardFuelDiesels = new ArrayList<>();
for (CardFuelDiesel record : records) {
OilNumber oilPrice = oilNumberService.getOilPrice(Integer.parseInt(record.getOilType()));
record.setGbPrice(oilPrice.getGbPrice());
record.setOilPrice(oilPrice.getOilPrice());
OilName oilName = oilNameService.selectOilNameById(Integer.parseInt(record.getOilType()));
record.setOilType(oilName.getOilName());
Date startTime = record.getStartTime();

View File

@ -0,0 +1,23 @@
package com.fuint.business.marketingActivity.cardFule.vo;
import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class CardFuelDieselVO extends CardFuelDiesel implements Serializable {
//活动描述
private String discountActiveDescribe;
//活动时间
private String time;
//参与油品
private String oilName;
//积分
private Integer points;
//成长值
private Integer growaValue;
//可用用户
private String adaptUserType;
}