From ceb9dd1809012bc214d076465dadd5c1bd4e4892 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Wed, 14 May 2025 10:29:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=BF=90=E8=90=A5=E5=8C=BA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/clients/OperateFeignClient.java | 19 ++++++ .../feign/model/res/ReqUserOperateDto.java | 24 ++++++++ .../controller/EbikeRegionController.java | 60 +++++++++++++++++-- .../model/dto/request/ReqUserOperateDto.java | 24 ++++++++ ebike-user/pom.xml | 11 ++++ .../com/cdzy/user/EbikeUserApplication.java | 2 +- .../cdzy/user/controller/StaffController.java | 22 ++++++- 7 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 ebike-feign/src/main/java/com/ebike/feign/model/res/ReqUserOperateDto.java create mode 100644 ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqUserOperateDto.java diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java index 61f0b265..8cb7d9d4 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java +++ b/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java @@ -2,6 +2,7 @@ package com.ebike.feign.clients; import com.cdzy.common.model.EbikeTracking; import com.cdzy.common.model.JsonResult; +import com.ebike.feign.model.res.ReqUserOperateDto; import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetDto; import com.ebike.feign.model.rsp.FeignEbikeRegionDto; import org.springframework.cloud.openfeign.FeignClient; @@ -83,4 +84,22 @@ public interface OperateFeignClient { */ @GetMapping("ebikesysrcostset/getRegionFeeConfigById") JsonResult getRegionFeeConfigById(@RequestParam(name = "operationRegionId") Long operationRegionId); + + /** + * 设置用户所属运营区 + * + * @param reqUserOperateDto + * @return + */ + @PostMapping("ebikeRegion/setUserOperate") + JsonResult setUserOperate(@RequestBody ReqUserOperateDto reqUserOperateDto); + + /** + * 删除用户所属运营区 + * + * @param staffId + * @return + */ + @PostMapping("ebikeRegion/delUserOperate") + JsonResult delUserOperate(@RequestParam("staffId") Long staffId); } diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/res/ReqUserOperateDto.java b/ebike-feign/src/main/java/com/ebike/feign/model/res/ReqUserOperateDto.java new file mode 100644 index 00000000..d37c8a71 --- /dev/null +++ b/ebike-feign/src/main/java/com/ebike/feign/model/res/ReqUserOperateDto.java @@ -0,0 +1,24 @@ +package com.ebike.feign.model.res; + +import com.alibaba.fastjson2.JSONArray; +import lombok.Data; + +import java.util.List; + +/** + * @author:Ding + * @ClassName:ReqUserOperateDto + * @Package:com.cdzy.ebikeoperate.model.dto.request.ReqUserOperateDto + * @Description: + * @CreateDate:2025年05月14日 + * @Version: + **/ +@Data +public class ReqUserOperateDto { + + private Long staffId; + + private List zoneId; + + private Long orgId; +} diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java index 170e03f8..22c9f008 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java @@ -9,10 +9,8 @@ import com.cdzy.ebikeoperate.enums.RegionLevelType; import com.cdzy.ebikeoperate.mapper.EbikeRegionLevelMapper; import com.cdzy.ebikeoperate.mapper.EbikeRegionoperationMapper; import com.cdzy.ebikeoperate.mapper.EbikeSiteTypeMapper; -import com.cdzy.ebikeoperate.model.dto.request.ReqAuthorizeOperationDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto; -import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto; +import com.cdzy.ebikeoperate.mapper.EbikeStaffRegionMapper; +import com.cdzy.ebikeoperate.model.dto.request.*; import com.cdzy.ebikeoperate.model.dto.response.*; import com.cdzy.ebikeoperate.model.pojo.*; import com.cdzy.ebikeoperate.service.EbikeAdministrationZoneService; @@ -31,12 +29,14 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeAdministrationZoneTableDef.EBIKE_ADMINISTRATION_ZONE; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeOperationRegionTableDef.EBIKE_OPERATION_REGION; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeRegionLevelTableDef.EBIKE_REGION_LEVEL; +import static com.cdzy.ebikeoperate.model.pojo.table.EbikeStaffRegionTableDef.EBIKE_STAFF_REGION; /** * 区域控制层。 @@ -70,6 +70,8 @@ public class EbikeRegionController { @Resource private EbikeRegionLevelMapper levelMapper; + @Resource + private EbikeStaffRegionMapper staffRegionMapper; /** * 添加运营区。 @@ -394,4 +396,54 @@ public class EbikeRegionController { Long imageId = siteRegionService.saveImages(multipartFile); return JsonResult.success(imageId); } + + /** + * 设置用户所属运营区 + * + * @param reqUserOperateDto + * @return + */ + @PostMapping("setUserOperate") + public JsonResult setUserOperate(@RequestBody ReqUserOperateDto reqUserOperateDto) { + + try { + QueryWrapper queryWrapper = QueryWrapper.create() + .in(EBIKE_OPERATION_REGION.ZONE_ID.getName(), reqUserOperateDto.getZoneId()) + .and(EBIKE_OPERATION_REGION.ORG_ID.eq(reqUserOperateDto.getOrgId())); + List list = operationRegionService.list(queryWrapper); + queryWrapper.clear(); + queryWrapper.eq(EBIKE_STAFF_REGION.STAFF_ID.getName(), reqUserOperateDto.getStaffId()); + staffRegionMapper.deleteByQuery(queryWrapper); + List staffRegions = new ArrayList<>(); + for (EbikeOperationRegion ebikeOperationRegion : list) { + EbikeStaffRegion region = new EbikeStaffRegion(); + region.setRegionId(ebikeOperationRegion.getOperationRegionId()); + region.setStaffId(reqUserOperateDto.getStaffId()); + staffRegions.add(region); + } + staffRegionMapper.insertBatch(staffRegions); + return JsonResult.success(""); + } catch (Exception e) { + return JsonResult.failed(""); + } + } + + /** + * 删除用户所属运营区 + * + * @param staffId + * @return + */ + @PostMapping("delUserOperate") + public JsonResult delUserOperate(@RequestParam("staffId") Long staffId) { + + try { + QueryWrapper queryWrapper = QueryWrapper.create() + .eq(EBIKE_STAFF_REGION.STAFF_ID.getName(), staffId); + staffRegionMapper.deleteByQuery(queryWrapper); + return JsonResult.success(""); + } catch (Exception e) { + return JsonResult.failed(""); + } + } } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqUserOperateDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqUserOperateDto.java new file mode 100644 index 00000000..f4c7083c --- /dev/null +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqUserOperateDto.java @@ -0,0 +1,24 @@ +package com.cdzy.ebikeoperate.model.dto.request; + +import com.alibaba.fastjson2.JSONArray; +import lombok.Data; + +import java.util.List; + +/** + * @author:Ding + * @ClassName:ReqUserOperateDto + * @Package:com.cdzy.ebikeoperate.model.dto.request.ReqUserOperateDto + * @Description: + * @CreateDate:2025年05月14日 + * @Version: + **/ +@Data +public class ReqUserOperateDto { + + private Long staffId; + + private List zoneId; + + private Long orgId; +} diff --git a/ebike-user/pom.xml b/ebike-user/pom.xml index fc6784cf..531970dc 100644 --- a/ebike-user/pom.xml +++ b/ebike-user/pom.xml @@ -24,6 +24,12 @@ 0.0.1-SNAPSHOT + + com.cdzy + ebike-feign + 0.0.1-SNAPSHOT + + com.mybatis-flex mybatis-flex-spring-boot3-starter @@ -129,6 +135,11 @@ fastjson2 2.0.50 + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + diff --git a/ebike-user/src/main/java/com/cdzy/user/EbikeUserApplication.java b/ebike-user/src/main/java/com/cdzy/user/EbikeUserApplication.java index c0992fb9..d5c10e29 100644 --- a/ebike-user/src/main/java/com/cdzy/user/EbikeUserApplication.java +++ b/ebike-user/src/main/java/com/cdzy/user/EbikeUserApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; -@EnableFeignClients +@EnableFeignClients(basePackages = "com.ebike.feign") @EnableDiscoveryClient @SpringBootApplication @MapperScan("com.cdzy.user.mapper") diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/StaffController.java b/ebike-user/src/main/java/com/cdzy/user/controller/StaffController.java index f502f7ce..87ad5468 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/StaffController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/StaffController.java @@ -17,7 +17,8 @@ import com.cdzy.user.model.vo.StaffIds; import com.cdzy.user.service.StaffRolesService; import com.cdzy.user.service.StaffService; import com.cdzy.user.service.StaffZoneService; -import com.cdzy.user.utils.AESUtils; +import com.ebike.feign.clients.OperateFeignClient; +import com.ebike.feign.model.res.ReqUserOperateDto; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryColumn; import com.mybatisflex.core.query.QueryMethods; @@ -30,7 +31,7 @@ import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -55,6 +56,8 @@ public class StaffController { private StaffZoneService staffZoneService; @Autowired private StaffRolesService staffRolesService; + @Autowired + private OperateFeignClient operateFeignClient; /** * 添加。 @@ -231,17 +234,24 @@ public class StaffController { staffRolesService.saveBatch(roleList); } JSONArray zoneId = staffDto.getZoneId(); + List zoneIds = new ArrayList<>(); List zoneList = IntStream.range(0, zoneId.size()).mapToObj(i -> { StaffZone staffRoles = new StaffZone(); JSONObject jsonObject = zoneId.getJSONObject(i); staffRoles.setZoneId(jsonObject.getLong("zoneId")); staffRoles.setZoneName(jsonObject.getString("zoneName")); staffRoles.setStaffId(staff.getStaffId()); + zoneIds.add(jsonObject.getLong("zoneId")); return staffRoles; }).collect(Collectors.toList()); if (!zoneList.isEmpty()) { staffZoneService.saveBatch(zoneList); } + ReqUserOperateDto reqUserOperateDto = new ReqUserOperateDto(); + reqUserOperateDto.setStaffId(staff.getStaffId()); + reqUserOperateDto.setZoneId(zoneIds); + reqUserOperateDto.setOrgId(staff.getOrgId()); + operateFeignClient.setUserOperate(reqUserOperateDto); return JsonResult.success("保存成功！"); } catch (Exception e) { e.printStackTrace(); @@ -279,17 +289,24 @@ public class StaffController { staffRolesService.saveBatch(roleList); } JSONArray zoneId = staffDto.getZoneId(); + List zoneIds = new ArrayList<>(); List zoneList = IntStream.range(0, zoneId.size()).mapToObj(i -> { StaffZone staffRoles = new StaffZone(); JSONObject jsonObject = zoneId.getJSONObject(i); staffRoles.setZoneId(jsonObject.getLong("zoneId")); staffRoles.setZoneName(jsonObject.getString("zoneName")); staffRoles.setStaffId(staff.getStaffId()); + zoneIds.add(jsonObject.getLong("zoneId")); return staffRoles; }).collect(Collectors.toList()); if (!zoneList.isEmpty()) { staffZoneService.saveBatch(zoneList); } + ReqUserOperateDto reqUserOperateDto = new ReqUserOperateDto(); + reqUserOperateDto.setStaffId(staff.getStaffId()); + reqUserOperateDto.setZoneId(zoneIds); + reqUserOperateDto.setOrgId(staff.getOrgId()); + operateFeignClient.setUserOperate(reqUserOperateDto); return JsonResult.success("保存成功！"); } catch (Exception e) { e.printStackTrace(); @@ -315,6 +332,7 @@ public class StaffController { queryWrapper.eq(STAFF_ZONE.STAFF_ID.getName(), staffId); staffZoneService.remove(queryWrapper); staffService.removeById(staffId); + operateFeignClient.delUserOperate(staffId); return JsonResult.success("删除成功！"); } catch (Exception e) { e.printStackTrace(); From 423acc160e58398ffcdb88a86a9b18a76afefeb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com> Date: Wed, 14 May 2025 10:32:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=EF=BC=88=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9Edto=E6=A0=B9=E6=8D=AE=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeUserOrdersController.java | 14 +++- .../cdzy/orders/mapper/UserOrdersMapper.java | 51 ++++++++++++++ .../dto/res/RspOrderDetailsUserList.java | 66 +++++++++++++++++++ .../orders/service/UserOrdersService.java | 10 +++ .../service/impl/UserOrdersServiceImpl.java | 21 ++++++ 5 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspOrderDetailsUserList.java diff --git a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java index 07021bd8..24444014 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java @@ -5,6 +5,7 @@ import com.cdzy.common.model.PageParam; import com.cdzy.orders.model.dto.req.ReqBikeDto; import com.cdzy.orders.model.dto.req.ReqOrderDto; import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo; +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; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.List; +import java.util.Map; import static com.cdzy.orders.model.entity.table.EbikeUserOrdersTableDef.EBIKE_USER_ORDERS; @@ -236,5 +238,15 @@ public class EbikeUserOrdersController { Page page = userOrdersService.page(pageParam.getPage(), queryWrapper); return JsonResult.success(page); } - + /** + * 根据用户ID获取订单详情列表（带分页。 + * + * @param params 用户Id 和分页信息 + * @ 用户订单表详情 + */ + @PostMapping("orderDetailsUserList") + public JsonResult orderDetailsUserList(@RequestBody Map params) { + List info = userOrdersService.orderDetailsUserList(params); + return JsonResult.success(info); + } } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java b/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java index 1d39ed4c..00eebfaa 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/mapper/UserOrdersMapper.java @@ -1,7 +1,15 @@ package com.cdzy.orders.mapper; +import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo; +import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList; import com.mybatisflex.core.BaseMapper; import com.cdzy.orders.model.entity.EbikeUserOrders; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 用户订单表 映射层。 @@ -11,4 +19,47 @@ import com.cdzy.orders.model.entity.EbikeUserOrders; */ public interface UserOrdersMapper extends BaseMapper { + /** + * 根据用户ID获取订单详情列表（带分页），并根据类型查询（消费或退款）。 + * + * @param userId 用户Id + * @param orderType 订单类型（消费或退款） + * @return 用户订单表详情 + */ + @Select("") + @Results({ + @Result(property = "orderId", column = "order_id"), + @Result(property = "userId", column = "user_id"), + @Result(property = "status", column = "status"), + @Result(property = "startTime", column = "start_time"), + @Result(property = "endTime", column = "end_time"), + @Result(property = "ridingDuration", column = "riding_duration"), + @Result(property = "statusName", column = "status_name"), + @Result(property = "createdAt", column = "created_at"), + @Result(property = "totalAmount", column = "total_amount"), + @Result(property = "bikeCode", column = "bike_code") + }) + List getOrderDetailsUserList(@Param("userId") String userId, + @Param("orderType") String orderType, + @Param("offset") Integer offset, + @Param("pageSize") Integer pageSize); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspOrderDetailsUserList.java b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspOrderDetailsUserList.java new file mode 100644 index 00000000..9b6ddf4b --- /dev/null +++ b/ebike-orders/src/main/java/com/cdzy/orders/model/dto/res/RspOrderDetailsUserList.java @@ -0,0 +1,66 @@ +package com.cdzy.orders.model.dto.res; + +import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 用户订单详情响应DTO + */ +@Data +public class RspOrderDetailsUserList { + + /** + * 分布式ID（雪花算法或业务前缀+序列） + */ + private Long orderId; + + /** + * 用户ID，关联用户表 + */ + private Long userId; + + /** + * 订单状态（进行中、已取消、待支付、已支付、退款中、已退款） + */ + private String status; + /** + * 订单状态（进行中、已取消、待支付、已支付、退款中、已退款） + */ + private String statusName; + + /** + * 订单开始时间 + */ + private Date startTime; + + /** + * 订单结束时间 + */ + private Date endTime; + + /** + * 订单骑行时长（分钟） + */ + private String ridingDuration; + + /** + * 订单创建时间 + */ + private Date createdAt; + + /** + * 订单总金额 + */ + private BigDecimal totalAmount; + + /** + * 订单关联的车辆编码 + */ + private String bikeCode; + + /** + * 其他需要返回的字段，可以根据需要添加 + */ + // 可根据需要添加其他字段，如订单类型、支付方式等 +} diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java b/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java index 2106bedb..3ab0a228 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/service/UserOrdersService.java @@ -3,6 +3,7 @@ package com.cdzy.orders.service; import com.cdzy.orders.model.dto.req.ReqBikeDto; import com.cdzy.orders.model.dto.req.ReqOrderDto; import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo; +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.ebike.feign.model.rsp.EbikePaymentDto; @@ -11,6 +12,7 @@ import com.cdzy.orders.model.entity.EbikeUserOrders; import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * 用户订单表 服务层。 @@ -116,4 +118,12 @@ public interface UserOrdersService extends IService { * @return 支付信息 */ EbikePaymentDto paymentDetailsInfo(Long orderId); + + /** + * 根据用户ID获取订单详情列表（带分页。 + * + * @param params 用户Id + * @ 用户订单表详情 + */ + List orderDetailsUserList(Map params); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java index 6ad05561..00faad69 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java @@ -1,5 +1,6 @@ package com.cdzy.orders.service.impl; +import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson2.JSONObject; import com.cdzy.common.enums.Code; import com.cdzy.common.model.JsonResult; @@ -14,6 +15,7 @@ import com.cdzy.orders.model.dto.req.ReqOrderDto; import com.cdzy.orders.model.dto.res.RedisPoint; import com.cdzy.orders.model.dto.res.RspBikeDto; import com.cdzy.orders.model.dto.res.RspOrderDetailsInfo; +import com.cdzy.orders.model.dto.res.RspOrderDetailsUserList; import com.cdzy.orders.model.entity.EbikeOrderDetails; import com.cdzy.orders.model.entity.EbikeUser; import com.cdzy.orders.model.entity.EbikeUserOrders; @@ -40,6 +42,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import static com.cdzy.orders.enums.TimeDivisionCharging.TIME_SLOT; @@ -657,4 +660,22 @@ public class UserOrdersServiceImpl extends ServiceImpl orderDetailsUserList(Map params) { + String userId = MapUtil.getStr(params,"userId"); + Map pageParam = ( Map)params.get("pageParam"); + Integer pageNum= MapUtil.getInt(pageParam,"pageNum"); + Integer pageSize= MapUtil.getInt(pageParam,"pageSize"); + String orderType = ""; //consumption 消费 refund 退款 + orderType= MapUtil.getStr(pageParam,"orderType"); + Integer offset = (pageNum - 1) * pageSize; // 计算OFFSET + List orderDetailsUserList = userOrdersMapper.getOrderDetailsUserList(userId,orderType,offset,pageSize); + return orderDetailsUserList; + } }