pull/1121/head
parent
5fcd0d7236
commit
74705b5f85
|
|
@ -428,6 +428,12 @@ public class StoreOrderInfoVO {
|
||||||
@ApiModelProperty(value = "退货原商品数量")
|
@ApiModelProperty(value = "退货原商品数量")
|
||||||
private Integer originGoodsQuantity;
|
private Integer originGoodsQuantity;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "下单用户昵称")
|
||||||
|
private String orderUserNickName;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "下单用户手机号")
|
||||||
|
private String orderUserPhoneNumber;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiModel
|
@ApiModel
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -11,6 +12,7 @@ import java.util.List;
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
|
@Repository
|
||||||
public interface SysUserMapper extends BaseMapper<SysUser> {
|
public interface SysUserMapper extends BaseMapper<SysUser> {
|
||||||
/**
|
/**
|
||||||
* 根据条件分页查询用户列表
|
* 根据条件分页查询用户列表
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,11 @@ public class StoreOrderInfoDTO extends StoreOrderDTO {
|
||||||
|
|
||||||
private String destinationCountyName;
|
private String destinationCountyName;
|
||||||
|
|
||||||
|
private String orderUserNickName;
|
||||||
|
|
||||||
|
private String orderUserPhoneNumber;
|
||||||
|
|
||||||
|
|
||||||
private List<StoreOrderDetailInfoDTO> orderDetails;
|
private List<StoreOrderDetailInfoDTO> orderDetails;
|
||||||
|
|
||||||
private List<ExpressTrackDTO> expressTracks;
|
private List<ExpressTrackDTO> expressTracks;
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,10 @@ import com.github.pagehelper.PageHelper;
|
||||||
import com.ruoyi.common.constant.Constants;
|
import com.ruoyi.common.constant.Constants;
|
||||||
import com.ruoyi.common.core.domain.SimpleEntity;
|
import com.ruoyi.common.core.domain.SimpleEntity;
|
||||||
import com.ruoyi.common.core.domain.XktBaseEntity;
|
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.exception.ServiceException;
|
||||||
import com.ruoyi.common.utils.bean.BeanValidators;
|
import com.ruoyi.common.utils.bean.BeanValidators;
|
||||||
|
import com.ruoyi.system.mapper.SysUserMapper;
|
||||||
import com.ruoyi.xkt.domain.*;
|
import com.ruoyi.xkt.domain.*;
|
||||||
import com.ruoyi.xkt.dto.express.*;
|
import com.ruoyi.xkt.dto.express.*;
|
||||||
import com.ruoyi.xkt.dto.order.*;
|
import com.ruoyi.xkt.dto.order.*;
|
||||||
|
|
@ -65,6 +67,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private StoreProductFileMapper storeProductFileMapper;
|
private StoreProductFileMapper storeProductFileMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
private SysUserMapper sysUserMapper;
|
||||||
|
@Autowired
|
||||||
private IExpressService expressService;
|
private IExpressService expressService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IOperationRecordService operationRecordService;
|
private IOperationRecordService operationRecordService;
|
||||||
|
|
@ -418,6 +422,12 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
|
||||||
for (StoreOrderDetailInfoDTO detailInfo : detailInfos) {
|
for (StoreOrderDetailInfoDTO detailInfo : detailInfos) {
|
||||||
detailInfo.setFirstMainPicUrl(mainPicMap.get(detailInfo.getStoreProdId()));
|
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;
|
return orderInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue