修改

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/CustomerController.java

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.iaw.api.MyValidController;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
+import cn.com.taiji.iaw.dto.comm.CustomerInfoResponseDTO;
 import cn.com.taiji.iaw.dto.comm.CustomerQueryResponseDTO;
 import cn.com.taiji.iaw.manager.comm.CustomerManager;
 import io.swagger.annotations.Api;
@@ -37,4 +38,10 @@ public class CustomerController extends MyValidController {
         return ApiResponse.of(manager.queryDetail(dto));
     }
 
+    @ApiOperation("客户详情-个人信息修改")
+    @PostMapping("/detailForChange")
+    public ApiResponse<CustomerInfoResponseDTO> detailForChange(@Valid @RequestBody CommRequestDTO dto) throws ManagerException {
+        return ApiResponse.of(manager.detailForChange(dto));
+    }
+
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/CustomerInfoResponseDTO.java

@@ -0,0 +1,10 @@
+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.iaw.model.base.CustomerInfoModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "客户信息返回")
+public class CustomerInfoResponseDTO extends CustomerInfoModel {
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/CustomerManager.java

@@ -3,6 +3,7 @@ package cn.com.taiji.iaw.manager.comm;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
+import cn.com.taiji.iaw.dto.comm.CustomerInfoResponseDTO;
 import cn.com.taiji.iaw.dto.comm.CustomerQueryResponseDTO;
 
 import java.util.List;
@@ -13,4 +14,5 @@ public interface CustomerManager {
 
     CustomerQueryResponseDTO queryDetail(CommRequestDTO dto) throws ManagerException;
 
+    CustomerInfoResponseDTO detailForChange(CommRequestDTO dto) throws ManagerException;
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/CustomerManagerImpl.java

@@ -7,6 +7,7 @@ import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
+import cn.com.taiji.iaw.dto.comm.CustomerInfoResponseDTO;
 import cn.com.taiji.iaw.dto.comm.CustomerQueryResponseDTO;
 import cn.com.taiji.iaw.manager.AbstractCommManager;
 import com.google.common.collect.Maps;
@@ -93,5 +94,13 @@ public class CustomerManagerImpl extends AbstractCommManager implements Customer
         return model;
     }
 
-
+    @Override
+    public CustomerInfoResponseDTO detailForChange(CommRequestDTO dto) throws ManagerException {
+        dto.validate();
+        QtkCustomerInfo customerInfo = customerInfoRepo.findByCustomerId(dto.getCustomerId());
+        if(customerInfo == null){
+            throw new ManagerException("客户信息不存在");
+        }
+        return copyProperties(customerInfo, new CustomerInfoResponseDTO());
+    }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java

@@ -3,10 +3,12 @@ package cn.com.taiji.managew.manager.ass;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangePageResDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.model.MyFinals;
@@ -40,6 +42,26 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
             pageRequest.setAgencyId(null);
         }
         pageRequest.setAgencyId(findAgencyIdByToken(dto.getAccessToken()));
-        return repo.page(pageRequest);
+        return repo.page(pageRequest).convertResult(this::toModel);
+    }
+
+    private AssCustomerInfoChangePageResDTO toModel(AssOrderinfo orderInfo) {
+        AssCustomerInfoChangePageResDTO model = new AssCustomerInfoChangePageResDTO();
+        copyProperties(orderInfo, model);
+        //处理业务类型
+        model.setOrderType(orderInfo.getOrderType().getDesc());
+        //处理审核人
+        String openId = orderInfo.getAuditOpenId();
+        if(hasText(openId)){
+            if("-1".equals(openId)){
+                model.setAuditName("系统");
+            }else {
+                Staff staff = staffRepo.findByOpenId(openId);
+                if (staff != null) {
+                    model.setAuditName(staff.getStaffName());
+                }
+            }
+        }
+        return model;
     }
 }