优化
This commit is contained in:
parent
4d2a265541
commit
e261a930df
@ -14,7 +14,6 @@ import com.cdzy.orders.model.dto.req.*;
|
|||||||
import com.cdzy.orders.model.dto.res.*;
|
import com.cdzy.orders.model.dto.res.*;
|
||||||
import com.cdzy.orders.model.entity.EbikeOrderDetails;
|
import com.cdzy.orders.model.entity.EbikeOrderDetails;
|
||||||
import com.cdzy.orders.model.entity.EbikeUserOrders;
|
import com.cdzy.orders.model.entity.EbikeUserOrders;
|
||||||
import com.cdzy.orders.service.EbikeUserService;
|
|
||||||
import com.cdzy.orders.service.UserOrdersService;
|
import com.cdzy.orders.service.UserOrdersService;
|
||||||
import com.cdzy.orders.uitls.NumberUtils;
|
import com.cdzy.orders.uitls.NumberUtils;
|
||||||
import com.cdzy.orders.uitls.RedisUtil;
|
import com.cdzy.orders.uitls.RedisUtil;
|
||||||
@ -25,7 +24,10 @@ import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetDto;
|
|||||||
import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetTimePeriodDto;
|
import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetTimePeriodDto;
|
||||||
import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetWeekDto;
|
import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetWeekDto;
|
||||||
import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
|
import com.ebike.feign.model.res.ResFeignOrderPaymentDto;
|
||||||
import com.ebike.feign.model.rsp.*;
|
import com.ebike.feign.model.rsp.FeignEbikeBikeInfoDto;
|
||||||
|
import com.ebike.feign.model.rsp.FeignEbikeEcuInfo;
|
||||||
|
import com.ebike.feign.model.rsp.FeignEbikeRegionDto;
|
||||||
|
import com.ebike.feign.model.rsp.FeignEbikeSysRoperateset;
|
||||||
import com.mybatisflex.core.query.QueryWrapper;
|
import com.mybatisflex.core.query.QueryWrapper;
|
||||||
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
@ -125,7 +127,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
|
|||||||
//添加借车单量
|
//添加借车单量
|
||||||
Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
|
Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
|
||||||
operateFeignClient.addBorrowing(siteRegionId);
|
operateFeignClient.addBorrowing(siteRegionId);
|
||||||
|
//TODO:改变骑行状态-骑行中
|
||||||
userOrders.setBikeId(bikeInfoDto.getBikeId());
|
userOrders.setBikeId(bikeInfoDto.getBikeId());
|
||||||
String stringBuilder = resGpsDto.getLongitude() + "," + resGpsDto.getLatitude();
|
String stringBuilder = resGpsDto.getLongitude() + "," + resGpsDto.getLatitude();
|
||||||
userOrders.setRidePoint(stringBuilder);
|
userOrders.setRidePoint(stringBuilder);
|
||||||
@ -181,7 +183,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
|
|||||||
//添加还车单量
|
//添加还车单量
|
||||||
Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
|
Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
|
||||||
operateFeignClient.addReturn(siteRegionId);
|
operateFeignClient.addReturn(siteRegionId);
|
||||||
|
//TODO:改变骑行状态-待使用
|
||||||
return userOrders.getOrderId();
|
return userOrders.getOrderId();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -668,11 +670,10 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
|
|||||||
public List<RspOrderDetailsUserList> orderDetailsUserList(ReqOrderDetailsDto params) {
|
public List<RspOrderDetailsUserList> orderDetailsUserList(ReqOrderDetailsDto params) {
|
||||||
String userId = params.getUserId().toString();
|
String userId = params.getUserId().toString();
|
||||||
PageParam pageParam = params.getPageParam();
|
PageParam pageParam = params.getPageParam();
|
||||||
Integer pageNum = pageParam.getPageNum();
|
int pageNum = pageParam.getPageNum();
|
||||||
Integer pageSize = pageParam.getPageSize();
|
int pageSize = pageParam.getPageSize();
|
||||||
Integer offset = (pageNum - 1) * pageSize; // 计算OFFSET
|
Integer offset = (pageNum - 1) * pageSize; // 计算OFFSET
|
||||||
List<RspOrderDetailsUserList> orderDetailsUserList = userOrdersMapper.getOrderDetailsUserList(userId, offset, pageSize);
|
return userOrdersMapper.getOrderDetailsUserList(userId, offset, pageSize);
|
||||||
return orderDetailsUserList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user