clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

no message

This commit is contained in:
cb 2025-09-15 16:51:52 +08:00
parent 9acd98d9b5
commit 82ecd1a144
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-order/src/main/java/com/ghy/order/domain/AfterServiceRecord.java
View File

@ -52,6 +52,10 @@ public class AfterServiceRecord extends BaseEntity
@Excel(name = "师傅反馈原因描述")
private String workerFeedbackReason;
/** 师傅反馈图片 */
@Excel(name = "师傅反馈图片")
private String workerFeedbackImages;
/** 本单退款金额 */
@Excel(name = "本单退款金额")
private BigDecimal refund;

6
ghy-order/src/main/resources/mapper/order/AfterServiceRecordMapper.xml
View File

@ -13,6 +13,7 @@
<result property="workerFeedbackResult" column="worker_feedback_result" />
<result property="workerFeedbackReasonType" column="worker_feedback_reason_type" />
<result property="workerFeedbackReason" column="worker_feedback_reason" />
<result property="workerFeedbackImages" column="worker_feedback_images" />
<result property="refund" column="refund" />
<result property="agreedRefund" column="agreed_refund" />
<result property="customerFinalCheck" column="customer_final_check" />
@ -55,7 +56,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, refund, agreed_refund, original_refund,
worker_feedback_reason_type, worker_feedback_reason, worker_feedback_images, refund, agreed_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,
@ -103,6 +104,7 @@
<if test="workerFeedbackResult != null">worker_feedback_result,</if>
<if test="workerFeedbackReasonType != null">worker_feedback_reason_type,</if>
<if test="workerFeedbackReason != null">worker_feedback_reason,</if>
<if test="workerFeedbackImages != null">worker_feedback_images,</if>
<if test="refund != null">refund,</if>
<if test="agreedRefund != null">agreed_refund,</if>
<if test="customerFinalCheck != null">customer_final_check,</if>
@ -147,6 +149,7 @@
<if test="workerFeedbackResult != null">#{workerFeedbackResult},</if>
<if test="workerFeedbackReasonType != null">#{workerFeedbackReasonType},</if>
<if test="workerFeedbackReason != null">#{workerFeedbackReason},</if>
<if test="workerFeedbackImages != null">#{workerFeedbackImages},</if>
<if test="refund != null">#{refund},</if>
<if test="agreedRefund != null">#{agreedRefund},</if>
<if test="customerFinalCheck != null">#{customerFinalCheck},</if>
@ -197,6 +200,7 @@
<if test="workerFeedbackResult != null">worker_feedback_result = #{workerFeedbackResult},</if>
<if test="workerFeedbackReasonType != null">worker_feedback_reason_type = #{workerFeedbackReasonType},</if>
<if test="workerFeedbackReason != null">worker_feedback_reason = #{workerFeedbackReason},</if>
<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="customerFinalCheck != null">customer_final_check = #{customerFinalCheck},</if>

3
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -367,6 +367,9 @@
#{id}
</foreach>
</if>
<if test="goodsOrderMasterId != null and goodsOrderMasterId > 0">
AND om.goods_order_master_id = #{goodsOrderMasterId}
</if>
</where>
order by om.create_time
<trim suffixOverrides=",">