From 0ab17a93937543b67380f205b5f1eb7ba75f6325 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Mon, 17 Feb 2025 19:06:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=86=99=E7=9C=9F?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/PhotoCategoryController.java | 4 +- .../order/AdvanceOrderController.java | 19 +++++----- .../controller/order/OrderController.java | 37 +++++++------------ .../order/PendingServiceGoodController.java | 20 +++++----- 4 files changed, 33 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/cultural/heritage/controller/book/PhotoCategoryController.java b/src/main/java/com/cultural/heritage/controller/book/PhotoCategoryController.java index e7871f0..1b5c31c 100644 --- a/src/main/java/com/cultural/heritage/controller/book/PhotoCategoryController.java +++ b/src/main/java/com/cultural/heritage/controller/book/PhotoCategoryController.java @@ -214,8 +214,8 @@ public class PhotoCategoryController { * @param commonStringRequest 写真类名 * @return 写真产品列表 */ - @PostMapping("/list/id") - @Operation(summary = "小程序端用户根据写真类别id查询写真产品", description = "参数：无，权限：所有人，方法名：listPhotoProductsByTypeName") + @PostMapping("/list/type") + @Operation(summary = "小程序端用户根据类名查询写真产品", description = "参数：无，权限：所有人，方法名：listPhotoProductsByTypeName") public BaseResponse> listPhotoProductsByTypeName(@RequestBody CommonStringRequest commonStringRequest) { if (commonStringRequest == null || StringUtils.isBlank(commonStringRequest.getType())) { throw new BusinessException(ErrorCode.PARAMS_ERROR); diff --git a/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java b/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java index cd8e908..af3b4fd 100644 --- a/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java +++ b/src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java @@ -24,6 +24,7 @@ import com.cultural.heritage.model.vo.advanceorder.AdvanceOrderVO; import com.cultural.heritage.service.address.ContactsService; import com.cultural.heritage.service.book.AdvanceOrderService; import com.cultural.heritage.service.book.PhotoProductsService; +import com.cultural.heritage.service.common.CommonService; import com.cultural.heritage.service.user.UserService; import com.cultural.heritage.utils.OrderNumberUtils; import io.swagger.v3.oas.annotations.Operation; @@ -63,6 +64,12 @@ public class AdvanceOrderController { private PhotoProductsService photoProductsService; + @Resource + private CommonService commonService; + + + + /** * 小程序端用户创建写真预约订单 * @param addAdvanceOrderRequest 写真预约订单添加请求体 @@ -167,11 +174,7 @@ public class AdvanceOrderController { Page page = advanceOrderService.page(new Page<>(current, pageSize), queryWrapper); // 封装成写真预约订单VO List records = page.getRecords(); - List advanceOrderVOS = records.stream().map(advanceOrder -> { - AdvanceOrderVO advanceOrderVO = new AdvanceOrderVO(); - BeanUtils.copyProperties(advanceOrder, advanceOrderVO); - return advanceOrderVO; - }).toList(); + List advanceOrderVOS = commonService.convertList(records, AdvanceOrderVO.class); Page voPage = new Page<>(); voPage.setRecords(advanceOrderVOS); voPage.setTotal(page.getTotal()); @@ -197,11 +200,7 @@ public class AdvanceOrderController { queryWrapper.eq("userId", userId); List advanceOrderList = advanceOrderService.list(queryWrapper); // 封装成写真预约订单VO - List advanceOrderVOS = advanceOrderList.stream().map(advanceOrder -> { - AdvanceOrderVO advanceOrderVO = new AdvanceOrderVO(); - BeanUtils.copyProperties(advanceOrder, advanceOrderVO); - return advanceOrderVO; - }).toList(); + List advanceOrderVOS = commonService.convertList(advanceOrderList, AdvanceOrderVO.class); return ResultUtils.success(advanceOrderVOS); } diff --git a/src/main/java/com/cultural/heritage/controller/order/OrderController.java b/src/main/java/com/cultural/heritage/controller/order/OrderController.java index c0fc970..7db982f 100644 --- a/src/main/java/com/cultural/heritage/controller/order/OrderController.java +++ b/src/main/java/com/cultural/heritage/controller/order/OrderController.java @@ -23,6 +23,7 @@ import com.cultural.heritage.model.dto.order.capital.OrderMainInfoAddRequest; import com.cultural.heritage.model.dto.snapshot.GoodSnapshot; import com.cultural.heritage.model.entity.*; import com.cultural.heritage.model.vo.order.OrderVO; +import com.cultural.heritage.service.common.CommonService; import com.cultural.heritage.service.good.CartExperienceService; import com.cultural.heritage.service.good.CartRecordService; import com.cultural.heritage.service.good.GoodService; @@ -96,6 +97,11 @@ public class OrderController { + @Resource + private CommonService commonService; + + + /** * 小程序端用户创建常规类（服务类）商品订单 @@ -226,12 +232,7 @@ public class OrderController { Page page = orderService.page(new Page<>(current, pageSize), orderService.getQueryWrapper(orderQueryRequest)); List orders = page.getRecords(); - List orderVOS = orders.stream().map(order -> { - OrderVO orderVO = new OrderVO(); - BeanUtils.copyProperties(order, orderVO); - return orderVO; - }).toList(); - + List orderVOS = commonService.convertList(orders, OrderVO.class); // 封装map集合（键：订单id, 值：订单明细列表） Map> map = new HashMap<>(); @@ -283,10 +284,8 @@ public class OrderController { queryWrapper.orderByDesc("id"); List orders = orderService.list(queryWrapper); - QueryWrapper myOrderItemsQueryWrapper = new QueryWrapper<>(); - List orderIds = orders.stream().map(Order::getId).toList(); - myOrderItemsQueryWrapper.in("orderId", orderIds); - List myOrderItems = orderItemService.list(myOrderItemsQueryWrapper); + // 获取订单明细 + List myOrderItems = commonService.findByFieldInTargetField(orders, orderItemService, Order::getId, "orderId"); // 封装map集合（键：订单id, 值：订单明细列表） Map> map = new HashMap<>(); @@ -303,8 +302,6 @@ public class OrderController { List orderVOS = orders.stream().map(order -> { Long orderId = order.getId(); - QueryWrapper orderItemsQueryWrapper = new QueryWrapper<>(); - orderItemsQueryWrapper.eq("orderId", orderId); List orderItemsList = map.get(orderId); OrderVO orderVO = new OrderVO(); BeanUtils.copyProperties(order, orderVO); @@ -356,9 +353,7 @@ public class OrderController { ThrowUtils.throwIf(order == null, ErrorCode.NOT_FOUND_ERROR, "订单不存在"); OrderVO orderVO = new OrderVO(); BeanUtils.copyProperties(order, orderVO); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("orderId", orderId); - List orderItemsList = orderItemService.list(queryWrapper); + List orderItemsList = commonService.findByFieldEqTargetField("orderId", orderId, orderItemService); orderVO.setOrderItemList(orderItemsList); return ResultUtils.success(orderVO); } @@ -386,18 +381,14 @@ public class OrderController { ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "订单状态更新失败"); // 恢复商品库存 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("orderId", id); - List orderItemsList = orderItemService.list(queryWrapper); + List orderItemsList = commonService.findByFieldEqTargetField("orderId", id, orderItemService); // 获取商品id列表 List goodIds = orderItemsList.stream().map(orderItems -> { GoodSnapshot goodSnapshot = orderItems.getGoodSnapshot(); return goodSnapshot.getId(); }).toList(); - QueryWrapper goodQueryWrapper = new QueryWrapper<>(); - goodQueryWrapper.in("id", goodIds); // 获取商品列表 - List goodList = goodService.list(goodQueryWrapper); + List goodList = commonService.findByFieldInTargetField(goodIds, goodService, g -> g, "id"); // 封装为map集合（键：商品id, 值：库存量）,用来存储购买的商品id对应的购买数量 Map map = new HashMap<>(); for (OrderItems orderItems : orderItemsList) { @@ -458,9 +449,7 @@ public class OrderController { ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "订单状态更新失败"); // 更新服务类商品待处理订单记录 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("orderNumber", order.getOrderNumber()); - List pendingServiceOrderList = pendingServiceOrderService.list(queryWrapper); + List pendingServiceOrderList = commonService.findByFieldEqTargetField("orderNumber", order.getOrderNumber(), pendingServiceOrderService); for (PendingServiceOrder pendingServiceOrder : pendingServiceOrderList) { pendingServiceOrder.setOrderItemStatus(order.getOrderStatus()); } diff --git a/src/main/java/com/cultural/heritage/controller/order/PendingServiceGoodController.java b/src/main/java/com/cultural/heritage/controller/order/PendingServiceGoodController.java index 9f3ee14..5826244 100644 --- a/src/main/java/com/cultural/heritage/controller/order/PendingServiceGoodController.java +++ b/src/main/java/com/cultural/heritage/controller/order/PendingServiceGoodController.java @@ -13,6 +13,7 @@ import com.cultural.heritage.model.entity.PendingServiceGood; import com.cultural.heritage.model.entity.PendingServiceOrder; import com.cultural.heritage.model.vo.order.PendingServiceGoodVO; import com.cultural.heritage.model.vo.order.PendingServiceOrderVO; +import com.cultural.heritage.service.common.CommonService; import com.cultural.heritage.service.order.PendingServiceGoodService; import com.cultural.heritage.service.order.PendingServiceOrderService; import io.swagger.v3.oas.annotations.Operation; @@ -47,6 +48,10 @@ public class PendingServiceGoodController { private PendingServiceOrderService pendingServiceOrderService; + @Resource + private CommonService commonService; + + /** * Web端管理员查询预约情况 @@ -62,17 +67,10 @@ public class PendingServiceGoodController { } QueryWrapper queryWrapper = pendingServiceGoodService.getQueryWrapper(bookingOrderQueryRequest); List pendingServiceGoodList = pendingServiceGoodService.list(queryWrapper); - List pendingGoodIds = pendingServiceGoodList.stream().map(PendingServiceGood::getId).toList(); - QueryWrapper orderQueryWrapper = new QueryWrapper<>(); - orderQueryWrapper.in("pendingId", pendingGoodIds); - List pendingServiceOrderList = pendingServiceOrderService.list(orderQueryWrapper); - - List pendingServiceOrderVOS = pendingServiceOrderList.stream().map(pendingServiceOrder -> { - PendingServiceOrderVO pendingServiceOrderVO = new PendingServiceOrderVO(); - BeanUtils.copyProperties(pendingServiceOrder, pendingServiceOrderVO); - return pendingServiceOrderVO; - }).toList(); - + // 获取服务类待处理订单 + List pendingServiceOrderList = commonService.findByFieldInTargetField(pendingServiceGoodList, pendingServiceOrderService, PendingServiceGood::getId, "pendingId"); + // 封装成服务类待处理订单VO + List pendingServiceOrderVOS = commonService.convertList(pendingServiceOrderList, PendingServiceOrderVO.class); // 封装map集合（键：服务类商品待处理id，值：待处理服务类订单列表） Map> map = new HashMap<>(); for (PendingServiceOrderVO pendingServiceOrderVO : pendingServiceOrderVOS) {