志愿者订单列表返回主订单id以及业务单号

leromro-common/src/main/java/com/leromro/common/constant/CommonConstants.java

@@ -16,7 +16,7 @@ public class CommonConstants {
     //校验省市
     public static final String CHECK_PROVINCE_CITY= "province_code,city_code";
     //校验省市区（和志愿者表的联查）
-    public static final String CHECK_VOLUNTEER_PROVINCE_CITY_DISTRICT = "province_code,city_code,district_code";
+    public static final String CHECK_VOLUNTEER_PROVINCE_CITY_DISTRICT = "lvi.province_code,lvi.city_code,lvi.district_code";
     //校验省市区（无联查）
     public static final String CHECK_PROVINCE_CITY_DISTRICT = "province_code,city_code,district_code";
 }

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

@@ -148,7 +148,7 @@ public class VolunteerInfoServiceImpl extends ServiceImpl<VolunteerInfoMapper, V
     @Override
     public List<VolunteerInfoVO> selectVolunteerInfoList(VolunteerInfo volunteerInfo) {
         //查询出志愿者信息
-        List<VolunteerInfoVO> infos = volunteerInfoMapper.selectVolunteerInfoSimple(new ListPermission(SecondOrder.class, CommonConstants.CHECK_PROVINCE_CITY_DISTRICT),volunteerInfo);
+        List<VolunteerInfoVO> infos = volunteerInfoMapper.selectVolunteerInfoSimple(new ListPermission(VolunteerInfo.class, CommonConstants.CHECK_PROVINCE_CITY_DISTRICT),volunteerInfo);
         //查询出所有服务名称
         Map<Long, String> idMapTierName = businessManagementService.list().stream().collect(Collectors.toMap(BusinessManagement::getBusinessManagementId, BusinessManagement::getBusinessTierName));
         if (ObjectUtil.isNotEmpty(infos)){

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

@@ -245,6 +245,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectVolunteerOrder" resultType="com.leromro.core.domain.vo.VolunteerOrdersVO">
         select lso.second_order_id,
+               lso.main_order_id,
+               lso.out_trade_no,
+        slo.volunteer_settlement_status,
         lso.work_date,
         lso.work_start_time,
         lso.work_end_time,