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

增加字段

This commit is contained in:
cb 2025-09-08 14:30:10 +08:00
parent e9ab52cb7e
commit 731d340abf
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,14 @@ public class AfterServiceRecord extends BaseEntity
@Excel(name = "师傅收货确认：0-未收货，1-已收货")
private Integer workerReceiveConfirm;
/** 师傅重发/补发备注 */
@Excel(name = "师傅重发/补发备注")
private String workerResendRemark;
/** 师傅重发/补发图片 */
@Excel(name = "师傅重发/补发图片")
private String workerResendImages;
/** 客户不同意图片 */
@Excel(name = "客户不同意图片")
private String customerDisagreeImages;

15
ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
View File

@ -393,6 +393,13 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
afterServiceRecord.setWorkerResendTime(new Date());
afterServiceRecord.setWorkerResendType(param.getWorkerResendType()); // 1-快递/物流，2-送货上门，3-自提
afterServiceRecord.setWorkerResendTrackingNumber(param.getWorkerResendTrackingNumber()); // 物流单号
// 新增：设置师傅重发/补发备注和图片
if (param.getWorkerResendRemark() != null) {
afterServiceRecord.setWorkerResendRemark(param.getWorkerResendRemark());
}
if (param.getWorkerResendImages() != null) {
afterServiceRecord.setWorkerResendImages(param.getWorkerResendImages());
}
afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
@ -769,6 +776,14 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
afterServiceRecord.setWorkerResendPlan(param.getWorkerResendPlan());
afterServiceRecord.setUpdateBy(param.getUpdateBy());
// 新增：设置师傅重发/补发备注和图片
if (param.getWorkerResendRemark() != null) {
afterServiceRecord.setWorkerResendRemark(param.getWorkerResendRemark());
}
if (param.getWorkerResendImages() != null) {
afterServiceRecord.setWorkerResendImages(param.getWorkerResendImages());
}
// 更新数据库
int result = afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
if (result > 0) {

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

@ -47,6 +47,8 @@
<result property="workerReceiveStatus" column="worker_receive_status" />
<result property="workerAgreeType" column="worker_agree_type" />
<result property="workerReceiveConfirm" column="worker_receive_confirm" />
<result property="workerResendRemark" column="worker_resend_remark" />
<result property="workerResendImages" column="worker_resend_images" />
<result property="customerDisagreeImages" column="customer_disagree_images" />
<result property="customerDisagreeReason" column="customer_disagree_reason" />
</resultMap>
@ -56,7 +58,7 @@
worker_feedback_reason_type, worker_feedback_reason, 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,
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,
customer_disagree_images, customer_disagree_reason
from after_service_record
</sql>
@ -128,6 +130,8 @@
<if test="workerReceiveStatus != null">worker_receive_status,</if>
<if test="workerAgreeType != null">worker_agree_type,</if>
<if test="workerReceiveConfirm != null">worker_receive_confirm,</if>
<if test="workerResendRemark != null">worker_resend_remark,</if>
<if test="workerResendImages != null">worker_resend_images,</if>
<if test="customerDisagreeImages != null">customer_disagree_images,</if>
<if test="customerDisagreeReason != null">customer_disagree_reason,</if>
<if test="createBy != null">create_by,</if>
@ -170,6 +174,8 @@
<if test="workerReceiveStatus != null">#{workerReceiveStatus},</if>
<if test="workerAgreeType != null">#{workerAgreeType},</if>
<if test="workerReceiveConfirm != null">#{workerReceiveConfirm},</if>
<if test="workerResendRemark != null">#{workerResendRemark},</if>
<if test="workerResendImages != null">#{workerResendImages},</if>
<if test="customerDisagreeImages != null">#{customerDisagreeImages},</if>
<if test="customerDisagreeReason != null">#{customerDisagreeReason},</if>
<if test="createBy != null">#{createBy},</if>
@ -218,6 +224,8 @@
<if test="workerReceiveStatus != null">worker_receive_status = #{workerReceiveStatus},</if>
<if test="workerAgreeType != null">worker_agree_type = #{workerAgreeType},</if>
<if test="workerReceiveConfirm != null">worker_receive_confirm = #{workerReceiveConfirm},</if>
<if test="workerResendRemark != null">worker_resend_remark = #{workerResendRemark},</if>
<if test="workerResendImages != null">worker_resend_images = #{workerResendImages},</if>
<if test="customerDisagreeImages != null">customer_disagree_images = #{customerDisagreeImages},</if>
<if test="customerDisagreeReason != null">customer_disagree_reason = #{customerDisagreeReason},</if>
<if test="createBy != null">create_by = #{createBy},</if>