小订单新增字段clientId

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

@@ -68,6 +68,11 @@ public class SecondOrder extends BaseEntity
     @ApiModelProperty("志愿者id")
     private Long volunteerId;
 
+    /** 志愿者id */
+    @Excel(name = "用户id")
+    @ApiModelProperty("用户id")
+    private Long clientId;
+
     /** order_status */
     @Excel(name = "订单状态 0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款  ")
     @ApiModelProperty("订单状态 0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款  ")

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

@@ -244,7 +244,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
                 .serviceOnePrice(orders.getServiceOnePrice()).volunteerInfoId(orders.getVolunteerInfoId()).orderStatus(seconderStatus)
                 .provinceCode(address.getProvinceCode()).cityCode(address.getCityCode()).districtCode(address.getDistrictCode())
                 .provinceName(address.getProvinceName()).cityName(address.getCityName()).districtName(address.getDistrictName())
-                .longitude(address.getLongitude()).latitude(address.getLatitude())
+                .longitude(address.getLongitude()).latitude(address.getLatitude()).clientId(userId)
                 .address(address.getAddress()).areaSettlementStatus("10").volunteerSettlementStatus("10").serviceCentreSettlementStatus("10")
                 .secondOrderCreateTime(DateTimeUtil.getNowTime())
                 .outTradeNo(orderNo)

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

@@ -363,6 +363,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         List<VolunteerReservationTime> reservationTimes = new ArrayList<>();
         for (SecondOrder secondOrder : secondOrderList) {
             int parts = (int) (secondOrder.getServiceDuration() * mainOrders.getSingleQuantity() /30);
+            //给志愿者多加半个小时（产品提出用来赶路）
+            parts++;
             if (secondOrder.getServiceDuration() % 30 != 0){
                 parts++;
             }

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         out_trade_no,
         main_order_id,
         volunteer_id,
+        client_id,
         service_category,
         service_one_price,
         work_start_time,
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{secondOrder.outTradeNo},
                 #{secondOrder.mainOrderId},
                 #{secondOrder.volunteerId},
+                #{secondOrder.clientId},
                 #{secondOrder.serviceCategory},
                 #{secondOrder.serviceOnePrice},
                 #{secondOrder.workStartTime},