xuxueyang
2024-09-24 2e3d7f2d8611f50e7e9428725f4ed2a927f5b453
update 配送单打印
已修改2个文件
13 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemStatisticsDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemStatisticsDTO.java
@@ -23,4 +23,6 @@
    @ApiModelProperty(value = "价格")
    private BigDecimal price;
    private String id;
}
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -16,7 +16,8 @@
    <select id="selectDoItemCheckList" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemCheckDTO">
        SELECT oi.id, oi.flower_name, oi.flower_unit, oi.flower_color, oi.flower_cover, oi.num
        , oi.supplier_price price, oi.flower_level, oi.status, oi.check_images, oi.check_time, oi.check_remarks
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace') replaceNum
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace')
        replaceNum
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce') reduceNum
        , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack') lackNum
        FROM t_delivery_order_item q
@@ -26,7 +27,7 @@
    </select>
    <select id="selectDoItemListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
        SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
        SELECT oi.id,oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
        FROM t_delivery_order_item doi
        join t_delivery_order q on q.id = doi.delivery_id
        join t_order_item oi on oi.id = doi.order_item_id
@@ -41,7 +42,8 @@
        group by oi.flower_name, oi.flower_level
    </select>
    <select id="selectSettlementListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
    <select id="selectSettlementListByTime"
            resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
        SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
        , ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
        , ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
@@ -65,7 +67,8 @@
        order by q.create_time desc
    </select>
    <select id="getSupplierStatisticsByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
    <select id="getSupplierStatisticsByTime"
            resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
        SELECT sum(oi.num) num, sum(oi.supplier_price*oi.num) price
        FROM t_delivery_order_item doi
        join t_delivery_order q on q.id = doi.delivery_id