Cui Zhi Feng
2024-08-23 a0d4a6ac4c88754e3b0f8428510dc87a9a0dd03f
售后列表查询
已修改5个文件
32 ■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/OrderItemSalesMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
@@ -29,16 +29,16 @@
    @ApiModelProperty(value = "供应商名称")
    private String supplierName;
    @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd")
    private String orderStartDateStr;
    @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd")
    private String orderEndDateStr;
    @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd")
    private String salesStartDateStr;
    @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd")
    private String salesEndDateStr;
    @ApiModelProperty(value = "状态 ORDER_SALES_STATUS")
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
@@ -37,7 +37,4 @@
    @ApiModelProperty(value = "下单时间")
    private LocalDateTime orderTime;
    @ApiModelProperty(value = "审核时间")
    private LocalDateTime auditTime;
}
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
@@ -93,4 +93,7 @@
    @ApiModelProperty(value = "平台回复")
    private String remarks;
    @ApiModelProperty(value = "审核时间")
    private LocalDateTime auditTime;
}
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -172,10 +172,10 @@
    }
    public Page<OrderItemSalesNewListDTO> selectSalesList(Page page, OrderItemSalesQueryDTO dto){
        dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
        dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
        dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
        dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
        dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
        dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
        dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
        dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
        List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(page, dto);
@@ -184,10 +184,10 @@
    }
    public void exportSalesList(HttpServletResponse response, OrderItemSalesQueryDTO dto){
        dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
        dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
        dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
        dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
        dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
        dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
        dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
        dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
        List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(null, dto);
        codeDecorator.decorate(ls);
src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,7 +71,7 @@
            , oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
            , o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
            , o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
            , si.remarks, oi.supplier_price, oi.markup_partner
            , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time
        FROM t_order_item_sales si
        join t_order_item oi on oi.id = si.order_item_id
        join t_order o on si.order_id = o.id