admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新了写真预约模块

Browse Source
This commit is contained in:
chen-xin-zhi 2025-02-17 19:06:42 +08:00
parent 7c3007a299
commit 0ab17a9393
4 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cultural/heritage/controller/book/PhotoCategoryController.java
View File

@ -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<List<PhotoProductsVO>> listPhotoProductsByTypeName(@RequestBody CommonStringRequest commonStringRequest) {
if (commonStringRequest == null || StringUtils.isBlank(commonStringRequest.getType())) {
throw new BusinessException(ErrorCode.PARAMS_ERROR);

19
src/main/java/com/cultural/heritage/controller/order/AdvanceOrderController.java
View File

@ -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<AdvanceOrder> page = advanceOrderService.page(new Page<>(current, pageSize), queryWrapper);
// 封装成写真预约订单VO
List<AdvanceOrder> records = page.getRecords();
List<AdvanceOrderVO> advanceOrderVOS = records.stream().map(advanceOrder -> {
AdvanceOrderVO advanceOrderVO = new AdvanceOrderVO();
BeanUtils.copyProperties(advanceOrder, advanceOrderVO);
return advanceOrderVO;
}).toList();
List<AdvanceOrderVO> advanceOrderVOS = commonService.convertList(records, AdvanceOrderVO.class);
Page<AdvanceOrderVO> voPage = new Page<>();
voPage.setRecords(advanceOrderVOS);
voPage.setTotal(page.getTotal());
@ -197,11 +200,7 @@ public class AdvanceOrderController {
queryWrapper.eq("userId", userId);
List<AdvanceOrder> advanceOrderList = advanceOrderService.list(queryWrapper);
// 封装成写真预约订单VO
List<AdvanceOrderVO> advanceOrderVOS = advanceOrderList.stream().map(advanceOrder -> {
AdvanceOrderVO advanceOrderVO = new AdvanceOrderVO();
BeanUtils.copyProperties(advanceOrder, advanceOrderVO);
return advanceOrderVO;
}).toList();
List<AdvanceOrderVO> advanceOrderVOS = commonService.convertList(advanceOrderList, AdvanceOrderVO.class);
return ResultUtils.success(advanceOrderVOS);
}

37
src/main/java/com/cultural/heritage/controller/order/OrderController.java
View File

@ -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<Order> page = orderService.page(new Page<>(current, pageSize),
orderService.getQueryWrapper(orderQueryRequest));
List<Order> orders = page.getRecords();
List<OrderVO> orderVOS = orders.stream().map(order -> {
OrderVO orderVO = new OrderVO();
BeanUtils.copyProperties(order, orderVO);
return orderVO;
}).toList();
List<OrderVO> orderVOS = commonService.convertList(orders, OrderVO.class);
// 封装map集合（键：订单id, 值：订单明细列表）
Map<Long, List<OrderItems>> map = new HashMap<>();
@ -283,10 +284,8 @@ public class OrderController {
queryWrapper.orderByDesc("id");
List<Order> orders = orderService.list(queryWrapper);
QueryWrapper<OrderItems> myOrderItemsQueryWrapper = new QueryWrapper<>();
List<Long> orderIds = orders.stream().map(Order::getId).toList();
myOrderItemsQueryWrapper.in("orderId", orderIds);
List<OrderItems> myOrderItems = orderItemService.list(myOrderItemsQueryWrapper);
// 获取订单明细
List<OrderItems> myOrderItems = commonService.findByFieldInTargetField(orders, orderItemService, Order::getId, "orderId");
// 封装map集合（键：订单id, 值：订单明细列表）
Map<Long, List<OrderItems>> map = new HashMap<>();
@ -303,8 +302,6 @@ public class OrderController {
List<OrderVO> orderVOS = orders.stream().map(order -> {
Long orderId = order.getId();
QueryWrapper<OrderItems> orderItemsQueryWrapper = new QueryWrapper<>();
orderItemsQueryWrapper.eq("orderId", orderId);
List<OrderItems> 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<OrderItems> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("orderId", orderId);
List<OrderItems> orderItemsList = orderItemService.list(queryWrapper);
List<OrderItems> 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<OrderItems> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("orderId", id);
List<OrderItems> orderItemsList = orderItemService.list(queryWrapper);
List<OrderItems> orderItemsList = commonService.findByFieldEqTargetField("orderId", id, orderItemService);
// 获取商品id列表
List<Long> goodIds = orderItemsList.stream().map(orderItems -> {
GoodSnapshot goodSnapshot = orderItems.getGoodSnapshot();
return goodSnapshot.getId();
}).toList();
QueryWrapper<Good> goodQueryWrapper = new QueryWrapper<>();
goodQueryWrapper.in("id", goodIds);
// 获取商品列表
List<Good> goodList = goodService.list(goodQueryWrapper);
List<Good> goodList = commonService.findByFieldInTargetField(goodIds, goodService, g -> g, "id");
// 封装为map集合（键：商品id, 值：库存量）,用来存储购买的商品id对应的购买数量
Map<Long, Integer> map = new HashMap<>();
for (OrderItems orderItems : orderItemsList) {
@ -458,9 +449,7 @@ public class OrderController {
ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR, "订单状态更新失败");
// 更新服务类商品待处理订单记录
QueryWrapper<PendingServiceOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("orderNumber", order.getOrderNumber());
List<PendingServiceOrder> pendingServiceOrderList = pendingServiceOrderService.list(queryWrapper);
List<PendingServiceOrder> pendingServiceOrderList = commonService.findByFieldEqTargetField("orderNumber", order.getOrderNumber(), pendingServiceOrderService);
for (PendingServiceOrder pendingServiceOrder : pendingServiceOrderList) {
pendingServiceOrder.setOrderItemStatus(order.getOrderStatus());
}

20
src/main/java/com/cultural/heritage/controller/order/PendingServiceGoodController.java
View File

@ -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<PendingServiceGood> queryWrapper = pendingServiceGoodService.getQueryWrapper(bookingOrderQueryRequest);
List<PendingServiceGood> pendingServiceGoodList = pendingServiceGoodService.list(queryWrapper);
List<Long> pendingGoodIds = pendingServiceGoodList.stream().map(PendingServiceGood::getId).toList();
QueryWrapper<PendingServiceOrder> orderQueryWrapper = new QueryWrapper<>();
orderQueryWrapper.in("pendingId", pendingGoodIds);
List<PendingServiceOrder> pendingServiceOrderList = pendingServiceOrderService.list(orderQueryWrapper);
List<PendingServiceOrderVO> pendingServiceOrderVOS = pendingServiceOrderList.stream().map(pendingServiceOrder -> {
PendingServiceOrderVO pendingServiceOrderVO = new PendingServiceOrderVO();
BeanUtils.copyProperties(pendingServiceOrder, pendingServiceOrderVO);
return pendingServiceOrderVO;
}).toList();
// 获取服务类待处理订单
List<PendingServiceOrder> pendingServiceOrderList = commonService.findByFieldInTargetField(pendingServiceGoodList, pendingServiceOrderService, PendingServiceGood::getId, "pendingId");
// 封装成服务类待处理订单VO
List<PendingServiceOrderVO> pendingServiceOrderVOS = commonService.convertList(pendingServiceOrderList, PendingServiceOrderVO.class);
// 封装map集合（键：服务类商品待处理id，值：待处理服务类订单列表）
Map<Long, List<PendingServiceOrderVO>> map = new HashMap<>();
for (PendingServiceOrderVO pendingServiceOrderVO : pendingServiceOrderVOS) {