tashow/tashow-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单模块调整

Browse Source
This commit is contained in:
liwq
2026-01-05 18:24:20 +08:00
parent 793a810d65
commit 0c051643d5
5 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/aftersale/AfterSaleController.java
View File

@@ -61,9 +61,9 @@ public class AfterSaleController {
return success(AfterSaleConvert.INSTANCE.convertPage(pageResult, null));
}
@GetMapping("/get-detail")
// 获得售后订单详情
// 售后编号 - 必填 - 示例: 1
@GetMapping("/get-detail")
@PreAuthorize("@ss.hasPermission('trade:after-sale:query')")
public CommonResult<AfterSaleDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
// 查询订单

1
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeOrderMapper.java
View File

@@ -33,6 +33,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<TradeOrderDO>()
.likeIfPresent(TradeOrderDO::getMerchantName, reqVO.getMerchantName())
.eqIfPresent(TradeOrderDO::getOrderTerminal, reqVO.getOrderTerminal())
.eqIfPresent(TradeOrderDO::getOrderStatus, reqVO.getOrderStatus())
.eqIfPresent(TradeOrderDO::getFinanceStatus, reqVO.getFinanceStatus())
.eqIfPresent(TradeOrderDO::getAfterSaleStatus, reqVO.getAfterSaleStatus())
.betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())

10
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/aftersale/AfterSaleServiceImpl.java
View File

@@ -205,7 +205,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
AfterSaleDO afterSale = validateAfterSaleAuditable(auditReqVO.getId());
// 更新售后单的状态
Integer newStatus = AfterSaleStatusEnum.SELLER_DISAGREE.getStatus();
Integer newStatus = AfterSaleStatusEnum.APPLY.getStatus();
updateAfterSaleStatus(afterSale.getId(), AfterSaleStatusEnum.APPLY.getStatus(), new AfterSaleDO()
.setStatus(newStatus).setAuditUserId(userId).setAuditTime(LocalDateTime.now())
.setAuditReason(auditReqVO.getAuditReason()));
@@ -305,12 +305,12 @@ public class AfterSaleServiceImpl implements AfterSaleService {
// 更新售后单的状态
updateAfterSaleStatus(afterSale.getId(), AfterSaleStatusEnum.BUYER_DELIVERY.getStatus(), new AfterSaleDO()
.setStatus(AfterSaleStatusEnum.SELLER_REFUSE.getStatus()).setReceiveTime(LocalDateTime.now())
.setStatus(AfterSaleStatusEnum.APPLY.getStatus()).setReceiveTime(LocalDateTime.now())
.setReceiveReason(refuseReqVO.getRefuseMemo()));
// 记录售后日志
AfterSaleLogUtils.setAfterSaleInfo(afterSale.getId(), afterSale.getStatus(),
AfterSaleStatusEnum.SELLER_REFUSE.getStatus(),
AfterSaleStatusEnum.APPLY.getStatus(),
MapUtil.of("reason", refuseReqVO.getRefuseMemo()));
// TODO 发送售后消息
@@ -398,11 +398,11 @@ public class AfterSaleServiceImpl implements AfterSaleService {
// 更新售后单的状态为【已取消】
updateAfterSaleStatus(afterSale.getId(), afterSale.getStatus(), new AfterSaleDO()
.setStatus(AfterSaleStatusEnum.BUYER_CANCEL.getStatus()));
.setStatus(AfterSaleStatusEnum.APPLY.getStatus()));
// 记录售后日志
AfterSaleLogUtils.setAfterSaleInfo(afterSale.getId(), afterSale.getStatus(),
AfterSaleStatusEnum.BUYER_CANCEL.getStatus());
AfterSaleStatusEnum.APPLY.getStatus());
// TODO 发送售后消息