营销官--获取订单列表--添加头像和支付方式字段。

ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java

@@ -135,6 +135,8 @@ public class SysMarketController extends BaseController {
                 orderInfoDto.setNickName(orderListDto.getNickName());
                 orderInfoDto.setPhoneNumber(orderListDto.getPhonenumber());
                 orderInfoDto.setSource(orderInfoDto.getCity()+orderInfoDto.getScenic()+orderInfoDto.getPart()+orderInfoDto.getCoordinate());
+                orderInfoDto.setAvatar(orderListDto.getAvatar());
+                orderInfoDto.setWay(orderListDto.getWay());
             }
 
             orderListDto.setOrderInfoList(orderInfoList);
@@ -147,7 +149,7 @@ public class SysMarketController extends BaseController {
 
     //获取订单详情
     @Log(title = "营销管理--查看订单详情", businessType = BusinessType.GET)
-    @PostMapping("/getOrderDetail/")
+    @PostMapping("/getOrderDetail")
     public AjaxResult getOrderDetail(@RequestBody GetOrderDetailDto getOrderDetailDto){
 
         // sys_order 中的 order_id
@@ -158,7 +160,12 @@ public class SysMarketController extends BaseController {
 
 //        OrderInfoDto orderInfoDto = orderInfoService.getOrderInfoDto(id);
 
-        return success();
+        OrderDetailDto orderDetailDto = sysOrderService.getOrderDetailDto(orderId, id);
+
+        orderDetailDto.setSource(orderDetailDto.getCity()+orderDetailDto.getScenic()+orderDetailDto.getPart()+orderDetailDto.getCoordinate());
+        orderDetailDto.setPresent(orderDetailDto.getStartTime() + " ~ " + orderDetailDto.getEndTime());
+
+        return success(orderDetailDto);
 
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderDetailDto.java

@@ -0,0 +1,266 @@
+package com.ruoyi.system.domain.dto;
+
+import java.util.Date;
+
+public class OrderDetailDto {
+
+    private Long orderId;
+
+    private Long userId;
+
+    private String nickName;
+    private String phonenumber;
+
+    private Date createTime;
+
+    private Date startTime;
+    private Date endTime;
+
+    private String present;
+
+    private Long orderInfoId;
+
+    private Long money;
+
+    private Long refund;
+    private String way;
+    private String orderDetail;
+
+    private String status;
+
+    private Long id;
+
+    private Long sourceId;
+
+    private String workId;
+
+    private String workName;
+
+    private String workAddress;
+
+    private String workDetail;
+
+    private String city;
+    private String scenic;
+    private String part;
+
+    private String source;
+
+
+    private String coordinate;
+
+    private Date refundTime;
+
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getPhonenumber() {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber) {
+        this.phonenumber = phonenumber;
+    }
+
+    public Date getCreateTime() {
+
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Long getOrderInfoId() {
+        return orderInfoId;
+    }
+
+    public void setOrderInfoId(Long orderInfoId) {
+        this.orderInfoId = orderInfoId;
+    }
+
+    public Long getMoney() {
+        return money;
+    }
+
+    public void setMoney(Long money) {
+        this.money = money;
+    }
+
+    public Long getRefund() {
+        return refund;
+    }
+
+    public void setRefund(Long refund) {
+        this.refund = refund;
+    }
+
+    public String getWay() {
+        return way;
+    }
+
+    public void setWay(String way) {
+        this.way = way;
+    }
+
+    public String getOrderDetail() {
+        return orderDetail;
+    }
+
+    public void setOrderDetail(String orderDetail) {
+        this.orderDetail = orderDetail;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public String getWorkId() {
+        return workId;
+    }
+
+    public void setWorkId(String workId) {
+        this.workId = workId;
+    }
+
+    public String getWorkName() {
+        return workName;
+    }
+
+    public void setWorkName(String workName) {
+        this.workName = workName;
+    }
+
+    public String getWorkAddress() {
+        return workAddress;
+    }
+
+    public void setWorkAddress(String workAddress) {
+        this.workAddress = workAddress;
+    }
+
+    public String getWorkDetail() {
+        return workDetail;
+    }
+
+    public void setWorkDetail(String workDetail) {
+        this.workDetail = workDetail;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getScenic() {
+        return scenic;
+    }
+
+    public void setScenic(String scenic) {
+        this.scenic = scenic;
+    }
+
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getCoordinate() {
+        return coordinate;
+    }
+
+    public void setCoordinate(String coordinate) {
+        this.coordinate = coordinate;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public String getPresent() {
+        return present;
+    }
+
+    public void setPresent(String present) {
+        this.present = present;
+    }
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java

@@ -35,6 +35,10 @@ public class OrderInfoDto {
 
     private Date refundTime;
 
+    private String avatar;
+
+    private String way;
+
     public String getPart() {
         return part;
     }
@@ -172,4 +176,21 @@ public class OrderInfoDto {
      }
 
 
+     public String getAvatar() {
+         return avatar;
+     }
+
+     public void setAvatar(String avatar) {
+         this.avatar = avatar;
+     }
+
+    public String getWay() {
+		return way;
+	}
+
+    public void setWay(String way) {
+		this.way = way;
+	}
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java

@@ -28,6 +28,8 @@ public class OrderListDto {
 
     private String status;
 
+    private String avatar;
+
     private List<OrderInfoDto> orderInfoList;
 
     public Long getOrderId() {
@@ -143,6 +145,14 @@ public class OrderListDto {
 		this.phonenumber = phonenumber;
 	}
 
+    public String getAvatar() {
+		return avatar;
+	}
+
+    public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+
 
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOrderMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
 import java.time.LocalDate;
 import java.util.List;
 import com.ruoyi.system.domain.SysOrder;
+import com.ruoyi.system.domain.dto.OrderDetailDto;
 import com.ruoyi.system.domain.dto.OrderListDto;
 import org.apache.ibatis.annotations.Param;
 
@@ -67,4 +68,6 @@ public interface SysOrderMapper
     public int isTimeLegal(@Param("startTime")LocalDate startTime, @Param("endTime") LocalDate endTime, @Param("sourceId") Long sourceId);
 
     public List<OrderListDto> getOrderListDto(SysOrder sysOrder);
+
+    public OrderDetailDto getOrderDetailDto(@Param("orderId") Long orderId, @Param("id") Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOrderService.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service;
 import java.time.LocalDate;
 import java.util.List;
 import com.ruoyi.system.domain.SysOrder;
+import com.ruoyi.system.domain.dto.OrderDetailDto;
 import com.ruoyi.system.domain.dto.OrderListDto;
 
 /**
@@ -72,4 +73,9 @@ public interface ISysOrderService
     * */
 
     public List<OrderListDto> getOrderListDto(SysOrder sysOrder);
+
+    /*
+    * 营销管理--获取订单的详细信息
+    * */
+    public OrderDetailDto getOrderDetailDto(Long orderId, Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import java.time.LocalDate;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.dto.OrderDetailDto;
 import com.ruoyi.system.domain.dto.OrderListDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -104,4 +105,9 @@ public class SysOrderServiceImpl implements ISysOrderService
     public List<OrderListDto> getOrderListDto(SysOrder sysOrder){
         return sysOrderMapper.getOrderListDto(sysOrder);
     }
+
+    @Override
+    public OrderDetailDto getOrderDetailDto(Long orderId, Long id){
+        return sysOrderMapper.getOrderDetailDto(orderId, id);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml

@@ -34,8 +34,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId" column="user_id"/>
         <result property="nickName" column="nick_name"/>
         <result property="phonenumber" column="phonenumber"/>
-<!--        <result property="id"-->
+        <result property="avatar" column="avatar" />
 
+    </resultMap>
+
+    <resultMap id="OrderDetailDtoResult" type="orderDetailDto">
+        <result property="orderId" column="order_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="orderInfoId" column="order_info_id"/>
+        <result property="money" column="money"/>
+        <result property="refund" column="refund"/>
+        <result property="way"    column="way"    />
+        <result property="orderDetail" column="detail"/>
+        <result property="status" column="status"/>
+        <result property="userId" column="user_id"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phonenumber" column="phonenumber"/>
+        <result property="sourceId" column="source_id"/>
+        <result property="workId" column="work_id"/>
+        <result property="city" column="city"/>
+        <result property="scenic" column="scenic"/>
+        <result property="part" column="part" />
+        <result property="workDetail" column="detail"/>
+        <result property="workName" column="work_name"/>
+        <result property="workAddress" column="work_address"/>
+        <result property="coordinate" column="coordinate" />
+        <result property="refundTime" column="refund_time"/>
+        <result property="id" column="id"/>
 
     </resultMap>
 
@@ -69,18 +96,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(*) from sys_order where  source_id = #{sourceId} and #{endTime} >= sys_order.start_time and sys_order.end_time >= #{startTime}
     </select>
     <select id="getOrderListDto" resultMap="OrderListDtoResult">
-           select o.order_id, o.user_id, o.source_id, o.create_time, o.start_time, o.end_time, o.order_info_id, o.money, o.way, o.detail, o.status, o.refund, u.nick_name, u.phonenumber
+           select o.order_id, o.user_id, o.source_id, o.create_time, o.start_time, o.end_time, o.order_info_id, o.money, o.way, o.detail, o.status, o.refund, u.nick_name, u.phonenumber, u.avatar
            from  sys_order o
            left join  sys_user u
            on o.user_id = u.user_id
           <where>
             <if test="status != null "> and o.status = #{status}</if>
-<!--            <if test="createTime != null"></if>-->
-<!--              and date between #{startDate} and #{endDate}-->
 
           </where>
 
     </select>
+    <select id="getOrderDetailDto" resultMap="OrderDetailDtoResult">
+        select o.order_id, o.user_id, o.source_id, o.create_time, o.start_time, o.end_time, o.order_info_id, o.money, o.way, o.detail order_detail, o.status, o.refund, u.nick_name, u.phonenumber, w.work_name, w.detail, s.city, s.scenic, s.part, s.coordinate, w.work_address, w.user_id, i.id, w.work_id
+        from  sys_order o
+        left join  sys_user u on o.user_id = u.user_id
+        left join order_info i on o.order_info_id = i.order_info_id
+        left join sys_source s on i.source_id = s.source_id
+        left join user_work w on i.work_id = w.work_id
+        where o.order_id = #{orderId} and i.id = #{id}
+    </select>
 
     <insert id="insertSysOrder" parameterType="SysOrder" useGeneratedKeys="true" keyProperty="orderId">
         insert into sys_order