1

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;
+
 }
 
 

ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml

@@ -23,11 +23,18 @@
         <result property="isCountEnabled" column="is_count_enabled"/>
         <result property="thirdPartyOrderNo" column="third_party_order_no"/>
         <result property="jingfenActualPrice" column="jingfen_actual_price"/>
+        <result property="isRefunded" column="is_refunded"/>
+        <result property="refundDate" column="refund_date"/>
+        <result property="isRefundReceived" column="is_refund_received"/>
+        <result property="refundReceivedDate" column="refund_received_date"/>
+        <result property="isRebateReceived" column="is_rebate_received"/>
+        <result property="rebateReceivedDate" column="rebate_received_date"/>
     </resultMap>
 
     <sql id="selectJDOrderBase">
         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
     </sql>
 
@@ -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}
         )
     </insert>
 
@@ -131,6 +140,12 @@
             <if test="isCountEnabled != null"> is_count_enabled = #{isCountEnabled},</if>
             <if test="thirdPartyOrderNo != null"> third_party_order_no = #{thirdPartyOrderNo},</if>
             <if test="jingfenActualPrice != null"> jingfen_actual_price = #{jingfenActualPrice},</if>
+            <if test="isRefunded != null"> is_refunded = #{isRefunded},</if>
+            <if test="refundDate != null"> refund_date = #{refundDate},</if>
+            <if test="isRefundReceived != null"> is_refund_received = #{isRefundReceived},</if>
+            <if test="refundReceivedDate != null"> refund_received_date = #{refundReceivedDate},</if>
+            <if test="isRebateReceived != null"> is_rebate_received = #{isRebateReceived},</if>
+            <if test="rebateReceivedDate != null"> rebate_received_date = #{rebateReceivedDate},</if>
             update_time = now()
         </set>
         where id = #{id}