优化销售认领记录

fs-company/src/main/java/com/fs/company/controller/qw/FsCompanyCustomerController.java

@@ -167,11 +167,9 @@ public class FsCompanyCustomerController extends BaseController {
         CompanyUser companyUser = SecurityUtils.getLoginUser().getUser();
         try {
             return toAjax(fsCompanyCustomerService.claimCustomer(fsCompanyCustomer,companyUser));
-        } catch (DuplicateKeyException e) {
-            if (e.getMessage().contains("uk_phone")) {
-                return AjaxResult.error("电话号码已存在，请更换后再试");
-            }
-            return AjaxResult.error("数据冲突，请稍后重试");
+        }catch (CustomException e){
+            log.error("认领客户异常: {}", e.getMessage());
+            return AjaxResult.error(e.getMessage());
         }
     }
 

fs-company/src/main/java/com/fs/company/controller/qw/FsCompanyCustomerLogController.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-@RequestMapping("/qw/customerlog")
+@RequestMapping("/qw/customerLog")
 @Api(tags = "客户认领记录管理")
 public class FsCompanyCustomerLogController extends BaseController {
 

fs-service/src/main/java/com/fs/qw/domain/FsCompanyCustomer.java

@@ -93,7 +93,7 @@ public class FsCompanyCustomer extends BaseEntity {
     private Integer completeStatus;
 
     //归属部门id
-    private Integer deptId;
+    private Long deptId;
 
     //归属部门名称
     private String deptName;

fs-service/src/main/java/com/fs/qw/service/impl/FsCompanyCustomerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.qw.service.impl;
 
 import com.fs.common.exception.CustomException;
+import com.fs.common.utils.DateUtils;
 import com.fs.company.domain.CompanyDept;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyDeptMapper;
@@ -58,7 +59,12 @@ public class FsCompanyCustomerServiceImpl implements IFsCompanyCustomerService {
     @Transactional(rollbackFor = Exception.class)
     public int insertFsCompanyCustomer(FsCompanyCustomer customer,CompanyUser companyUser) {
         try {
+            CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(companyUser.getDeptId());
             customer.setClaimStatus(BigDecimal.ONE.intValue());
+            customer.setDeptId(companyUser.getDeptId());
+            if (companyDept!=null&&companyDept.getDeptName()!=null){
+                customer.setDeptName(companyDept.getDeptName());
+            }
             setCompleteStatus(customer);
             int result=fsCompanyCustomerMapper.insertFsCompanyCustomer(customer);
             //单独新增也需要增加认领日志
@@ -67,7 +73,7 @@ public class FsCompanyCustomerServiceImpl implements IFsCompanyCustomerService {
             claimLog.setCompanyUserId(companyUser.getUserId());
             claimLog.setCompanyUserName(companyUser.getNickName());
             claimLog.setDeptId(companyUser.getDeptId());
-            CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(companyUser.getDeptId());
+            claimLog.setClaimTime(DateUtils.getNowDate());
             if (companyDept!=null&&companyDept.getDeptName()!=null){
                 claimLog.setDeptName(companyDept.getDeptName());
             }
@@ -182,12 +188,18 @@ public class FsCompanyCustomerServiceImpl implements IFsCompanyCustomerService {
         claimLog.setCompanyUserId(companyUser.getUserId());
         claimLog.setCompanyUserName(companyUser.getNickName());
         claimLog.setDeptId(companyUser.getDeptId());
+        claimLog.setClaimTime(DateUtils.getNowDate());
         CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(companyUser.getDeptId());
         if (companyDept!=null&&companyDept.getDeptName()!=null){
             claimLog.setDeptName(companyDept.getDeptName());
+            fsCompanyCustomer.setDeptName(companyDept.getDeptName());
         }
         //增加认领记录
         companyCustomerLogMapper.insertFsCompanyCustomerLog(claimLog);
+        //认领的同时修改销售相关信息
+        fsCompanyCustomer.setDeptId(companyUser.getDeptId());
+        fsCompanyCustomer.setCompanyUserId(companyUser.getUserId());
+        fsCompanyCustomer.setCompanyUserName(companyUser.getNickName());
         fsCompanyCustomer.setClaimStatus(BigDecimal.ONE.intValue());//已认领
         return fsCompanyCustomerMapper.updateFsCompanyCustomer(fsCompanyCustomer);
     }

fs-service/src/main/resources/mapper/qw/FsCompanyCustomerLogMapper.xml

@@ -31,6 +31,7 @@
     <select id="selectFsCompanyCustomerLogByCustomerId" parameterType="java.lang.Long" resultMap="BaseResultMap">
         <include refid="BaseColumnList" />
         WHERE company_user_id = #{companyCustomerId}
+        ORDER BY claim_time DESC
     </select>
 
     <!-- 条件查询列表-->