clientId 改为 userId

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

@@ -71,7 +71,7 @@ public class SecondOrder extends BaseEntity
     /** 志愿者id */
     @Excel(name = "用户id")
     @ApiModelProperty("用户id")
-    private Long clientId;
+    private Long userId;
 
     /** order_status */
     @Excel(name = "订单状态 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()).clientId(userId)
+                .longitude(address.getLongitude()).latitude(address.getLatitude()).userId(userId)
                 .address(address.getAddress()).areaSettlementStatus("10").volunteerSettlementStatus("10").serviceCentreSettlementStatus("10")
                 .secondOrderCreateTime(DateTimeUtil.getNowTime())
                 .outTradeNo(orderNo)

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

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