1、订单结算、订单结算审核功能中志愿者名称改为使用志愿者注册时填写的名称

2、结算申请接口出错修复

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

@@ -234,7 +234,7 @@ public class SecondOrdersServiceImpl extends ServiceImpl<SecondOrdersMapper, Sec
     public void updateAreaSettlementStatus(List<Long> secondOrderIds, String status) {
         this.update(new LambdaUpdateWrapper<SecondOrder>()
                 .set(SecondOrder::getAreaSettlementStatus, status)
-                .eq(SecondOrder::getSecondOrderId, secondOrderIds));
+                .in(SecondOrder::getSecondOrderId, secondOrderIds));
     }
 
     @Override
@@ -267,7 +267,7 @@ public class SecondOrdersServiceImpl extends ServiceImpl<SecondOrdersMapper, Sec
     public void updateServiceCentreSettlementStatus(List<Long> secondOrderIds, String status) {
         this.update(new LambdaUpdateWrapper<SecondOrder>()
                 .set(SecondOrder::getServiceCentreSettlementStatus, status)
-                .eq(SecondOrder::getSecondOrderId, secondOrderIds));
+                .in(SecondOrder::getSecondOrderId, secondOrderIds));
     }
 
     /**

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

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             l_second_order.out_trade_no AS outTradeNo,
             l_second_order.create_time AS orderTime,
             su_user.nick_name AS userNickName,
-            su_volunteer.nick_name AS volunteerName,
+            lvi.name AS volunteerName,
             lvi.business_describe AS businessDescribe,
             lvi.business_tier_name AS businessTierName,
             l_second_order.service_start_time AS serviceStartTime,
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         l_second_order.out_trade_no AS outTradeNo,
         l_second_order.create_time AS orderTime,
         su_user.nick_name AS userNickName,
-        su_volunteer.nick_name AS volunteerName,
+        lvi.name AS volunteerName,
         lvi.business_describe AS businessDescribe,
         lvi.business_tier_name AS businessTierName,
         l_second_order.service_start_time AS serviceStartTime,

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

@@ -309,7 +309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.out_trade_no AS outTradeNo,
         a.create_time AS orderTime,
         su_user.nick_name AS userNickName,
-        su_volunteer.nick_name AS volunteerName,
+        lvi.name AS volunteerName,
         lvi.business_describe AS businessDescribe,
         lvi.business_tier_name AS businessTierName,
         a.service_start_time AS serviceStartTime,
@@ -440,7 +440,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.out_trade_no AS outTradeNo,
         a.create_time AS orderTime,
         su_user.nick_name AS userNickName,
-        su_volunteer.nick_name AS volunteerName,
+        lvi.name AS volunteerName,
         lvi.business_describe AS businessDescribe,
         lvi.business_tier_name AS businessTierName,
         a.service_start_time AS serviceStartTime,