恢复到之前的版本

leromro-core/src/main/java/com/leromro/core/controller/OrdersController.java

@@ -103,7 +103,7 @@ public class OrdersController extends BaseController {
         Address address = Address.builder().address(mainOrders.getAddress()).name(mainOrders.getClientName()).telephone(mainOrders.getClientTelephone()).build();
         /* QueryWrapper<Address> addressQueryWrapper = new QueryWrapper<Address>().eq("address_id", mainOrders.getAddressId());
         Address address = addressService.getOne(addressQueryWrapper);*/
-        QueryWrapper<VolunteerInfo> volunteerInfoQueryWrapper = new QueryWrapper<VolunteerInfo>().eq("volunteer_info_id", mainOrders.getVolunteerId());
+        QueryWrapper<VolunteerInfo> volunteerInfoQueryWrapper = new QueryWrapper<VolunteerInfo>().eq("volunteer_id", mainOrders.getVolunteerId()).eq("service_category",mainOrders.getServiceCategory());
         VolunteerInfo volunteerInfo = volunteerInfoService.list(volunteerInfoQueryWrapper).get(0);
         OrdersInfoVO ordersInfoVO = new OrdersInfoVO();
         ordersInfoVO.setMainOrders(mainOrders);

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

@@ -65,6 +65,10 @@ public class MainOrders extends BaseEntity
     @ApiModelProperty("服务总评分")
     private Long score;
 
+    /** 服务大类别 */
+    @Excel(name = "服务大类别")
+    @ApiModelProperty("服务大类别")
+    private Long serviceCategory;
 
     /** 总次数 */
     @Excel(name = "总次数")

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

@@ -130,7 +130,7 @@ public class VolunteerInfo extends BaseEntity {
     @ApiModelProperty("省级名称")
     private String provinceName;
 
-    @TableField("city_code")
+    @TableField("cityCode")
     @ApiModelProperty("市级编号")
     private String cityCode;
 

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

@@ -222,7 +222,8 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
 
         //创建小订单模板
         //
-        SecondOrder secondOrder = SecondOrder.builder().mainOrderId(orderId).volunteerId(orders.getVolunteerId()).serviceDuration(orders.getServiceDuration()).addressId(orders.getAddressId())
+        SecondOrder secondOrder = SecondOrder.builder().mainOrderId(orderId).volunteerId(orders.getVolunteerId()).
+                serviceCategory(orders.getServiceCategory()).serviceDuration(orders.getServiceDuration()).addressId(orders.getAddressId())
                 .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())