lisy
2023-08-08 a93d4f40f35ad4464ec1d5602262a1d8d8407ece
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -12,6 +12,7 @@
import com.dsh.account.model.IntegralListQuery;
import com.dsh.account.model.SaveUserIntegralChangesVo;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsResponse;
import com.dsh.account.model.vo.userBenefitDetail.ExchangeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.IntegralsData;
import com.dsh.account.model.vo.userBenefitDetail.PointDetailsVo;
import com.dsh.account.service.UserIntegralChangesService;
@@ -125,18 +126,22 @@
    @Override
    public List<ExchangeDetailsResponse> queryExchangeGoodsdetails(Integer userIdFormRedis, Integer useType, Integer goodType) {
        List<ExchangeDetailsResponse> integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
        if (ToolUtil.isNotEmpty(useType)){
            integralExchangeDetails = integralExchangeDetails.stream()
                    .filter(response -> Objects.equals(response.getUseStatus(), useType))
                    .collect(Collectors.toList());
        List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
        ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);
        if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
            detailsResponses = integralExchangeDetails.getDetailsResponses();
            if (ToolUtil.isNotEmpty(useType)){
                detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
                        .filter(response -> Objects.equals(response.getUseStatus(), useType))
                        .collect(Collectors.toList());
            }
            if (ToolUtil.isNotEmpty(goodType)){
                detailsResponses = integralExchangeDetails.getDetailsResponses().stream()
                        .filter(response -> Objects.equals(response.getGoodType(), goodType))
                        .collect(Collectors.toList());
            }
        }
        if (ToolUtil.isNotEmpty(goodType)){
            integralExchangeDetails = integralExchangeDetails.stream()
                    .filter(response -> Objects.equals(response.getGoodType(), goodType))
                    .collect(Collectors.toList());
        }
        return integralExchangeDetails;
        return detailsResponses;
    }
    @Override