push

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiAppointmentReferrerService.java

@@ -9,4 +9,6 @@ public interface ApiAppointmentReferrerService {
 
     Result saveAppointmentReferrerList(List<ApiAppointmentReferrerDto> referrerDtoList,
                                        String appointmentBizId);
+
+    List<ApiAppointmentReferrerDto> referrerDtoList(String appointmentBizId);
 }

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiAppointmentUserSignService.java

@@ -9,4 +9,6 @@ public interface ApiAppointmentUserSignService {
 
     Result saveAppointmentUserSignList(List<ApiAppointmentUserSignDto> userSignDtoList,
                                        String appointmentBizId);
+
+    List<ApiAppointmentUserSignDto> userSignDtoList(String appointmentBizId);
 }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentReferrerServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,4 +51,23 @@ public class ApiAppointmentReferrerServiceImpl implements ApiAppointmentReferrer
 
         return Result.success();
     }
+
+    /**
+     * 查询-转介人信息列表
+     * @param appointmentBizId
+     * @return
+     */
+    @Override
+    public List<ApiAppointmentReferrerDto> referrerDtoList(String appointmentBizId) {
+        List<AppointmentReferrer> appointmentReferrerList = iAppointmentReferrerService.queryList(appointmentBizId);
+        if (CollectionUtils.isEmpty(appointmentReferrerList)) {
+            return new ArrayList<>();
+        }
+        List<ApiAppointmentReferrerDto> list = appointmentReferrerList.stream().map(dto -> {
+            ApiAppointmentReferrerDto referrerDto = new ApiAppointmentReferrerDto();
+            BeanUtils.copyProperties(dto,referrerDto);
+            return referrerDto;
+        }).collect(Collectors.toList());
+        return list;
+    }
 }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

@@ -162,6 +162,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         Appointment appointment = result.getData();
         ApiAppointmentInfoDto dto = new ApiAppointmentInfoDto();
         BeanUtils.copyProperties(appointment, dto);
+        dto.setReferrerDtoList(appointmentReferrerService.referrerDtoList(appointmentBizId));
+        dto.setUserSignDtoList(apiAppointmentUserSignService.userSignDtoList(appointmentBizId));
         response.setApiAppointmentInfoDto(dto);
         //产品计划信息
         Result<ApiProductPlanInfoDto> result1 = apiProductPlanService.detail(appointmentBizId, "");

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentUserSignServiceImpl.java

@@ -4,6 +4,7 @@ import com.yd.common.enums.CommonEnum;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.api.service.ApiAppointmentUserSignService;
+import com.yd.csf.feign.dto.appointment.ApiAppointmentReferrerDto;
 import com.yd.csf.feign.dto.appointment.ApiAppointmentUserSignDto;
 import com.yd.csf.service.model.AppointmentReferrer;
 import com.yd.csf.service.model.AppointmentUserSign;
@@ -13,6 +14,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -49,4 +52,18 @@ public class ApiAppointmentUserSignServiceImpl implements ApiAppointmentUserSign
 
         return Result.success();
     }
+
+    @Override
+    public List<ApiAppointmentUserSignDto> userSignDtoList(String appointmentBizId) {
+        List<AppointmentUserSign> appointmentUserSignList = iAppointmentUserSignService.queryList(appointmentBizId);
+        if (CollectionUtils.isEmpty(appointmentUserSignList)) {
+            return new ArrayList<>();
+        }
+        List<ApiAppointmentUserSignDto> list = appointmentUserSignList.stream().map(dto -> {
+            ApiAppointmentUserSignDto appointmentUserSignDto = new ApiAppointmentUserSignDto();
+            BeanUtils.copyProperties(dto,appointmentUserSignDto);
+            return appointmentUserSignDto;
+        }).collect(Collectors.toList());
+        return list;
+    }
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiAppointmentInfoDto.java

@@ -114,6 +114,11 @@ public class ApiAppointmentInfoDto {
     private String bankName;
 
     /**
+     * 开户行ID
+     */
+    private String bankId;
+
+    /**
      * 开户行支行（分行）
      */
     private String bankBranchName;

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiAppointmentReferrerDto.java

@@ -6,6 +6,11 @@ import lombok.Data;
 public class ApiAppointmentReferrerDto {
 
     /**
+     * 预约-转介人信息表唯一业务ID
+     */
+    private String appointmentReferrerBizId;
+
+    /**
      * 系统用户-销售用户扩展表唯一业务ID（转介人，冗余）
      */
     private String userSaleBizId;

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiAppointmentUserSignDto.java

@@ -6,6 +6,11 @@ import lombok.Data;
 public class ApiAppointmentUserSignDto {
 
     /**
+     * 预约-签单员信息表唯一业务ID
+     */
+    private String appointmentUserSignBizId;
+
+    /**
      * 签单用户扩展唯一业务ID（冗余）
      */
     private String userSignBizId;

yd-csf-service/src/main/java/com/yd/csf/service/model/Appointment.java

@@ -244,6 +244,12 @@ public class Appointment implements Serializable {
     private String bankName;
 
     /**
+     * 开户行ID
+     */
+    @TableField("bank_id")
+    private String bankId;
+
+    /**
      * 开户行支行（分行）
      */
     @TableField("bank_branch_name")

yd-csf-service/src/main/java/com/yd/csf/service/service/IAppointmentReferrerService.java

@@ -3,6 +3,8 @@ package com.yd.csf.service.service;
 import com.yd.csf.service.model.AppointmentReferrer;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 预约-转介人信息表 服务类
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IAppointmentReferrerService extends IService<AppointmentReferrer> {
 
     Boolean delByAppointmentBizId(String appointmentBizId);
+
+    List<AppointmentReferrer> queryList(String appointmentBizId);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/IAppointmentUserSignService.java

@@ -3,6 +3,8 @@ package com.yd.csf.service.service;
 import com.yd.csf.service.model.AppointmentUserSign;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 预约-签单员信息表 服务类
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IAppointmentUserSignService extends IService<AppointmentUserSign> {
 
     Boolean delByAppointmentBizId(String appointmentBizId);
+
+    List<AppointmentUserSign> queryList(String appointmentBizId);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/AppointmentReferrerServiceImpl.java

@@ -7,6 +7,8 @@ import com.yd.csf.service.service.IAppointmentReferrerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 预约-转介人信息表 服务实现类
@@ -22,4 +24,10 @@ public class AppointmentReferrerServiceImpl extends ServiceImpl<AppointmentRefer
     public Boolean delByAppointmentBizId(String appointmentBizId) {
         return this.remove(new LambdaQueryWrapper<AppointmentReferrer>().eq(AppointmentReferrer::getAppointmentBizId,appointmentBizId));
     }
+
+    @Override
+    public List<AppointmentReferrer> queryList(String appointmentBizId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<AppointmentReferrer>()
+                .eq(AppointmentReferrer::getAppointmentBizId,appointmentBizId));
+    }
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/AppointmentUserSignServiceImpl.java

@@ -7,6 +7,8 @@ import com.yd.csf.service.service.IAppointmentUserSignService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 预约-签单员信息表 服务实现类
@@ -22,4 +24,10 @@ public class AppointmentUserSignServiceImpl extends ServiceImpl<AppointmentUserS
     public Boolean delByAppointmentBizId(String appointmentBizId) {
         return this.remove(new LambdaQueryWrapper<AppointmentUserSign>().eq(AppointmentUserSign::getAppointmentBizId,appointmentBizId));
     }
+
+    @Override
+    public List<AppointmentUserSign> queryList(String appointmentBizId) {
+        return this.baseMapper.selectList(new LambdaQueryWrapper<AppointmentUserSign>()
+                .eq(AppointmentUserSign::getAppointmentBizId,appointmentBizId));
+    }
 }