From 7e18a07b17f5e504f5f2b74ab683c52a1d22ebb3 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 25 Mar 2021 17:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/crms/controller/CustomerController.java      | 1 +
 .../financial/crms/service/impl/CustomerServiceImpl.java   | 7 +++++--
 .../crms/service/impl/CustomerWorkbenchServiceImpl.java    | 2 +-
 .../service/impl/AlRepaymentEntryServiceImpl.java          | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
index 10ead555..7fc02fc7 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
@@ -126,6 +126,7 @@ public class CustomerController implements CustomerControllerApi {
     /**
      * 更新企业类型客户信息
      */
+    @ApiOperation(value = "更新企业类型客户信息", notes = "更新企业类型客户信息")
     @Log(detail = "更新企业类型客户信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.UPDATE)
     @PostMapping("/updateCompany")
     public ResponseResult updateCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) {
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
index 391a7207..61e3facb 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
@@ -666,7 +666,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         customerEntity.setMotifyTime(new Date());
         customerEntity.setManager(companyCustomerReq.getManager());
         boolean customer = customerDao.updateCustomer(customerEntity);
-        companyCustomerEntity.setCustomerId(customerEntity.getId());
+        //根据id查询crms_company_customer表里面的customerId
+        CompanyCustomerEntity entity = companyCustomerDao.selectOne(new QueryWrapper<CompanyCustomerEntity>()
+                .eq("customer_id", customerEntity.getId()));
+        companyCustomerEntity.setCustomerId(entity.getId());
         int company = companyCustomerDao.update(companyCustomerEntity, new QueryWrapper<CompanyCustomerEntity>()
                 .eq("customer_id", companyCustomerEntity.getCustomerId()));
 
@@ -680,7 +683,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         for (int i = 0; i < intList.size(); i++) {
             CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated();
             Integer integer = intList.get(i);
-            crmsCustomerRelated.setCustomerId(companyCustomerEntity.getId().intValue());//企业id
+            crmsCustomerRelated.setCustomerId(companyCustomerEntity.getCustomerId().intValue());//企业id  companyCustomerEntity.getId().intValue()
             crmsCustomerRelated.setRelatedId(integer);//关联人/企业id
             relatedList.add(crmsCustomerRelated);
         }
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java
index a73354be..a4c68295 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java
@@ -301,7 +301,7 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
     @Transactional
     public Boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
 
-        Long userId = Long.parseLong(this.getUserId());
+        Long userId = Long.parseLong("1");//this.getUserId()
         companyCustomerReq.setManager(userId);
         return customerService.updateCompanyNew(companyCustomerReq);
     }
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
index b87f245c..aa692749 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java
@@ -137,7 +137,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
         map.put("overdueInterest",interestSum);
 
         //统计逾期额度（元）(计算状态为已逾期的所有本次还款的合计数)
-        map.put("overdueSum",currentSum);
+        map.put("currentSum",currentSum);
 
         //统计还款额度（元）(统计状态为已还款的本次还款)
         List<AlRepaymentEntry> list2 = this.baseMapper.selectList(new QueryWrapper<AlRepaymentEntry>()