goi
/
crm-rest-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sales 정보 추가. contractby 는 고객.

This commit is contained in:
Hyojin Ahn 2026-06-12 12:19:15 -04:00
parent 445fc24862
commit ce88da78c7
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/goi/erp/dto/CustomerRequestDto.java
View File

@ -55,5 +55,8 @@ public class CustomerRequestDto {
private String cusSourceType;
private LocalDateTime cusCreatedAt;
private LocalDateTime cusUpdatedAt;
private String cusSalesperson;
private LocalDate cusSalesCommissionDate;
private String cusSalesMethod;
}

3
src/main/java/com/goi/erp/dto/CustomerResponseDto.java
View File

@ -55,4 +55,7 @@ public class CustomerResponseDto {
private String cusContactComment;
private LocalDateTime cusCreatedAt;
private LocalDateTime cusUpdatedAt;
private String cusSalesperson;
private LocalDate cusSalesCommissionDate;
private String cusSalesMethod;
}

3
src/main/java/com/goi/erp/entity/Customer.java
View File

@ -85,4 +85,7 @@ public class Customer {
private String cusUpdatedBy;
private LocalDateTime cusCreatedAt;
private LocalDateTime cusUpdatedAt;
private String cusSalesperson;
private LocalDate cusSalesCommissionDate;
private String cusSalesMethod;
}

30
src/main/java/com/goi/erp/service/CustomerService.java
View File

@ -33,11 +33,6 @@ public class CustomerService {
public CustomerResponseDto createCustomer(CustomerRequestDto dto) {
//
String contractedBy = dto.getCusContractedBy();
if ("MIS".equalsIgnoreCase(dto.getCusSourceType())) {
contractedBy = resolveEmpNo(null, dto.getCusContractedBy());
}
String createdBy = resolveEmpNo(dto.getCusLoginUser(),dto.getCusExternalCreatedBy());
//
@ -60,7 +55,7 @@ public class CustomerService {
.cusPhoneExt(dto.getCusPhoneExt())
.cusContractDate(dto.getCusContractDate())
// .cusContractedBy(dto.getCusContractedBy())
.cusContractedBy(contractedBy)
.cusContractedBy(dto.getCusContractedBy())
.cusInstallDate(dto.getCusInstallDate())
.cusSchedule(dto.getCusSchedule())
.cusScheduledays(dto.getCusScheduledays())
@ -75,6 +70,9 @@ public class CustomerService {
.cusComment(dto.getCusComment())
.cusContactComment(dto.getCusContactComment())
.cusInstallLocation(dto.getCusInstallLocation())
.cusSalesperson(dto.getCusSalesperson())
.cusSalesCommissionDate(dto.getCusSalesCommissionDate())
.cusSalesMethod(dto.getCusSalesMethod())
.cusCreatedBy(createdBy)
.cusCreatedAt(LocalDateTime.now())
.cusUpdatedAt(LocalDateTime.now())
@ -126,7 +124,7 @@ public class CustomerService {
if (dto.getCusPhone() != null) customer.setCusPhone(dto.getCusPhone());
if (dto.getCusPhoneExt() != null) customer.setCusPhoneExt(dto.getCusPhoneExt());
if (dto.getCusContractDate() != null) customer.setCusContractDate(dto.getCusContractDate());
// if (dto.getCusContractedBy() != null) customer.setCusContractedBy(dto.getCusContractedBy());
if (dto.getCusContractedBy() != null) customer.setCusContractedBy(dto.getCusContractedBy());
if (dto.getCusInstallDate() != null) customer.setCusInstallDate(dto.getCusInstallDate());
if (dto.getCusSchedule() != null) customer.setCusSchedule(dto.getCusSchedule());
if (dto.getCusScheduledays() != null) customer.setCusScheduledays(dto.getCusScheduledays());
@ -147,17 +145,13 @@ public class CustomerService {
if (dto.getCusComment() != null) customer.setCusComment(dto.getCusComment());
if (dto.getCusContactComment() != null) customer.setCusContactComment(dto.getCusContactComment());
if (dto.getCusInstallLocation() != null) customer.setCusInstallLocation(dto.getCusInstallLocation());
if (dto.getCusSalesperson() != null) customer.setCusSalesperson(dto.getCusSalesperson());
if (dto.getCusSalesCommissionDate() != null) customer.setCusSalesCommissionDate(dto.getCusSalesCommissionDate());
if (dto.getCusSalesMethod() != null) customer.setCusSalesMethod(dto.getCusSalesMethod());
// 보내는 값 무시
customer.setCusUpdatedAt(LocalDateTime.now());
// external
if (dto.getCusContractedBy() != null) {
String contractedBy = dto.getCusContractedBy();
if ("MIS".equalsIgnoreCase(dto.getCusSourceType())) {
contractedBy = resolveEmpNo(null, dto.getCusContractedBy());
}
customer.setCusContractedBy(contractedBy);
}
if (dto.getCusExternalUpdatedBy() != null) {
String updatedBy = dto.getCusExternalUpdatedBy();
if ("MIS".equalsIgnoreCase(dto.getCusSourceType())) {
@ -215,6 +209,9 @@ public class CustomerService {
dto.setCusInstallLocation(customer.getCusInstallLocation());
dto.setCusCreatedAt(customer.getCusCreatedAt());
dto.setCusUpdatedAt(customer.getCusUpdatedAt());
dto.setCusSalesperson(customer.getCusSalesperson());
dto.setCusSalesCommissionDate(customer.getCusSalesCommissionDate());
dto.setCusSalesMethod(customer.getCusSalesMethod());
return dto;
}
@ -328,7 +325,10 @@ public class CustomerService {
Map.entry("cusOpenTime", "cus_open_time"),
Map.entry("cusComment", "cus_comment"),
Map.entry("cusContactComment", "cus_contact_comment"),
Map.entry("cusInstallLocation", "cus_install_location")
Map.entry("cusInstallLocation", "cus_install_location"),
Map.entry("cusSalesperson", "cus_salesperson"),
Map.entry("cusSalesCommissionDate", "cus_sales_commission_date"),
Map.entry("cusSalesMethod", "cus_sales_method")
);
Class<?> clazz = Customer.class;