志愿者新增增加层级名称

leromro-core/src/main/java/com/leromro/core/domain/MainOrders.java

@@ -3,6 +3,8 @@ package com.leromro.core.domain;
 import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,8 +33,8 @@ public class MainOrders extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 订单id */
-    @TableId(type = IdType.AUTO)
     @ApiModelProperty("订单id")
+    @TableField("main_order_id")
     private String mainOrderId;
 
     /** 下单用户id */

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

@@ -47,4 +47,10 @@ public class webMainOrderListVO {
 
     @ApiModelProperty("订单创建时间")
     private Date createTime;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phonenumber;
+
+    @ApiModelProperty(value = "志愿者姓名")
+    private String name;
 }

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

@@ -80,7 +80,8 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         orders.setPaymentMethod(0);
         orders.setUserId(userId);
         orders.setCreateTime(DateTimeUtil.getNowTime());
-        mainOrdersMapper.insertMainOrders(orders);
+//        mainOrdersMapper.insertMainOrders(orders);
+        this.save(orders);
 
         //修改志愿者预约时间表
         VolunteerReservationTime reservationTime =VolunteerReservationTime.builder().volunteerId(orders.getVolunteerId()).clientId(userId).build();

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

@@ -84,6 +84,7 @@ public class VolunteerInfoServiceImpl extends ServiceImpl<VolunteerInfoMapper, V
         volunteerInfo.setVolunteerId(userId);
         volunteerInfo.setServiceCategory(serviceCategory);
         volunteerInfo.setCreateTime(DateTimeUtil.getNowTime());
+        volunteerInfo.setBusinessTierName(businessManagement.getBusinessTierName());
         QueryWrapper<VolunteerInfo> wrapper = new QueryWrapper<>();
         wrapper.eq("volunteer_id",userId).eq("service_category",serviceCategory);
         wrapper.ne(ObjectUtil.isNotNull(volunteerInfo.getVolunteerInfoId()),"volunteer_info_id",volunteerInfo.getVolunteerInfoId());

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

@@ -115,6 +115,11 @@ public class VolunteerWorkDateServiceImpl extends ServiceImpl<VolunteerWorkDateM
                     return AjaxResult.error(date.format( DateTimeFormatter.ofPattern("M月d日"))+"已被预约，无法取消，请联系客户取消预约");
                 }
             }
+            for (VolunteerWorkDate date : list) {
+                if (reservations.contains(date.getWorkDate())){
+                    date.setHasReservation(1);
+                }
+            }
         }
         list.forEach(l->l.setVolunteerId(userId));
         this.remove(new LambdaQueryWrapper<VolunteerWorkDate>().eq(VolunteerWorkDate::getVolunteerId, userId));

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

@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="webMainOrderList" resultType="com.leromro.core.domain.vo.webMainOrderListVO">
-        select *,project_name,project_type_name,service_subject_name,business_tier_name
+        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>
     <!--