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-11-06 11:01:46 +08:00
parent e1e41d98bc
commit bc9d50bf0c
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -503,10 +503,10 @@ public class OrderDetailController extends BaseController {
} }
} }
// 从detailPayMoney中减去平台退款金额 // 从detailPayMoney中减去平台退款金额
if (totalPlatformRefund.compareTo(BigDecimal.ZERO) > 0) { // if (totalPlatformRefund.compareTo(BigDecimal.ZERO) > 0) {
orderListResponse.setPayAddMoney(detailPayMoney.subtract(totalPlatformRefund)); // orderListResponse.setPayAddMoney(detailPayMoney.subtract(totalPlatformRefund));
} // }
} }

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

@ -1855,6 +1855,7 @@ public class OrderMasterController extends BaseController {
} }
OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
orderStandardDetail.setPayStatus(orderMaster.getPayStatus());
orderStandardDetail.setAfterPlatformServiceStatus(orderDetail.getAfterServiceStatus()); orderStandardDetail.setAfterPlatformServiceStatus(orderDetail.getAfterServiceStatus());
orderStandardDetail.setOrderImages(orderDetail.getOrderImages()); orderStandardDetail.setOrderImages(orderDetail.getOrderImages());
orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages()); orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages());

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java
View File

@ -130,4 +130,6 @@ public class OrderStandardDetail {
private String orderImages; private String orderImages;
//= "售后状态：0-无售后，1-售后纠纷,2-售后已完成,3-售后已取消" //= "售后状态：0-无售后，1-售后纠纷,2-售后已完成,3-售后已取消"
private Integer afterPlatformServiceStatus; private Integer afterPlatformServiceStatus;
private Integer payStatus;
} }

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

@ -294,6 +294,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
if (param.getUpdateBy() != null) { if (param.getUpdateBy() != null) {
afterServiceRecord.setUpdateBy(param.getUpdateBy()); afterServiceRecord.setUpdateBy(param.getUpdateBy());
} }
afterServiceRecord.setRedoCompleteTime(null);
afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
log.info("客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo()); log.info("客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo());
return AjaxResult.success("客户同意方案状态已更新"); return AjaxResult.success("客户同意方案状态已更新");
@ -321,10 +322,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) { if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) {
afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult()); afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult());
// 设置当前时间推后36小时 // 设置当前时间推后36小时
Calendar calendar = Calendar.getInstance(); // Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date()); // calendar.setTime(new Date());
calendar.add(Calendar.HOUR_OF_DAY, 36); // // calendar.add(Calendar.HOUR_OF_DAY, 36);
afterServiceRecord.setRedoCompleteTime(calendar.getTime()); afterServiceRecord.setRedoCompleteTime(new Date());
// 处理师傅反馈相关字段 // 处理师傅反馈相关字段
if (param.getWorkerFeedbackReasonType() != null) { if (param.getWorkerFeedbackReasonType() != null) {
@ -349,6 +350,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
} }
if (param.getCustomerFinalCheck()!=null ) { if (param.getCustomerFinalCheck()!=null ) {
afterServiceRecord.setRedoCompleteTime(null);
// 检查是否已经被自动处理过，防止重复退款 // 检查是否已经被自动处理过，防止重复退款
if (afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1) { if (afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1) {
log.warn("售后记录[{}]已被自动处理，不允许手动重复操作", afterServiceRecord.getId()); log.warn("售后记录[{}]已被自动处理，不允许手动重复操作", afterServiceRecord.getId());
@ -586,8 +588,9 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
if (param.getUpdateBy() != null) { if (param.getUpdateBy() != null) {
afterServiceRecord.setUpdateBy(param.getUpdateBy()); afterServiceRecord.setUpdateBy(param.getUpdateBy());
} }
afterServiceRecord.setRedoCompleteTime(null);
// 设置客户操作时间 // 设置客户操作时间
afterServiceRecord.setCustomerOperationTime(new Date()); afterServiceRecord.setCustomerOperationTime(new Date());
afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord);
log.info("商品售后-客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo()); log.info("商品售后-客户同意上门重做方案状态已更新：{}", param.getCustomerAgreeRedo());
return AjaxResult.success("客户同意方案状态已更新"); return AjaxResult.success("客户同意方案状态已更新");
@ -733,6 +736,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
} }
if (param.getCustomerFinalCheck()!=null ) { if (param.getCustomerFinalCheck()!=null ) {
afterServiceRecord.setRedoCompleteTime(null);
// 检查是否已经被自动处理过，防止重复退款 // 检查是否已经被自动处理过，防止重复退款
if (afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1) { if (afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1) {
log.warn("商品售后记录[{}]已被自动处理，不允许手动重复操作", afterServiceRecord.getId()); log.warn("商品售后记录[{}]已被自动处理，不允许手动重复操作", afterServiceRecord.getId());
@ -1268,6 +1272,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
param.getId(), param.getReturnTrackingNumber()); param.getId(), param.getReturnTrackingNumber());
} }
afterServiceRecord.setWorkerResendPlanTime(null);
afterServiceRecord.setUpdateBy(param.getUpdateBy()); afterServiceRecord.setUpdateBy(param.getUpdateBy());
afterServiceRecord.setRedoCompleteTime(null); afterServiceRecord.setRedoCompleteTime(null);
// 设置客户操作时间 // 设置客户操作时间

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

@ -84,7 +84,7 @@
<if test="agreedRefund != null "> and agreed_refund = #{agreedRefund}</if> <if test="agreedRefund != null "> and agreed_refund = #{agreedRefund}</if>
<if test="customerFinalCheck != null "> and customer_final_check = #{customerFinalCheck}</if> <if test="customerFinalCheck != null "> and customer_final_check = #{customerFinalCheck}</if>
<if test="excludeAfterServiceFinished"> <if test="excludeAfterServiceFinished">
and ( customer_final_check = '0' or customer_final_check is null ) and ((customer_final_check = '0' and (after_service_status != '2'and after_service_status != '1')) or customer_final_check is null )
</if> </if>
</where> </where>
</select> </select>
@ -221,8 +221,8 @@
<if test="platformRefund != null">platform_refund = #{platformRefund},</if> <if test="platformRefund != null">platform_refund = #{platformRefund},</if>
<if test="customerFinalCheck != null">customer_final_check = #{customerFinalCheck},</if> <if test="customerFinalCheck != null">customer_final_check = #{customerFinalCheck},</if>
<if test="customerAgreeRedo != null">customer_agree_redo = #{customerAgreeRedo},</if> <if test="customerAgreeRedo != null">customer_agree_redo = #{customerAgreeRedo},</if>
<if test="customerOperationTime != null">customer_operation_time = #{customerOperationTime},</if> <if test="customerOperationTime != null || customerOperationTime == null">customer_operation_time = #{customerOperationTime},</if>
<if test="redoCompleteTime != null">redo_complete_time = #{redoCompleteTime},</if> <if test="redoCompleteTime != null|| redoCompleteTime == null">redo_complete_time = #{redoCompleteTime},</if>
<if test="redoCompleteRemark != null">redo_complete_remark = #{redoCompleteRemark},</if> <if test="redoCompleteRemark != null">redo_complete_remark = #{redoCompleteRemark},</if>
<if test="redoCompleteImages != null">redo_complete_images = #{redoCompleteImages},</if> <if test="redoCompleteImages != null">redo_complete_images = #{redoCompleteImages},</if>
<if test="isAutoProcessed != null">is_auto_processed = #{isAutoProcessed},</if> <if test="isAutoProcessed != null">is_auto_processed = #{isAutoProcessed},</if>
@ -239,7 +239,7 @@
<if test="returnShipTime != null">return_ship_time = #{returnShipTime},</if> <if test="returnShipTime != null">return_ship_time = #{returnShipTime},</if>
<if test="merchantReceiveTime != null">merchant_receive_time = #{merchantReceiveTime},</if> <if test="merchantReceiveTime != null">merchant_receive_time = #{merchantReceiveTime},</if>
<if test="workerResendPlan != null">worker_resend_plan = #{workerResendPlan},</if> <if test="workerResendPlan != null">worker_resend_plan = #{workerResendPlan},</if>
<if test="workerResendPlanTime != null">worker_resend_plan_time = #{workerResendPlanTime},</if> <if test="workerResendPlanTime != null|| workerResendPlanTime == null">worker_resend_plan_time = #{workerResendPlanTime},</if>
<if test="workerResendTime != null">worker_resend_time = #{workerResendTime},</if> <if test="workerResendTime != null">worker_resend_time = #{workerResendTime},</if>
<if test="workerResendType != null">worker_resend_type = #{workerResendType},</if> <if test="workerResendType != null">worker_resend_type = #{workerResendType},</if>
<if test="workerResendTrackingNumber != null">worker_resend_tracking_number = #{workerResendTrackingNumber},</if> <if test="workerResendTrackingNumber != null">worker_resend_tracking_number = #{workerResendTrackingNumber},</if>