|
|
|
@@ -13,6 +13,7 @@ import com.iformall.service.WxBrandService; |
|
|
|
import com.iformall.service.WxShopService; |
|
|
|
import com.iformall.service.invest.*; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.collections.MapUtils; |
|
|
|
import org.apache.commons.compress.utils.Lists; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -106,9 +107,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
for (InvestFollowRecordEntity item : recordList) { |
|
|
|
InvestCustomerEntity customerEntity = customerMap.get(item.getCustomerId()); |
|
|
|
WxBrand brand = brandMap.get(customerEntity.getBrandId()); |
|
|
|
Map<String, Object> followContent = (Map<String, Object>) JSON.parseObject(item.getContent(), Map.class); |
|
|
|
String followMember = (String) followContent.get("member"); |
|
|
|
List<MallUserInfo> ownerInfo = getMallUserInfos(followMember, usersMap); |
|
|
|
List<MallUserInfo> ownerInfo = getMallUserInfos(usersMap, item); |
|
|
|
InvestFollowRecordVo followRecordVo = new InvestFollowRecordVo(); |
|
|
|
followRecordVo.setCustomer(customerEntity); |
|
|
|
followRecordVo.setMemberInfo(ownerInfo); |
|
|
|
@@ -124,6 +123,16 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
return investPage; |
|
|
|
} |
|
|
|
|
|
|
|
private List<MallUserInfo> getMallUserInfos(Map<Long, MallUserInfo> usersMap, InvestFollowRecordEntity item) { |
|
|
|
List<MallUserInfo> ownerInfo = null ; |
|
|
|
Map contentMap = JSON.parseObject(item.getContent(),Map.class); |
|
|
|
if (MapUtils.isNotEmpty(contentMap)) { |
|
|
|
String followMember = (String) contentMap.get(InvestFollowRecordEntity.KEY_MEMBER); |
|
|
|
ownerInfo = getMallUserInfos(followMember, usersMap); |
|
|
|
} |
|
|
|
return ownerInfo; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<MallUserInfo> queryUserList() { |
|
|
|
MallUserInfo query = new MallUserInfo(); |
|
|
|
|