退款接口修改
This commit is contained in:
@@ -174,6 +174,6 @@ public class TbOrderInfoDto implements Serializable {
|
|||||||
private BigDecimal seatAmount;
|
private BigDecimal seatAmount;
|
||||||
private String useType;
|
private String useType;
|
||||||
private TbCashierCart seatInfo;
|
private TbCashierCart seatInfo;
|
||||||
|
private String refundRemark;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -287,6 +287,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
|
|||||||
List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId());
|
List<TbOrderDetail> details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId());
|
||||||
dto.setIsRefund(0);
|
dto.setIsRefund(0);
|
||||||
dto.setRefundAmount(BigDecimal.ZERO);
|
dto.setRefundAmount(BigDecimal.ZERO);
|
||||||
|
dto.setRefundRemark(tbOrderInfo.getRefundRemark());
|
||||||
List<TbOrderInfo> tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId());
|
List<TbOrderInfo> tbOrderInfos = tbOrderInfoRepository.selTbOrdersBysource(tbOrderInfo.getId(), tbOrderInfo.getShopId());
|
||||||
if (!CollectionUtils.isEmpty(tbOrderInfos)) {
|
if (!CollectionUtils.isEmpty(tbOrderInfos)) {
|
||||||
dto.setIsRefund(1);
|
dto.setIsRefund(1);
|
||||||
|
|||||||
@@ -2060,6 +2060,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
} else if ("deposit".equals(payType)) {
|
} else if ("deposit".equals(payType)) {
|
||||||
orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnOrderInfo.getRefundAmount());
|
orderInfoService.depositReturn(Integer.valueOf(orderInfo.getUserId()), Integer.valueOf(orderInfo.getShopId()), returnOrderInfo.getRefundAmount());
|
||||||
orderInfo.setStatus("refund");
|
orderInfo.setStatus("refund");
|
||||||
|
}else if ("cash".equals(payType)) {
|
||||||
|
orderInfo.setStatus("refund");
|
||||||
}
|
}
|
||||||
orderInfoMapper.updateById(orderInfo);
|
orderInfoMapper.updateById(orderInfo);
|
||||||
// 打印退款小票
|
// 打印退款小票
|
||||||
|
|||||||
Reference in New Issue
Block a user