diff --git a/.idea/misc.xml b/.idea/misc.xml index d5cd614..868906c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index e919b26..b6349cb 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.api.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; import org.jeecg.api.service.AppletIndexService; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; @@ -17,6 +18,9 @@ import org.jeecg.modules.commonOrder.entity.CommonOrder; import org.jeecg.modules.commonOrder.service.ICommonOrderService; import org.jeecg.modules.commonShopClass.entity.CommonShopClass; import org.jeecg.modules.commonShopClass.service.ICommonShopClassService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.mapper.HanHaiMemberMapper; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +47,8 @@ public class AppletIndexServiceImpl implements AppletIndexService { private ICommonOrderService commonOrderService; @Autowired private ICommonRecyclingDestinationService commonRecyclingDestinationService; + @Autowired + private IHanHaiMemberService hanHaiMemberService; // 获取首页banner @Override @@ -81,7 +87,38 @@ public class AppletIndexServiceImpl implements AppletIndexService { .orderByDesc(CommonGet::getCreateTime) .page(new Page(1, 6)); - + for (CommonGet record : page.getRecords()) { + if (StringUtils.isEmpty(record.getOrderId())){ + continue; + } + CommonOrder order = commonOrderService.getById(record.getOrderId()); + HanHaiMember member = null; + if (order == null){ + continue; + } + if (record.getPrice() == null){ + record.setPrice(order.getPrice()); + } + if (StringUtils.isEmpty(record.getPhone())){ + record.setPhone(order.getPhone()); + } + if (StringUtils.isEmpty(record.getImage())){ + member = hanHaiMemberService.getById(order.getUserId()); + if (member == null){ + continue; + } + record.setImage(member.getHeadImage()); + } + if (StringUtils.isEmpty(record.getName())){ + if (member == null){ + member = hanHaiMemberService.getById(order.getUserId()); + } + if (member == null){ + continue; + } + record.setName(member.getNickName()); + } + } return Result.OK("最近回收商品", page.getRecords()); }