diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java index eff70e7f4..ff43f34c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java @@ -428,6 +428,12 @@ public class StoreOrderInfoVO { @ApiModelProperty(value = "退货原商品数量") private Integer originGoodsQuantity; + @ApiModelProperty(value = "下单用户昵称") + private String orderUserNickName; + + @ApiModelProperty(value = "下单用户手机号") + private String orderUserPhoneNumber; + } @ApiModel diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index caf29d486..ac6ba00b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.core.domain.entity.SysUser; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * * @author ruoyi */ +@Repository public interface SysUserMapper extends BaseMapper { /** * 根据条件分页查询用户列表 diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java index 3579ade3a..a4fa09002 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderInfoDTO.java @@ -34,6 +34,11 @@ public class StoreOrderInfoDTO extends StoreOrderDTO { private String destinationCountyName; + private String orderUserNickName; + + private String orderUserPhoneNumber; + + private List orderDetails; private List expressTracks; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index cad51cf9a..42311b712 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -15,8 +15,10 @@ import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.SimpleEntity; import com.ruoyi.common.core.domain.XktBaseEntity; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.bean.BeanValidators; +import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.xkt.domain.*; import com.ruoyi.xkt.dto.express.*; import com.ruoyi.xkt.dto.order.*; @@ -65,6 +67,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService { @Autowired private StoreProductFileMapper storeProductFileMapper; @Autowired + private SysUserMapper sysUserMapper; + @Autowired private IExpressService expressService; @Autowired private IOperationRecordService operationRecordService; @@ -418,6 +422,12 @@ public class StoreOrderServiceImpl implements IStoreOrderService { for (StoreOrderDetailInfoDTO detailInfo : detailInfos) { detailInfo.setFirstMainPicUrl(mainPicMap.get(detailInfo.getStoreProdId())); } + //下单用户信息 + SysUser orderUser = sysUserMapper.selectById(orderInfo.getOrderUserId()); + if (orderUser != null) { + orderInfo.setOrderUserNickName(orderUser.getNickName()); + orderInfo.setOrderUserPhoneNumber(orderUser.getPhonenumber()); + } return orderInfo; }