guoshuai il y a 1 mois
Parent
commit
92edd4d126

+ 7 - 0
src/main/java/com/qmrb/system/service/ICarParkChargingRulesService.java

@@ -1,5 +1,6 @@
 package com.qmrb.system.service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,5 +38,11 @@ public interface ICarParkChargingRulesService extends IService<CarParkChargingRu
 	/**获取表单数据
 	 * */
 	public CarParkChargingRulesForm getFormData(Long id);
+
+	/**
+	 * 计算费用
+	 * @return
+	 */
+	public BigDecimal calcuExpenses(Long recordId,Long userId);
 	
 }

+ 30 - 5
src/main/java/com/qmrb/system/service/impl/CarParkChargingRulesServiceImpl.java

@@ -1,11 +1,13 @@
 package com.qmrb.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.qmrb.system.pojo.entity.CarParkStoredCard;
+import com.qmrb.system.service.IBarnRecordService;
+import com.qmrb.system.service.ICarParkStoredCardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -39,6 +41,13 @@ public class CarParkChargingRulesServiceImpl extends ServiceImpl<CarParkCharging
 
 	@Autowired
 	private CarParkChargingRulesConverter converter;
+	
+	@Autowired
+	private ICarParkStoredCardService parkStoredCardService;
+	
+	@Autowired
+	private IBarnRecordService barnRecordService;
+	
 
 	/**分页查询
 	 * */
@@ -96,5 +105,21 @@ public class CarParkChargingRulesServiceImpl extends ServiceImpl<CarParkCharging
         CarParkChargingRulesForm form = converter.entity2Form(entity);
         return form;
 	}
-	
+
+	/**
+	 * 根据停车记录计算费用
+	 * @param recordId
+	 * @param userId
+	 * @return
+	 */
+	@Override
+	public BigDecimal calcuExpenses(Long recordId, Long userId) {
+		// 查询当前用户是否有月卡
+		List<CarParkStoredCard> list = parkStoredCardService.list(new LambdaQueryWrapper<CarParkStoredCard>().eq(CarParkStoredCard::getUserId, userId).ge(CarParkStoredCard::getEndTime, LocalDateTime.now()));
+		if(CollectionUtil.isNotEmpty(list)){
+			
+		}
+		return null;
+	}
+
 }

+ 7 - 2
src/main/java/com/qmrb/system/service/impl/MyCarPlateNumberServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -49,10 +50,14 @@ public class MyCarPlateNumberServiceImpl extends ServiceImpl<MyCarPlateNumberMap
         int pageSize = queryParams.getPageSize();
         //String keywords = queryParams.getKeywords();
 
-        // 查询数据
+		LambdaQueryWrapper<MyCarPlateNumber> queryWrapper = new LambdaQueryWrapper<>();
+		if(queryParams.getUserId() != null){
+			queryWrapper.eq(MyCarPlateNumber::getUserId,queryParams.getUserId());
+		}
+		// 查询数据
         Page<MyCarPlateNumber> dictItemPage = this.page(
                 new Page<>(pageNum, pageSize),
-                new LambdaQueryWrapper<MyCarPlateNumber>()
+				queryWrapper
         );
 
         // 实体转换