diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/MtUserFuelMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/MtUserFuelMapper.xml index 185792fcb..66ce7a8bf 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/MtUserFuelMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/MtUserFuelMapper.xml @@ -29,6 +29,17 @@ - + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 7a0685518..a996f5c12 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -33,8 +33,10 @@ import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableR import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableService; import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableVO; import com.fuint.business.marketingActivity.cardFule.dto.CardFuelRecordDTO; +import com.fuint.business.marketingActivity.cardFule.entity.CardFuelChange; import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel; import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord; +import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelChangeMapper; import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelRecordMapper; import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService; import com.fuint.business.marketingActivity.cardFule.service.CardFuelRecordService; @@ -62,6 +64,7 @@ import com.fuint.business.order.service.GrowthValueChangeService; import com.fuint.business.petrolStationManagement.entity.OilGun; import com.fuint.business.petrolStationManagement.entity.OilName; import com.fuint.business.petrolStationManagement.entity.OilTank; +import com.fuint.business.petrolStationManagement.service.OilNameService; import com.fuint.business.store.entity.MtStore; import com.fuint.business.store.mapper.MtStoreMapper; import com.fuint.business.storeInformation.entity.LJStore; @@ -1452,6 +1455,11 @@ public class CardValueRecordServiceImpl extends ServiceImpl { BigDecimal selectSumFuelAmountByStoreIds(@Param("storeIds") List storeIds); List selectUserFuelAndOilName(@Param("obj")LJUserVo userVo); + + MtUserFuel getFuelAmountByUserId(@Param("userId")String userId,@Param("oilType")String oilType); }