czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 退款修改

Browse Source
This commit is contained in:
张松
2024-11-12 18:05:47 +08:00
parent 7862b5b33a
commit 1db366a47f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -653,6 +653,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
return; return;
} }
TbOrderInfo returnOrder = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>() TbOrderInfo returnOrder = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getStatus, "refunding")
.eq(TbOrderInfo::getSource, orderInfo.getId())); .eq(TbOrderInfo::getSource, orderInfo.getId()));
if (returnOrder == null) { if (returnOrder == null) {
log.warn("订单信息不存在: {}", payOrderId); log.warn("订单信息不存在: {}", payOrderId);

6
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -2609,7 +2609,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.add(returnPackFee)); .add(returnPackFee));
orderDetail.setPackAmount(returnPackFee); orderDetail.setPackAmount(returnPackFee);
orderDetail.setRefundNumber(returnNum); orderDetail.setRefundNumber(returnNum);
orderDetail.setStatus(isOnline ? "refunding" : "refund"); // orderDetail.setStatus(isOnline ? "refunding" : "refund");
orderDetail.setStatus("refund");
} }
if (returnAmount.compareTo(BigDecimal.ZERO) <= 0) { if (returnAmount.compareTo(BigDecimal.ZERO) <= 0) {
@@ -2621,7 +2622,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
mpOrderDetailService.saveBatch(remainOrderDetailList); mpOrderDetailService.saveBatch(remainOrderDetailList);
} }
TbOrderInfo returnOrder = mpOrderInfoService.selectReturnOrderByOrderId(returnOrderDTO.getOrderId()); // TbOrderInfo returnOrder = mpOrderInfoService.selectReturnOrderByOrderId(returnOrderDTO.getOrderId());
TbOrderInfo returnOrder = null;
if (returnOrder == null) { if (returnOrder == null) {
String orderNo = generateOrderNumber(isOnline ? "OLRO" : "RO"); String orderNo = generateOrderNumber(isOnline ? "OLRO" : "RO");
returnOrder = BeanUtil.copyProperties(oldOrderInfo, TbOrderInfo.class); returnOrder = BeanUtil.copyProperties(oldOrderInfo, TbOrderInfo.class);