add:理赔-售后类型

cloudroam

2024-09-09 2e1531e8cdbe5b7f659a034fc659d8fca272f61d

add:理赔-售后类型

 src/main/java/com/mzl/flower/constant/Constants.java

@@ -430,4 +430,20 @@
        }
    }

    public enum after_sale_type {
        barters("换货"),
        returns("退货"),
        ;

        after_sale_type(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }

}

 src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesCreateDTO.java

@@ -23,4 +23,6 @@
    @ApiModelProperty(value = "理由")
    private String reason;

    @ApiModelProperty(value = "售后类型")
    private String salesType;
}

 src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java

@@ -67,4 +67,6 @@

    @ApiModelProperty(hidden = true)
    private LocalDateTime salesEndDate;

    private String salesType;//售后类型
}

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

@@ -96,4 +96,9 @@

    @ApiModelProperty(value = "审核时间")
    private LocalDateTime auditTime;

    @ApiModelProperty(value = "售后类型")
    @DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
    private String salesType;
    private String salesTypeStr;
}

 src/main/java/com/mzl/flower/entity/payment/OrderItemSales.java

@@ -69,4 +69,6 @@
    @TableField("refund_id")
    private String refundId;//退款id

    private String salesType;//售后类型

}

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

@@ -117,6 +117,7 @@
        s.setReason(dto.getReason());
        s.setStatus(Constants.ORDER_SALES_STATUS.PENDING.name());
        s.create(userId);
        s.setSalesType(dto.getSalesType());
        orderItemSalesMapper.insert(s);

        return s.getId();

 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.audit_time
            , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type
        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
@@ -136,6 +136,12 @@
        <if test="condition.supplierId != null">
            AND oi.supplier_id = #{condition.supplierId}
        </if>
        <if test="condition.supplierId != null">
            AND oi.supplier_id = #{condition.supplierId}
        </if>
        <if test="condition.salesType != null">
            AND si.sales_type = #{condition.salesType}
        </if>

        ORDER BY si.create_time desc
    </select>