Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java

@@ -285,6 +285,7 @@
        groupPurchase.setGroupStatus(
                res ? GroupStatusEnum.FORMED_INTO_A_GROUP : GroupStatusEnum.GROUP_FAILURE);
        groupPurchase.setStartStatus(StartStatusEnum.ENDED);

        this.updateById(groupPurchase);
    }

@@ -322,7 +323,7 @@
                    });
                    try {
                        log.info(
                                "============  =================退款结束=============================");
                                "=============================退款结束=============================");
                        log.info("退款成功订单：{}",
                                objectMapper.writeValueAsString(successfulOrders));
                        log.info("退款失败订单：{}", objectMapper.writeValueAsString(failedOrders));
@@ -349,6 +350,13 @@
                orderClient.updateOrderStatusByMubres(formedGroupMubres, SecurityConstants.INNER);
                return true;
            }
            List<GoodsGroupPurchaseInfo> notGroupedList = groupPurchaseInfoList.stream()
                    .filter(g -> !g.getCurrentNumber()
                            .equals(g.getGroupSize())).peek(p -> {
                        p.setGroupStatus(GroupStatusEnum.GROUP_FAILURE.getCode());
                    }).collect(
                            Collectors.toList());
            goodsGroupPurchaseInfoService.updateBatchById(notGroupedList);
        }
        return false;
    }