Cui Zhi Feng
2024-09-22 e718b00c64088cab2b4999a9e0885ab72701f552
src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -868,9 +868,11 @@
        List<OrderListDTO> ls = getOrderListBase(page, dto);
        if (ls != null && ls.size() > 0) {
            List<String> orderIds = new ArrayList<>();
            Map<String, OrderListDTO> orderMap = new HashMap<>();
            for (OrderListDTO o : ls) {
                o.setCouldRefund(couldRefund(o.getStatusBackend(), o.getPaymentTime()));
                orderIds.add(o.getId());
                orderMap.put(o.getId(), o);
            }
            List<OrderItemListDTO> itemList = orderItemMapper.getOrderItems(orderIds);
@@ -880,6 +882,14 @@
                List<OrderItemListDTO> ll = map.computeIfAbsent(orderId, k -> new ArrayList<>());
                OrderItemListDTO d = new OrderItemListDTO();
                BeanUtils.copyProperties(oi, d);
                OrderListDTO o = orderMap.get(orderId);
                if(dto.isCustomerQuery() && o != null && StringUtils.isEmpty(o.getTransferId())){
                    d.setReduceNum(0);
                    d.setLackNum(0);
                    d.setReplaceNum(0);
                }
                ll.add(d);
            }
@@ -1058,6 +1068,7 @@
    public Page<OrderListDTO> selectCustomerOrderList(Page page, OrderQueryDTO dto) {
        dto.setCreateBy(SecurityUtils.getUserId());
        dto.setCustomerQuery(true);
        return selectOrderList(page, dto);
    }