attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

停车信息缓存

Browse Source
This commit is contained in:
attiya 2025-05-16 16:09:44 +08:00
parent dd7403ae0e
commit 2eeb6e98e4
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
View File

@ -93,4 +93,19 @@ public class ResGPSDto {
* ecuSn * ecuSn
*/ */
private String ecuSn; private String ecuSn;
/**
* 是否在运营区（记录最后一次停车
*/
private Boolean inOperation;
/**
* 是否在停车区（记录最后一次停车
*/
private Boolean inParking;
/**
* 最后一次还车时间
*/
private Number latestTimestamp;
} }

5
ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
View File

@ -5,12 +5,12 @@ import com.cdzy.common.model.PageParam;
import com.cdzy.orders.model.dto.req.ReqBikeDto; import com.cdzy.orders.model.dto.req.ReqBikeDto;
import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto; import com.cdzy.orders.model.dto.req.ReqOrderDetailsDto;
import com.cdzy.orders.model.dto.req.ReqOrderDto; import com.cdzy.orders.model.dto.req.ReqOrderDto;
import com.cdzy.orders.model.dto.res.RspBikeDto;
import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo; import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo;
import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList; import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList;
import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
import com.cdzy.orders.model.dto.res.RspBikeDto;
import com.cdzy.orders.model.entity.EbikeUserOrders; import com.cdzy.orders.model.entity.EbikeUserOrders;
import com.cdzy.orders.service.UserOrdersService; import com.cdzy.orders.service.UserOrdersService;
import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
import com.ebike.feign.model.rsp.EbikePaymentDto; import com.ebike.feign.model.rsp.EbikePaymentDto;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map;
import static com.cdzy.orders.model.entity.table.EbikeUserOrdersTableDef.EBIKE_USER_ORDERS; import static com.cdzy.orders.model.entity.table.EbikeUserOrdersTableDef.EBIKE_USER_ORDERS;

6
ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.cdzy.orders.service.impl; package com.cdzy.orders.service.impl;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.cdzy.common.enums.Code; import com.cdzy.common.enums.Code;
import com.cdzy.common.model.JsonResult; import com.cdzy.common.model.JsonResult;
@ -44,7 +43,6 @@ import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import static com.cdzy.orders.enums.TimeDivisionCharging.TIME_SLOT; import static com.cdzy.orders.enums.TimeDivisionCharging.TIME_SLOT;
@ -473,6 +471,10 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
list.add(orderDetails); list.add(orderDetails);
totalAmount = totalAmount.add(operationAreaSchedulingFee); totalAmount = totalAmount.add(operationAreaSchedulingFee);
} }
resGpsDto.setInOperation(pointInOperation);
resGpsDto.setInParking(pointInParking);
resGpsDto.setLatestTimestamp(System.currentTimeMillis());
redisUtil.set(resGpsDto.getEcuSn(),regionDto);
//时长费用计算(已知超出免费时长 //时长费用计算(已知超出免费时长
Character timeDivisionCharging = feignEbikeSysRcostsetDto.getTimeDivisionCharging(); Character timeDivisionCharging = feignEbikeSysRcostsetDto.getTimeDivisionCharging();
BigDecimal decimal = switch (timeDivisionCharging) { BigDecimal decimal = switch (timeDivisionCharging) {