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

取消分页限制以及修改24小时定时后期处理

This commit is contained in:
cb 2025-11-10 15:33:50 +08:00
parent d2db2a5547
commit ae843ab767
5 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -1428,7 +1428,7 @@ public class OrderController extends BaseController {
// } else {
orderListResponses.addAll(masterList);
// }
logger.info("未处理的订单{}", orderListResponses);
//logger.info("未处理的订单{}", orderListResponses);
if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
if (orderListResponses.size() > 0) {
orderListResponses = orderListResponses.stream()
@ -2402,11 +2402,18 @@ public class OrderController extends BaseController {
// afterServiceRecord.setExcludeAfterServiceFinished(true);
List<AfterServiceRecord> afterServiceRecordList
=afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
if (detail.getAfterServiceStatus()==2||detail.getAfterServiceStatus()==3) {
orderListResponse.setShowAfterServiceRecord( 0);
} else{
orderListResponse.setShowAfterServiceRecord( 1);
int showAfterServiceRecord = 0;
if (afterServiceRecordList != null && !afterServiceRecordList.isEmpty()) {
// 遍历售后记录，如果存在afterServiceStatus不为1的记录，则显示售后记录按钮
for (AfterServiceRecord record : afterServiceRecordList) {
if (record.getAfterServiceStatus() != 1) {
showAfterServiceRecord = 1;
break;
}
}
}
orderListResponse.setShowAfterServiceRecord(showAfterServiceRecord);
// 编辑返回属性

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

@ -1016,7 +1016,7 @@ public class OrderMasterController extends BaseController {
}
// 移除startPage()调用，查询所有数据
startPage();
// startPage();
// if (orderMaster.getOrderStatus()==OrderStatus.FINISH_CHECK.code()){
// orderMaster.setOrderStatuses();
// }

6
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -380,7 +380,7 @@ public class OrderMaster extends BaseEntity {
@Excel(name = "退款时是否已支付", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=未支付,1=已支付")
private Integer refundPayStatus;
private Integer pageSize;
private Integer pageNum;
// private Integer pageSize;
//
// private Integer pageNum;
}

12
ghy-order/src/main/java/com/ghy/order/quartz/AfterServiceTimeoutTask.java
View File

@ -65,13 +65,19 @@ public class AfterServiceTimeoutTask {
log.info("处理师傅反馈超时售后记录：{}", record.getId());
// 师傅24小时不操作，直接设置为师傅同意并客户同意，完成售后
record.setWorkerFeedbackResult(1L);
// record.setWorkerFeedbackResult(1L);
record.setCustomerFinalCheck(1L);
record.setRefundApplyTime(new Date());
record.setIsAutoProcessed(1); // 自动处理
// 更新记录
afterServiceRecordService.updateAfterServiceRecord(record);
// 根据售后类型选择更新方法
if (record.getAfterServiceCategory() != null && record.getAfterServiceCategory().equals(1)) {
// 商品售后
afterServiceRecordService.updateGoodsAfterServiceRecord(record);
} else {
// 服务售后或其他类型
afterServiceRecordService.updateAfterServiceRecord(record);
}
// 师傅24小时不操作，需要执行退款逻辑
try {

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

@ -776,7 +776,19 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
} catch (Exception e) {
log.error("商品售后-即时退单退款执行失败，记录ID：{}，错误：{}", param.getId(), e.getMessage());
}
} else {
} else if(afterServiceRecord.getIsAutoProcessed() != null && afterServiceRecord.getIsAutoProcessed() == 1){
log.info("商品售后-定时器自动处理，立即执行退款，记录ID：{}", param.getId());
afterServiceRecord.setRefundApplyTime(new Date());
// orderDetail.setAfterServiceStatus(2);
// 执行退款逻辑
try {
executeRefundLogic(afterServiceRecord);
log.info("商品售后-即时退单退款执行成功，记录ID：{}", param.getId());
} catch (Exception e) {
log.error("商品售后-即时退单退款执行失败，记录ID：{}，错误：{}", param.getId(), e.getMessage());
}
}
else{
// 注意：客户同意重发补发方案后，不立即结束售后流程
// 而是等待倒计时结束，由定时器自动处理
// 这样可以给师傅时间完成重发补发操作