diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java index b0718f2..1956b1f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/domain/JDOrder.java @@ -92,6 +92,30 @@ public class JDOrder extends BaseEntity { @Excel(name = "京粉实际价格") private Double jingfenActualPrice; + /** 是否退款(0否 1是) */ + @Excel(name = "是否退款") + private Integer isRefunded; + + /** 退款日期 */ + @Excel(name = "退款日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date refundDate; + + /** 是否退款到账(0否 1是) */ + @Excel(name = "是否退款到账") + private Integer isRefundReceived; + + /** 退款到账日期 */ + @Excel(name = "退款到账日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date refundReceivedDate; + + /** 后返到账(0否 1是) */ + @Excel(name = "后返到账") + private Integer isRebateReceived; + + /** 后返到账日期 */ + @Excel(name = "后返到账日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date rebateReceivedDate; + } diff --git a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml index 53e0e6e..25a3e36 100644 --- a/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml @@ -23,11 +23,18 @@ + + + + + + select id, remark, distribution_mark, model_number, link, payment_amount, rebate_amount, - address, logistics_link, order_id, buyer, order_time, create_time, update_time, status, is_count_enabled, third_party_order_no, jingfen_actual_price + address, logistics_link, order_id, buyer, order_time, create_time, update_time, status, is_count_enabled, third_party_order_no, jingfen_actual_price, + is_refunded, refund_date, is_refund_received, refund_received_date, is_rebate_received, rebate_received_date from jd_order @@ -102,12 +109,14 @@ remark, distribution_mark, model_number, link, payment_amount, rebate_amount, address, logistics_link, tencent_doc_pushed, tencent_doc_push_time, - order_id, buyer, order_time, create_time, update_time, status, is_count_enabled, third_party_order_no, jingfen_actual_price + order_id, buyer, order_time, create_time, update_time, status, is_count_enabled, third_party_order_no, jingfen_actual_price, + is_refunded, refund_date, is_refund_received, refund_received_date, is_rebate_received, rebate_received_date ) values ( #{remark}, #{distributionMark}, #{modelNumber}, #{link}, #{paymentAmount}, #{rebateAmount}, #{address}, #{logisticsLink}, 0, null, - #{orderId}, #{buyer}, #{orderTime}, now(), now(), #{status}, #{isCountEnabled}, #{thirdPartyOrderNo}, #{jingfenActualPrice} + #{orderId}, #{buyer}, #{orderTime}, now(), now(), #{status}, #{isCountEnabled}, #{thirdPartyOrderNo}, #{jingfenActualPrice}, + #{isRefunded}, #{refundDate}, #{isRefundReceived}, #{refundReceivedDate}, #{isRebateReceived}, #{rebateReceivedDate} ) @@ -131,6 +140,12 @@ is_count_enabled = #{isCountEnabled}, third_party_order_no = #{thirdPartyOrderNo}, jingfen_actual_price = #{jingfenActualPrice}, + is_refunded = #{isRefunded}, + refund_date = #{refundDate}, + is_refund_received = #{isRefundReceived}, + refund_received_date = #{refundReceivedDate}, + is_rebate_received = #{isRebateReceived}, + rebate_received_date = #{rebateReceivedDate}, update_time = now() where id = #{id} diff --git a/sql/jd_order_refund_fields.sql b/sql/jd_order_refund_fields.sql new file mode 100644 index 0000000..d25e1e3 --- /dev/null +++ b/sql/jd_order_refund_fields.sql @@ -0,0 +1,16 @@ +-- 为jd_order表添加退款相关字段 +-- 执行日期:2025-01-XX + +ALTER TABLE jd_order +ADD COLUMN is_refunded INT DEFAULT 0 COMMENT '是否退款(0否 1是)', +ADD COLUMN refund_date DATETIME NULL COMMENT '退款日期', +ADD COLUMN is_refund_received INT DEFAULT 0 COMMENT '是否退款到账(0否 1是)', +ADD COLUMN refund_received_date DATETIME NULL COMMENT '退款到账日期', +ADD COLUMN is_rebate_received INT DEFAULT 0 COMMENT '后返到账(0否 1是)', +ADD COLUMN rebate_received_date DATETIME NULL COMMENT '后返到账日期'; + +-- 添加索引(可选,根据查询需求) +-- CREATE INDEX idx_is_refunded ON jd_order(is_refunded); +-- CREATE INDEX idx_is_refund_received ON jd_order(is_refund_received); +-- CREATE INDEX idx_is_rebate_received ON jd_order(is_rebate_received); +