push

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

@@ -51,6 +51,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -480,6 +482,16 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
                 .map(ApiRuleDTO::getRuleBizId)
                 .collect(Collectors.toList());
         csfClientUser.setRuleBizIds(CollectionUtils.isNotEmpty(ruleBizIdList) ? String.join(";",ruleBizIdList) : "");
+
+        //合同签订日期
+        csfClientUser.setContractSigningDate(userDTO.getContractSigningDate() != null ? userDTO.getContractSigningDate().toInstant()
+                .atZone(ZoneId.of("GMT+8"))
+                .toLocalDateTime() : null);
+        //离职日
+        csfClientUser.setLastWorkingDay(userDTO.getLastWorkingDay() != null ? userDTO.getLastWorkingDay().toInstant()
+                .atZone(ZoneId.of("GMT+8"))
+                .toLocalDateTime() : null);
+
         csfClientUserService.saveOrUpdate(csfClientUser);
 
         //根据绑定的基本法配置，新增基本法绑定表记录
@@ -580,6 +592,10 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
             saveRequest.setApprovalStatus(CommonEnum.APPROVAL_STATUS_CG.getCode());
             saveRequest.setName(userDTO.getName());
             saveRequest.setPhone(userDTO.getPhone());
+            saveRequest.setEmail(userDTO.getEmail());
+            saveRequest.setGender(Integer.parseInt(userDTO.getGender()));
+            saveRequest.setIdCardType(userDTO.getCardType());
+            saveRequest.setIdCardNumber(userDTO.getCardNo());
             //注册来源-PC
             saveRequest.setRegisterSource(CommonEnum.SOURCE_TYPE_PC.getCode());
             saveRequest.setStatus(1);
@@ -642,6 +658,15 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
                 csfClientUser.setTeamBizId(team1.getTeamBizId());
             }
         }
+
+        //合同签订日期
+        csfClientUser.setContractSigningDate(userDTO.getContractSigningDate() != null ? userDTO.getContractSigningDate().toInstant()
+                .atZone(ZoneId.of("GMT+8"))
+                .toLocalDateTime() : null);
+        //离职日
+        csfClientUser.setLastWorkingDay(userDTO.getLastWorkingDay() != null ? userDTO.getLastWorkingDay().toInstant()
+                .atZone(ZoneId.of("GMT+8"))
+                .toLocalDateTime() : null);
         csfClientUserService.saveOrUpdate(csfClientUser);
 
         //根据初始化职级，fyc表（业务员累计积分表 - 存储业务员的累计FYC积分和当前等级信息）新增初始化记录
@@ -657,7 +682,7 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
         bindingRequest.setTargetName(csfClientUser.getName());
         bindingRequest.setTargetType("AGENT");
         bindingRequest.setStatus(1);
-        bindingRequest.setRuleBizIdList(roleBizIdList);
+        bindingRequest.setRuleBizIdList(ruleBizIdList);
         apiCommissionRuleBindingService.saveCommissionRuleBinding(bindingRequest);
 
         //保存用户银行列表信息
@@ -670,6 +695,9 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
             BeanUtils.copyProperties(csfClientUser,saleExpandSaveRequest);
             saleExpandSaveRequest.setRealName(csfClientUser.getName());
             saleExpandSaveRequest.setClientUserBizId(csfClientUser.getClientUserBizId());
+            saleExpandSaveRequest.setRaNumber(csfClientUser.getRaNumber());
+            saleExpandSaveRequest.setContractSigningDate(csfClientUser.getContractSigningDate());
+            saleExpandSaveRequest.setLastWorkingDay(csfClientUser.getLastWorkingDay());
             try {
                 apiUserSaleExpandFeignClient.save(saleExpandSaveRequest);
             }catch (Exception e){
@@ -683,6 +711,9 @@ public class ApiCsfClientUserServiceImpl implements ApiCsfClientUserService {
             BeanUtils.copyProperties(csfClientUser,signExpandSaveRequest);
             signExpandSaveRequest.setRealName(csfClientUser.getName());
             signExpandSaveRequest.setClientUserBizId(csfClientUser.getClientUserBizId());
+            signExpandSaveRequest.setRaNumber(csfClientUser.getRaNumber());
+            signExpandSaveRequest.setContractSigningDate(csfClientUser.getContractSigningDate());
+            signExpandSaveRequest.setLastWorkingDay(csfClientUser.getLastWorkingDay());
             try {
                 apiUserSignExpandFeignClient.save(signExpandSaveRequest);
             }catch (Exception e){

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

@@ -44,6 +44,7 @@ public class ApiUserBankServiceImpl implements ApiUserBankService {
         List<UserBank> saveList = bankDTOList.stream().map(d -> {
             UserBank userBank = new UserBank();
             BeanUtils.copyProperties(d,userBank);
+            userBank.setCsfClientUserBizId(csfClientUser.getCsfClientUserBizId());
             return userBank;
         }).collect(Collectors.toList());