diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java index ff445fd9f..8b21b88cb 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java @@ -258,16 +258,12 @@ public class GbOrderServiceImpl extends ServiceImpl impl record.setPayTime(LocalDateTime.now()); record.setVerifyCode(CzgRandomUtils.randomNumber(12, true)); wareService.upGbWareGroupedNum(record.getWareId(), record.getNum()); + GbWare ware = wareService.getById(record.getWareId()); + if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) { + refundByGbOrderDetail(record, "商品已下架 自动退款。"); + return; + } if (StrUtil.isBlank(record.getGroupOrderNo())) { - GbWare ware = wareService.getById(record.getWareId()); - if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) { - CommonRefundDTO refundDTO = new CommonRefundDTO(); - refundDTO.setRecordId(recordId); - refundDTO.setOrderNo(record.getOrderNo()); - refundDTO.setReason("商品已下架 自动退款。"); - agreeRefund(refundDTO, record.getShopId()); - return; - } GbOrder order = new GbOrder(); order.setShopId(record.getShopId()); String groupOrderNo = CzgRandomUtils.randomNumber(OrderNoPrefixEnum.GBO, 12, false); @@ -486,6 +482,7 @@ public class GbOrderServiceImpl extends ServiceImpl impl GbOrderDetail upRecord = new GbOrderDetail(); upRecord.setStatus("已退款"); upRecord.setCancelReason(reason); + upRecord.setIsDel(SystemConstants.OneZero.ZERO); return detailService.update(upRecord, query().eq(GbOrderDetail::getId, record.getId())); }