duhuizhe
2024-05-15 aa2c3d4deba76ade0958ff3ced88396e226a4964
ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/service/impl/ActivityShopRecordServiceImpl.java
@@ -1,7 +1,6 @@
package com.nuvole.four.service.impl;
import com.nuvole.base.domain.SysUser;
import com.nuvole.four.client.ShopServiceClient;
import com.nuvole.four.contants.Contants;
import com.nuvole.four.domain.ActivityShopRecord;
import com.nuvole.four.domain.dto.ActivityShopRecordDto;
@@ -16,6 +15,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -31,7 +31,7 @@
public class ActivityShopRecordServiceImpl implements ActivityShopRecordService {
    private final ActivityShopRecordMapper activityShopRecordMapper;
    private final ShopServiceClient shopServiceClient;
//    private final ShopServiceClient shopServiceClient;
    private final ActivityFeeMapper activityFeeMapper;
@@ -87,7 +87,8 @@
        //关联shop库查询商户、店铺等字段信息
        List<Long> shopIds = dtoList.stream().map(ActivityShopRecord::getMerchantShopId).collect(Collectors.toList());
        String ids = shopIds.stream().map(String::valueOf).collect(Collectors.joining(","));
        List<Map> mapList = shopServiceClient.selectShopMsgByIds(ids);
//        List<Map> mapList = shopServiceClient.selectShopMsgByIds(ids);
        List<Map> mapList = new ArrayList<>();
        if(!CollectionUtils.isEmpty(mapList)){
            // 将 mapList 中的数据合并到 dtoList 中
            dtoList.forEach( d -> {