1

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

@@ -37,6 +37,11 @@
         <result property="reviewPostedDate" column="review_posted_date"/>
         <result property="rebateRemarkJson" column="rebate_remark_json"/>
         <result property="rebateRemarkHasAbnormal" column="rebate_remark_has_abnormal"/>
+        <result property="sellingPriceType" column="selling_price_type"/>
+        <result property="sellingPrice" column="selling_price"/>
+        <result property="profit" column="profit"/>
+        <result property="sellingPriceManual" column="selling_price_manual"/>
+        <result property="profitManual" column="profit_manual"/>
     </resultMap>
 
     <sql id="selectJDOrderBase">
@@ -44,7 +49,8 @@
                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,
                is_price_protected, price_protected_date, is_invoice_opened, invoice_opened_date, is_review_posted, review_posted_date,
-               rebate_remark_json, rebate_remark_has_abnormal
+               rebate_remark_json, rebate_remark_has_abnormal,
+               selling_price_type, selling_price, profit, selling_price_manual, profit_manual
         from jd_order
     </sql>
 
@@ -151,14 +157,16 @@
             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,
             is_refunded, refund_date, is_refund_received, refund_received_date, is_rebate_received, rebate_received_date,
-            is_price_protected, price_protected_date, is_invoice_opened, invoice_opened_date, is_review_posted, review_posted_date
+            is_price_protected, price_protected_date, is_invoice_opened, invoice_opened_date, is_review_posted, review_posted_date,
+            selling_price_type, selling_price, profit, selling_price_manual, profit_manual
         ) values (
             #{remark}, #{distributionMark}, #{modelNumber}, #{link},
             #{paymentAmount}, #{rebateAmount}, #{address}, #{logisticsLink},
             0, null,
             #{orderId}, #{buyer}, #{orderTime}, now(), now(), #{status}, #{isCountEnabled}, #{thirdPartyOrderNo}, #{jingfenActualPrice},
             #{isRefunded}, #{refundDate}, #{isRefundReceived}, #{refundReceivedDate}, #{isRebateReceived}, #{rebateReceivedDate},
-            #{isPriceProtected}, #{priceProtectedDate}, #{isInvoiceOpened}, #{invoiceOpenedDate}, #{isReviewPosted}, #{reviewPostedDate}
+            #{isPriceProtected}, #{priceProtectedDate}, #{isInvoiceOpened}, #{invoiceOpenedDate}, #{isReviewPosted}, #{reviewPostedDate},
+            #{sellingPriceType}, #{sellingPrice}, #{profit}, #{sellingPriceManual}, #{profitManual}
         )
     </insert>
 
@@ -196,6 +204,13 @@
             <if test="reviewPostedDate != null"> review_posted_date = #{reviewPostedDate},</if>
             <if test="rebateRemarkJson != null"> rebate_remark_json = #{rebateRemarkJson},</if>
             <if test="rebateRemarkHasAbnormal != null"> rebate_remark_has_abnormal = #{rebateRemarkHasAbnormal},</if>
+            <if test="params != null and params.applyProfitFields != null and params.applyProfitFields == true">
+                selling_price_type = #{sellingPriceType,jdbcType=VARCHAR},
+                selling_price = #{sellingPrice,jdbcType=DOUBLE},
+                profit = #{profit,jdbcType=DOUBLE},
+                selling_price_manual = #{sellingPriceManual,jdbcType=INTEGER},
+                profit_manual = #{profitManual,jdbcType=INTEGER},
+            </if>
             update_time = now()
         </set>
         where id = #{id}