p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

code review：客户的分配和领取

This commit is contained in:
YunaiV 2023-11-19 00:05:06 +08:00
parent e519b41244
commit f589881de5
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
View File

@ -1,9 +1,6 @@
package cn.iocoder.yudao.module.crm.controller.admin.customer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@ -185,17 +182,20 @@ public class CrmCustomerController {
}
@PutMapping("/receive")
@Operation(summary = "根据客户id领取公海任务")
@Operation(summary = "领取公海客户")
// TODO @xiaqing：1）receiveCustomer 方法名字；2）cIds 改成 ids，要加下 @RequestParam，还有 swagger 注解；3）参数非空，使用 validator 校验；4）返回 true 即可；
@PreAuthorize("@ss.hasPermission('crm:customer:receive')")
public CommonResult<String> receiveByIds(List<Long> cIds){
// 判断是否为空
if(CollectionUtils.isEmpty(cIds))
return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),GlobalErrorCodeConstants.BAD_REQUEST.getMsg());
// 领取公海任务
// TODO @xiaqing：userid，通过 controller 传递给 service，不要在 service 里面获取，无状态
customerService.receive(cIds);
return success("领取成功");
}
// TODO @xiaqing：1）distributeCustomer 方法名；2）cIds 同上；3）参数校验，同上；4）ownerId 改成 ownerUserId，和别的模块统一；5）返回 true 即可；
@PutMapping("/distributeByIds")
@Operation(summary = "分配公海给对应负责人")
@PreAuthorize("@ss.hasPermission('crm:customer:distributeByIds')")
@ -207,5 +207,4 @@ public class CrmCustomerController {
return success("分配成功");
}
}

14
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
View File

@ -85,20 +85,22 @@ public interface CrmCustomerService {
*/
void lockCustomer(@Valid CrmCustomerUpdateReqVO updateReqVO);
// TODO @xiaqing：根据 controller 的建议，改下
/**
* 描述 :接受公海客户
* Author :xiaqing
* Date :2023-11-07 22:47:40
* 领取公海客户
*
* @param ids 要领取的客户 id
*/
void receive(List<Long>ids);
// TODO @xiaqing：根据 controller 的建议，改下
/**
* 分配公海客户
*
*功能描述: 分配负责人
* @param cIds 要分配的客户id
* @param cIds 要分配的客户 id
* @param ownerId 分配的负责人id
* @author xiaqing
* @date 2023-11-08 10:40:22
*/
void distributeByIds(List<Long>cIds,Long ownerId);
}

17
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
View File

@ -21,16 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CUSTOMER_NOT_EXISTS;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
/**
@ -178,7 +172,8 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
}
private void transferCustomerOwner(List <Long> cIds, Long ownerId){
//先一次性校验完成客户是否可用
// 先一次性校验完成客户是否可用
// TODO @xiaqing：批量一次性加载客户列表，然后去逐个校验；
for (Long cId : cIds) {
//校验是否存在
validateCustomerExists(cId);
@ -189,13 +184,14 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
//todo 校验成交状态
validCustomerDeal(cId);
}
// TODO @xiaqing：每个客户更新的时候，where 条件，加上 owner_user_id is null，防止并发问题；
List<CrmCustomerDO> updateDos = new ArrayList <>();
for (Long cId : cIds){
CrmCustomerDO customerDO = new CrmCustomerDO();
customerDO.setId(cId);
customerDO.setOwnerUserId(SecurityFrameworkUtils.getLoginUserId());
}
//统一修改状态
// 统一修改状态
customerMapper.updateBatch(updateDos);
}
@ -213,9 +209,8 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
private void validCustomerDeal(Long id) {
if (customerMapper.selectById(id).getDealStatus() ==true) {
throw exception(CUSTOMER_DEALED);
throw exception(CUSTOMER_ALREADY_DEAL);
}
}
}