add:553-结算列表增加导出表格功能;562-订单列表需要增加订单的扎数统计字段

cloudroam

2024-11-12 e92163c601f2ccfda20a138b60ed9ad31c47e4d6

add:553-结算列表增加导出表格功能;562-订单列表需要增加订单的扎数统计字段

 src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java

@@ -93,4 +93,7 @@

    @ApiModelProperty(value = "留言")
    private String remarks;

    @ApiModelProperty(value = "订单扎数")
    private Integer saleNum;
}

 src/main/java/com/mzl/flower/dto/response/payment/OrderListExportDTO.java

@@ -35,6 +35,9 @@
    @ApiModelProperty(value = "状态")
    private String statusBackendStr;

    @ApiModelProperty(value = "订单扎数")
    private Integer saleNum;

    @ApiModelProperty(value = "下单时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat

 src/main/java/com/mzl/flower/dto/response/payment/OrderPlatformListDTO.java

@@ -93,4 +93,7 @@

    @ApiModelProperty(value = "留言")
    private String remarks;

    @ApiModelProperty(value = "订单扎数")
    private Integer saleNum;
}

 src/main/java/com/mzl/flower/mapper/payment/OrderItemMapper.java

@@ -6,6 +6,7 @@
import com.mzl.flower.dto.response.payment.OrderItemPlatformListDTO;
import com.mzl.flower.entity.payment.OrderItem;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;

import java.time.LocalDateTime;
@@ -21,4 +22,7 @@

    Integer getFlowerSaleNum(@Param("startTime") LocalDateTime startTime
            , @Param("endTime") LocalDateTime endTime);

    @Select("select  sum(num) from t_order_item where deleted = '0' and order_id = #{orderId}")
    Integer getSumNumByOrderId(String orderId);
}

 src/main/java/com/mzl/flower/service/payment/OrderService.java

@@ -921,6 +921,10 @@
                orderIds.add(o.getId());

                OrderPlatformListDTO p = new OrderPlatformListDTO();
                //增加订单扎数
                Integer sumNumByOrderId = orderItemMapper.getSumNumByOrderId(o.getId());
                o.setSaleNum(sumNumByOrderId);

                BeanUtils.copyProperties(o, p);
                result.add(p);
            }
@@ -1752,7 +1756,7 @@
    public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
        List<OrderListExportDTO> ls = getOrderExportListBase( dto);
        String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
                , "底价", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
                , "底价","销售扎数", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderListExportDTO o : ls) {
@@ -1766,6 +1770,7 @@
            objs[a++] = o.getCustomerAddress();
            objs[a++] = o.getTotalAmount();
            objs[a++] = o.getSupplierAmount();
            objs[a++] = o.getSaleNum();
            objs[a++] = o.getStatusBackendStr();
            objs[a++] = o.getCreateTime();
            objs[a++] = o.getPartnerName();

 src/main/resources/mapper/payment/OrderMapper.xml

@@ -296,7 +296,8 @@
               code2.label as specialNeedsStr,
               CONCAT(q.customer_province, q.customer_city,q.customer_region,q.customer_address) AS customerAddress,
               (select Sum(COALESCE(oi.num, 0) * COALESCE(oi.supplier_price, 0))
        from t_order_item oi where order_id = q.id) supplierAmount
        from t_order_item oi where order_id = q.id) supplierAmount,
        (select Sum(oi.num) from t_order_item oi where order_id = q.id) saleNum
        FROM t_order q
        left join t_user u on q.create_by = u.id
        LEFT JOIN (SELECT ct.label, ct.value from t_code_value ct where type_code = 'ORDER_STATUS_BACKEND') code ON q.status_backend = code.value