feat: 服务标题

common/src/main/java/com/onsiteservice/common/order/vo/ServiceOrderVO.java

@@ -21,6 +21,9 @@ public class ServiceOrderVO {
     @ApiModelProperty(value = "服务名")
     private String serviceName;
 
+    @ApiModelProperty(value = "服务标题")
+    private String serviceSubclassName;
+
     @ApiModelProperty(value = "客户名")
     private String name;
     @ApiModelProperty(value = "客户手机号")

mini-app/src/main/java/com/onsiteservice/miniapp/controller/category/HomeCommonController.java

@@ -3,7 +3,6 @@ package com.onsiteservice.miniapp.controller.category;
 import com.onsiteservice.common.annotation.user.CurrentUserId;
 import com.onsiteservice.core.result.Result;
 import com.onsiteservice.miniapp.controller.category.vo.HomeViewVO;
-import com.onsiteservice.miniapp.controller.category.vo.ServiceAreaVO;
 import com.onsiteservice.miniapp.service.category.HomeCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * <P>服务大类模块</P>

mini-app/src/main/java/com/onsiteservice/miniapp/controller/worker/vo/ServiceValuatorVO.java

 package com.onsiteservice.miniapp.controller.worker.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java

@@ -183,7 +183,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
         // 客户手机号
         serviceOrder.setPhone(serviceAddress.getPhone());
         // 客户地址
-        serviceOrder.setAddress(serviceAddress.getAddress());
+        serviceOrder.setAddress(serviceAddress.getNamePath() + serviceAddress.getAddress());
         // 创建人
         serviceOrder.setCreateBy(userId);
         // 服务名
@@ -341,6 +341,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
             serviceOrderVO.setId(serviceOrder.getId());
             serviceOrderVO.setOrderNo(serviceOrder.getOrderNo());
             serviceOrderVO.setServiceName(serviceOrder.getServiceName());
+            serviceOrderVO.setServiceSubclassName(serviceOrder.getServiceName().split("-")[1]);
             serviceOrderVO.setName(serviceOrder.getName());
             serviceOrderVO.setPhone(serviceOrder.getPhone());
             serviceOrderVO.setAddress(serviceOrder.getAddress());