From 2350df80a317815922de347f503af5dfa0de2756 Mon Sep 17 00:00:00 2001 From: "1304317391@qq.com" Date: Tue, 29 Nov 2022 19:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStoreOrderServiceImpl.java | 156 +++++++++++++++++- 1 file changed, 148 insertions(+), 8 deletions(-) diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 52a14a35..ec9230e6 100644 --- a/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/zsw-bxg/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -2465,25 +2465,165 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl storeOrderDTOS = new ArrayList<>(); for (YxStoreOrder yxStoreOrder : page.getList()) { this.orderList(storeOrderDTOS, yxStoreOrder); - } +// List list=this.newAssemble(page.getList()); Map map = new LinkedHashMap<>(2); map.put("content", storeOrderDTOS); +// map.put("content", list); map.put("totalElements", page.getTotal()); return map; } + + /** + * @param orderList 订单列表 + * @return 组装后的订单列表 + */ + private List newAssemble(List orderList){ + //返回的数据List + List dtoList = new ArrayList<>(); + if (!orderList.isEmpty()){ + //店铺名id + List storeIdList = orderList.stream().filter(item -> item.getStoreId() > 0) + .map(YxStoreOrder::getStoreId).collect(Collectors.toList()); + List systemStoreList = storeIdList.isEmpty() ? new ArrayList<>() : systemStoreService.listByIds(storeIdList); + + //购物车 + List orderIdList = orderList.stream().map(YxStoreOrder::getId).collect(Collectors.toList()); + List cartInfoList = orderIdList.isEmpty() ? new ArrayList<>() : + storeOrderCartInfoService.list( + new LambdaQueryWrapper().in(YxStoreOrderCartInfo::getOid, orderIdList)); + + //用户id + List uidList = orderList.stream().map(YxStoreOrder::getUid).collect(Collectors.toList()); + List userList = uidList.isEmpty() ? new ArrayList<>() : userService.listByIds(uidList); + + dtoList = generator.convert(orderList, YxStoreOrderDto.class); + + //订单类型处理 + Map orderTypeMap = this.assembleOrderType(dtoList); + + //返回的数据List + + for (YxStoreOrderDto yxStoreOrderDto : dtoList) { + Integer _status = OrderUtil.orderStatus(yxStoreOrderDto.getPaid(), yxStoreOrderDto.getStatus(), + yxStoreOrderDto.getRefundStatus()); + + //订单状态 + String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrderDto.getPaid() + , yxStoreOrderDto.getStatus(), yxStoreOrderDto.getShippingType() + , yxStoreOrderDto.getRefundStatus()); + + //订单匹配店铺名 + systemStoreList.stream().filter(item -> item.getId() == yxStoreOrderDto.getStoreId()).findAny() + .ifPresent(store -> { + yxStoreOrderDto.setStoreName(store.getName()); + }); + + if (_status == 3) { + String refundTime = DateUtil.formatDateTime(yxStoreOrderDto.getRefundReasonTime()); + String str = "申请退款
" + + "退款原因：" + yxStoreOrderDto.getRefundReasonWap() + "
" + + "备注说明：" + yxStoreOrderDto.getRefundReasonWapExplain() + "
" + + "退款时间：" + refundTime + "
"; + orderStatusStr = str; + } + + yxStoreOrderDto.setStatusName(orderStatusStr); + + yxStoreOrderDto.set_status(_status); + + //支付类型 + String payTypeName = OrderUtil.payTypeName(yxStoreOrderDto.getPayType(), yxStoreOrderDto.getPaid()); + yxStoreOrderDto.setPayTypeName(payTypeName); + + //订单类型处理 + yxStoreOrderDto.setPinkName(orderTypeMap.get(yxStoreOrderDto.getId()).isEmpty() ? + this.orderType(yxStoreOrderDto.getId() + , yxStoreOrderDto.getPinkId(), yxStoreOrderDto.getCombinationId() + , yxStoreOrderDto.getSeckillId(), yxStoreOrderDto.getBargainId(), + yxStoreOrderDto.getShippingType(), yxStoreOrderDto.getPayIntegral()) + : orderTypeMap.get(yxStoreOrderDto.getId())); + + //购物车 + List orderCartList = cartInfoList.stream().filter(item -> item.getOid().equals(yxStoreOrderDto.getId())).collect(Collectors.toList()); + List cartInfoDTOS = new ArrayList<>(); + for (YxStoreOrderCartInfo cartInfo : orderCartList) { + StoreOrderCartInfoDto cartInfoDTO = new StoreOrderCartInfoDto(); + cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo())); + cartInfoDTOS.add(cartInfoDTO); + } + yxStoreOrderDto.setCartInfoList(cartInfoDTOS); + + //用户信息 + userList.stream().filter(item -> item.getUid().equals(yxStoreOrderDto.getUid())).findFirst() + .ifPresent(user ->{ + yxStoreOrderDto.setUserDTO(generator.convert(user, YxUserDto.class)); + }); + if (yxStoreOrderDto.getUserDTO() == null) { + yxStoreOrderDto.setUserDTO(new YxUserDto()); + } + } + + } + return dtoList; + } + + + private Map assembleOrderType(List dtoList) { + Map map = new HashMap<>(); + List storePinkIdList = dtoList.stream().filter(item -> item.getPinkId() > 0 || item.getCombinationId() > 0).collect(Collectors.toList()); + List storePinkList = storePinkIdList.isEmpty() ? new ArrayList<>() : + storePinkService.list(Wrappers.lambdaQuery().in(YxStorePink::getOrderIdKey, storePinkIdList)); + for (YxStoreOrderDto dto : dtoList) { + String str = "[普通订单]"; + if (dto.getPinkId() > 0 || dto.getCombinationId() > 0) { + Optional pink = storePinkList.stream().filter(item -> item.getOrderIdKey().equals(dto.getId())).findFirst(); + if (pink.isPresent()){ + YxStorePink storePink = pink.get(); + if (OrderInfoEnum.PINK_STATUS_1.getValue().equals(storePink.getStatus())) { + str = "[拼团订单]拼团进行中"; + } else if (OrderInfoEnum.PINK_STATUS_2.getValue().equals(storePink.getStatus())) { + str = "[拼团订单]拼团完成"; + } else if (OrderInfoEnum.PINK_STATUS_3.getValue().equals(storePink.getStatus())) { + str = "[拼团订单]拼团失败"; + } else { + str = "[拼团订单]历史订单"; + } + }else { + str = "[拼团订单]"; + } + }else if (dto.getSeckillId() > 0) { + str = "[秒杀订单]"; + } else if (dto.getBargainId() > 0) { + str = "[砍价订单]"; + } + + if (OrderInfoEnum.SHIPPIING_TYPE_2.getValue().equals(dto.getShippingType())) { + str = "[核销订单]"; + } + if (dto.getPayIntegral().compareTo(new BigDecimal("0.00")) == 1) { + str = "[积分兑换]"; + } + map.put(dto.getId(), str); + } + return map; + + } + @Override public Map queryAll(YxStoreOrderQueryCriteria criteria, Pageable pageable) { getPage(pageable); PageInfo page = new PageInfo<>(queryAll(criteria)); - List storeOrderDTOS = new ArrayList<>(); - for (YxStoreOrder yxStoreOrder : page.getList()) { - this.orderList(storeOrderDTOS, yxStoreOrder); - - } +// List storeOrderDTOS = new ArrayList<>(); +// for (YxStoreOrder yxStoreOrder : page.getList()) { +// this.orderList(storeOrderDTOS, yxStoreOrder); +// +// } + List list=this.newAssemble(page.getList()); Map map = new LinkedHashMap<>(2); - map.put("content", storeOrderDTOS); +// map.put("content", storeOrderDTOS); + map.put("content",list); map.put("totalElements", page.getTotal()); return map; } @@ -2536,7 +2676,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl