no message

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -1688,8 +1688,9 @@ public class OrderMasterController extends BaseController {
             }
 
             // 设置退款金额和处理原因
-            record.setRefund(request.getRefundAmount());
+            // record.setRefund(request.getRefundAmount());
-            record.setAgreedRefund(request.getRefundAmount());
+            // record.setAgreedRefund(request.getRefundAmount());
+            record.setPlatformRefund(request.getRefundAmount());
             record.setRefundApplyTime(new Date());
             record.setPlatformHandleReason(request.getPlatformHandleReason());
 

ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java

@@ -77,6 +77,10 @@ public class AfterServiceRecord extends BaseEntity
     @Excel(name = "协商后的退款金额")
     private BigDecimal agreedRefund;
 
+    /** 平台退款金额 */
+    @Excel(name = "平台退款金额")
+    private BigDecimal platformRefund;
+
     /** 客户最终确认：0为不同意，1为同意 */
     @Excel(name = "客户最终确认：0为不同意，1为同意")
     private Long customerFinalCheck;

ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml

@@ -16,6 +16,7 @@
         <result property="workerFeedbackImages"    column="worker_feedback_images"    />
         <result property="refund"    column="refund"    />
         <result property="agreedRefund"    column="agreed_refund"    />
+        <result property="platformRefund"    column="platform_refund"    />
         <result property="customerFinalCheck"    column="customer_final_check"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -58,7 +59,7 @@
 
     <sql id="selectAfterServiceRecordVo">
         select id, customer_reason_type, customer_reason, order_detail_id, oper_type, worker_feedback_result,
-               worker_feedback_reason_type, worker_feedback_reason, worker_feedback_images, refund, agreed_refund, original_refund,
+               worker_feedback_reason_type, worker_feedback_reason, worker_feedback_images, refund, agreed_refund, platform_refund, original_refund,
                customer_final_check, create_by, create_time, update_by, update_time, remark, refund_apply_time, customer_agree_redo,
                redo_complete_time, redo_complete_remark, redo_complete_images, is_auto_processed, after_service_category, after_service_type, return_status,
                return_address, return_contact, return_phone, return_type, return_remark, return_images, return_tracking_number, return_ship_time, merchant_receive_time, worker_resend_plan, worker_resend_time, worker_resend_type, worker_resend_tracking_number, worker_receive_status, worker_agree_type, worker_receive_confirm, worker_resend_remark, worker_resend_images,
@@ -109,6 +110,7 @@
             <if test="workerFeedbackImages != null">worker_feedback_images,</if>
             <if test="refund != null">refund,</if>
             <if test="agreedRefund != null">agreed_refund,</if>
+            <if test="platformRefund != null">platform_refund,</if>
             <if test="customerFinalCheck != null">customer_final_check,</if>
             <if test="customerAgreeRedo != null">customer_agree_redo,</if>
             <if test="redoCompleteTime != null">redo_complete_time,</if>
@@ -156,6 +158,7 @@
             <if test="workerFeedbackImages != null">#{workerFeedbackImages},</if>
             <if test="refund != null">#{refund},</if>
             <if test="agreedRefund != null">#{agreedRefund},</if>
+            <if test="platformRefund != null">#{platformRefund},</if>
             <if test="customerFinalCheck != null">#{customerFinalCheck},</if>
             <if test="customerAgreeRedo != null">#{customerAgreeRedo},</if>
             <if test="redoCompleteTime != null">#{redoCompleteTime},</if>
@@ -209,6 +212,7 @@
             <if test="workerFeedbackImages != null">worker_feedback_images = #{workerFeedbackImages},</if>
             <if test="refund != null">refund = #{refund},</if>
             <if test="agreedRefund != null">agreed_refund = #{agreedRefund},</if>
+            <if test="platformRefund != null">platform_refund = #{platformRefund},</if>
             <if test="customerFinalCheck != null">customer_final_check = #{customerFinalCheck},</if>
             <if test="customerAgreeRedo != null">customer_agree_redo = #{customerAgreeRedo},</if>
             <if test="redoCompleteTime != null">redo_complete_time = #{redoCompleteTime},</if>