管理端订单详情信息

leromro-core/src/main/java/com/leromro/core/controller/OrdersController.java

@@ -58,6 +58,8 @@ public class OrdersController extends BaseController {
         return getDataTable(list);
     }
 
+
+
     /**
      * 查询订单主列表
      */
@@ -129,12 +131,10 @@ public class OrdersController extends BaseController {
     @GetMapping("/web/orderInfo/{mainOrderId}")
     public R<WebMainOrdersInfoVO> webOrderInfo (@PathVariable String mainOrderId) {
 
-        MainOrders mainOrders = mainOrderService.getById(mainOrderId);
+        WebMainOrdersInfoVO webMainOrderInfoVO = mainOrderService.selectWebMainOrderInfoVO(mainOrderId);
         List<SecondOrder> secondOrderList = secondOrderService.list(new LambdaQueryWrapper<SecondOrder>().eq(SecondOrder::getMainOrderId, mainOrderId));
-        WebMainOrdersInfoVO webMainOrdersInfoVO = new WebMainOrdersInfoVO();
-        BeanUtils.copyProperties(mainOrders,webMainOrdersInfoVO);
-        webMainOrdersInfoVO.setSecondOrderList(secondOrderList);
-        return R.ok(webMainOrdersInfoVO);
+        webMainOrderInfoVO.setSecondOrderList(secondOrderList);
+        return R.ok(webMainOrderInfoVO);
     }
 /*
     */

leromro-core/src/main/java/com/leromro/core/controller/VolunteerInfoController.java

@@ -84,8 +84,8 @@ public class VolunteerInfoController extends BaseController {
      * 已测试
      */
     @ApiOperation(value = "查询志愿者信息列表",notes = "传入进行分类的字段，根据分类字段查询，返回List 集合")
-    @GetMapping("/list")
-    public TableDataInfo<VolunteerInfoVO> list(@RequestBody VolunteerInfo volunteerInfo)
+    @GetMapping ("/list")
+    public TableDataInfo<VolunteerInfoVO> list( VolunteerInfo volunteerInfo)
     {
         startPage();
         List<VolunteerInfoVO> list = volunteerInfoService.selectVolunteerInfoList(volunteerInfo);

leromro-core/src/main/java/com/leromro/core/domain/vo/WebMainOrdersInfoVO.java

@@ -2,6 +2,8 @@ package com.leromro.core.domain.vo;
 
 import com.leromro.core.domain.MainOrders;
 import com.leromro.core.domain.SecondOrder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.util.List;
@@ -9,5 +11,18 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class WebMainOrdersInfoVO extends MainOrders{
+    @ApiModelProperty("小订单列表")
     private List<SecondOrder> secondOrderList;
+
+    @ApiModelProperty("志愿者手机号")
+    private String VolunteerTelephone;
+
+    @ApiModelProperty("志愿者姓名")
+    private String VolunteerName;
+
+    @ApiModelProperty("志愿者照片")
+    private String VolunteerPicture;
+
+    @ApiModelProperty("服务类别")
+    private String businessTierName ;
 }

leromro-core/src/main/java/com/leromro/core/facade/VolunteerWorkDateFacade.java

@@ -10,6 +10,7 @@ import com.leromro.core.domain.dto.AddReservationTimesDTO;
 import com.leromro.core.domain.vo.VolunteerReservationTimeVO;
 import com.leromro.core.service.IVolunteerReservationTimeService;
 import com.leromro.core.service.IVolunteerWorkDateService;
+import com.leromro.core.utils.DateTimeUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +59,7 @@ public class VolunteerWorkDateFacade {
             VolunteerReservationTimeVO vo = VolunteerReservationTimeVO.builder()
                     .reservationTime(startTime)
                     .build();
-            if (date.equals(LocalDate.now()) && (times.contains(startTime) || startTime.isBefore(LocalTime.now()))){
+            if ((date.equals(LocalDate.now()) && startTime.isBefore(LocalTime.now())) || times.contains(startTime)  ){
                 vo.setHasReservation(1);
 //                vo.setClientId(timeMapUser.get(startTime));
             }else {

leromro-core/src/main/java/com/leromro/core/mapper/MainOrdersMapper.java

@@ -3,6 +3,7 @@ package com.leromro.core.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.leromro.core.domain.MainOrders;
 import com.leromro.core.domain.vo.MainOrdersVO;
+import com.leromro.core.domain.vo.WebMainOrdersInfoVO;
 import com.leromro.core.domain.vo.webMainOrderListVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,4 +17,6 @@ public interface MainOrdersMapper extends BaseMapper<MainOrders> {
     List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO);
 
     void startService(String secondOrderId);
+
+    WebMainOrdersInfoVO selectWebMainOrderInfoVO(String mainOrderId);
 }

leromro-core/src/main/java/com/leromro/core/service/IMainOrderService.java

@@ -6,6 +6,7 @@ import com.leromro.core.domain.SecondOrder;
 import com.leromro.core.domain.VolunteerWorkDate;
 import com.leromro.core.domain.dto.OrderRequestDTO;
 import com.leromro.core.domain.vo.MainOrdersVO;
+import com.leromro.core.domain.vo.WebMainOrdersInfoVO;
 import com.leromro.core.domain.vo.webMainOrderListVO;
 
 
@@ -20,4 +21,6 @@ public interface IMainOrderService extends IService<MainOrders> {
     List<webMainOrderListVO> webMainOrderList(MainOrdersVO mainOrdersVO);
 
     void startService(String secondOrderId);
+
+    WebMainOrdersInfoVO selectWebMainOrderInfoVO(String mainOrderId);
 }

leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.domain.*;
 import com.leromro.core.domain.dto.OrderRequestDTO;
 import com.leromro.core.domain.vo.MainOrdersVO;
+import com.leromro.core.domain.vo.WebMainOrdersInfoVO;
 import com.leromro.core.domain.vo.webMainOrderListVO;
 import com.leromro.core.mapper.*;
 import com.leromro.core.service.IMainOrderService;
@@ -206,5 +207,15 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         mainOrdersMapper.startService(secondOrderId);
     }
 
+    /**
+     * @param mainOrderId
+     * @return
+     */
+    @Override
+    public WebMainOrdersInfoVO selectWebMainOrderInfoVO(String mainOrderId) {
+        WebMainOrdersInfoVO webMainOrderInfoVO = mainOrdersMapper.selectWebMainOrderInfoVO(mainOrderId);
+        return webMainOrderInfoVO;
+    }
+
 
 }

leromro-core/src/main/resources/mapper/core/MainOrdersMapper.xml

@@ -139,6 +139,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select lmo.*,lvi.project_name,lvi.project_type_name,lvi.service_subject_name,lvi.business_tier_name,lvi.name,lvi.phonenumber
         from l_main_orders lmo left join l_volunteer_info lvi on lmo.volunteer_info_id = lvi.volunteer_info_id
     </select>
+    <select id="selectWebMainOrderInfoVO" resultType="com.leromro.core.domain.vo.WebMainOrdersInfoVO"
+            parameterType="java.lang.String">
+        select lmo.*,
+               lvi.name              as VolunteerName,
+               lvi.phonenumber       as VolunteerTelephone,
+               lvi.volunteer_picture as VolunteerPicture,
+               lvi.business_tier_name as businessTierName
+        from l_main_orders lmo
+                 left join l_volunteer_info lvi on lmo.volunteer_info_id = lvi.volunteer_info_id
+        where lmo.main_order_id = #{mainOrderId};
+    </select>
     <!--
         <update id="updateMainOrders" parameterType="MainOrders">
             update l_main_orders