Cui Zhi Feng
2024-09-22 e718b00c64088cab2b4999a9e0885ab72701f552
452 退款后花店端才展示质检结果
已修改2个文件
14 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
@@ -73,4 +73,7 @@
    @ApiModelProperty(value = "收货地址详细地址(拼接省市区地址)")
    private String address;
    @ApiModelProperty(hidden = true)
    private boolean customerQuery = false;
}
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);
    }