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..34f3a46da 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 @@ -248,6 +248,15 @@ public class StoreOrderInfoVO { @ApiModelProperty(value = "轨迹信息") private List expressTracks; + @ApiModelProperty(value = "下单用户昵称") + private String orderUserNickName; + + @ApiModelProperty(value = "下单用户手机号") + private String orderUserPhoneNumber; + + @ApiModelProperty(value = "付款时间") + private Date payTime; + @ApiModel @Data @@ -428,6 +437,15 @@ public class StoreOrderInfoVO { @ApiModelProperty(value = "退货原商品数量") private Integer originGoodsQuantity; + @ApiModelProperty(value = "档口ID") + private Long storeId; + + @ApiModelProperty(value = "档口名称") + private String storeName; + + @ApiModelProperty(value = "档口地址") + private String storeAddress; + } @ApiModel diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java index 8e8ea93d4..a7f42f83b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderQueryVO.java @@ -34,6 +34,11 @@ public class StoreOrderQueryVO extends BasePageVO { */ @ApiModelProperty(value = "订单号（模糊）") private String orderNo; + /** + * 订单类型[1:销售订单 2:退货订单] + */ + @ApiModelProperty(value = "订单类型[1:销售订单 2:退货订单]") + private Integer orderType; /** * 订单状态（1开头为销售订单状态，2开头为退货订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] */ 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/StoreOrderDetailInfoDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java index 8fe3b0b5d..c7f1afa88 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailInfoDTO.java @@ -32,4 +32,10 @@ public class StoreOrderDetailInfoDTO extends StoreOrderDetailDTO { private Integer originOrderDetailStatus; private Integer originGoodsQuantity; + + private Long storeId; + + private String storeName; + + private String storeAddress; } 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..ec7d73866 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 @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; import java.util.List; /** @@ -34,6 +35,12 @@ public class StoreOrderInfoDTO extends StoreOrderDTO { private String destinationCountyName; + private String orderUserNickName; + + private String orderUserPhoneNumber; + + private Date payTime; + private List orderDetails; private List expressTracks; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java index fcc6c231e..d8670f07b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderQueryDTO.java @@ -27,6 +27,10 @@ public class StoreOrderQueryDTO extends BasePageDTO { * 订单号（模糊） */ private String orderNo; + /** + * 订单类型[1:销售订单 2:退货订单] + */ + private Integer orderType; /** * 订单状态（1开头为销售订单状态，2开头为退货订单状态）[10:已取消 11:待付款 12:待发货 13:已发货 14:已完成 21:售后中 22:售后拒绝 23:平台介入 24:售后完成] */ 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..241c93bf9 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; @@ -417,6 +421,24 @@ public class StoreOrderServiceImpl implements IStoreOrderService { (o, n) -> n)); for (StoreOrderDetailInfoDTO detailInfo : detailInfos) { detailInfo.setFirstMainPicUrl(mainPicMap.get(detailInfo.getStoreProdId())); + //档口信息 + if (store != null) { + detailInfo.setStoreId(store.getId()); + detailInfo.setStoreName(store.getStoreName()); + detailInfo.setStoreAddress(store.getStoreAddress()); + } + } + //付款记录 + StoreOrderOperationRecordDTO payRecord = operationRecordService.getOneRecord(storeOrderId, + EOrderTargetTypeAction.ORDER, EOrderAction.PAY); + if (payRecord != null) { + orderInfo.setPayTime(payRecord.getOperationTime()); + } + //下单用户信息 + SysUser orderUser = sysUserMapper.selectUserById(orderInfo.getOrderUserId()); + if (orderUser != null) { + orderInfo.setOrderUserNickName(orderUser.getNickName()); + orderInfo.setOrderUserPhoneNumber(orderUser.getPhonenumber()); } return orderInfo; } diff --git a/xkt/src/main/resources/mapper/StoreOrderMapper.xml b/xkt/src/main/resources/mapper/StoreOrderMapper.xml index 296098e22..d1c7c4aa2 100644 --- a/xkt/src/main/resources/mapper/StoreOrderMapper.xml +++ b/xkt/src/main/resources/mapper/StoreOrderMapper.xml @@ -24,6 +24,9 @@ AND so.order_no LIKE CONCAT('%', #{orderNo}, '%') + + AND so.order_type = #{orderType} + AND so.order_status = #{orderStatus}