|
@@ -21,8 +21,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.File;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -83,11 +82,12 @@ public class SaleClueInfoController extends BaseController {
|
|
|
@ApiParam("行业id") @RequestParam(value = "industryId",required = false)String industryId,
|
|
|
@ApiParam("粉丝量级 1:0~50w 2:50W~200W 3:200W~500W 4:500W以上") @RequestParam(value = "fansType",required = false)String fansType,
|
|
|
@ApiParam("状态 1-未开始 2-进行中 3-已结束") @RequestParam(value = "state",required = false)String state,
|
|
|
+ @ApiParam("状态 1-未开始 2-进行中 3-已结束") @RequestParam(value = "salesLeadsType",required = false)String salesLeadsType,
|
|
|
@ApiParam("当前用户id") @RequestParam(value = "userId",required = false) Long userId) throws Exception{
|
|
|
|
|
|
return saleClueInfoServiceImpl.selectSaleClueInfoList(sellerName,
|
|
|
StringUtils.isEmpty(uploadDate) ? null : DateUtils.strDateToInt(uploadDate),
|
|
|
- distributionSaleFlag,industryId,fansType,state, userId);
|
|
|
+ distributionSaleFlag,industryId,fansType,state,salesLeadsType, userId);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -107,11 +107,11 @@ public class SaleClueInfoController extends BaseController {
|
|
|
@ApiOperation(value = "销售线索-分配",notes = "销售线索-分配-(可以传多个卖家id)")
|
|
|
@PostMapping(value = "/saleClueDistribution")
|
|
|
public ResultResponse saleClueDistribution(
|
|
|
- @ApiParam(value = "卖家ids") @RequestParam(value = "sellerIds") List<String> sellerIds,
|
|
|
+ @ApiParam(value = "卖家ids") @RequestParam(value = "sellerIds") String sellerIds,
|
|
|
@ApiParam(value = "销售id") @RequestParam(value = "saleId") Long saleId,
|
|
|
@ApiParam(value = "创建人id") @RequestParam(value = "createUserId") Long createUserId){
|
|
|
-
|
|
|
- return saleClueInfoServiceImpl.saleClueDistribution(sellerIds,saleId,createUserId);
|
|
|
+ List<String> sellerList = Arrays.asList(StringUtils.split(sellerIds,","));
|
|
|
+ return saleClueInfoServiceImpl.saleClueDistribution(sellerList,saleId,createUserId);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -173,6 +173,52 @@ public class SaleClueInfoController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @ApiOperation(value = "销售线索-基础-根据角色显示销售线索分类",notes = "销售线索-基础-根据角色显示销售线索分类(销售线索类型1:50W低潜;2:50W中高潜3:200W高潜4:200W-500w5:500W)")
|
|
|
+ @GetMapping(value = "/getSaleTypeByRoleCode")
|
|
|
+ public ResultResponse getSaleTypeByRoleCode(@ApiParam("角色code") @RequestParam(value = "roleCode") String roleCode){
|
|
|
+
|
|
|
+ List<Map<String,String>> resultList = new ArrayList<>();
|
|
|
+ Map<String,String> map1 = new HashMap<>();
|
|
|
+ map1.put("salesLeadsType","1");
|
|
|
+ map1.put("salesLeadsName","50W低潜");
|
|
|
+
|
|
|
+ Map<String,String> map2 = new HashMap<>();
|
|
|
+ map2.put("salesLeadsType","2");
|
|
|
+ map2.put("salesLeadsName","50W中高潜");
|
|
|
+
|
|
|
+ Map<String,String> map3 = new HashMap<>();
|
|
|
+ map3.put("salesLeadsType","3");
|
|
|
+ map3.put("salesLeadsName","200W高潜");
|
|
|
+
|
|
|
+ Map<String,String> map4 = new HashMap<>();
|
|
|
+ map4.put("salesLeadsType","4");
|
|
|
+ map4.put("salesLeadsName","200W-500w");
|
|
|
+
|
|
|
+ Map<String,String> map5 = new HashMap<>();
|
|
|
+ map5.put("salesLeadsType","5");
|
|
|
+ map5.put("salesLeadsName","500W");
|
|
|
+
|
|
|
+ resultList.add(map1);
|
|
|
+ resultList.add(map2);
|
|
|
+ resultList.add(map3);
|
|
|
+ resultList.add(map4);
|
|
|
+ resultList.add(map5);
|
|
|
+
|
|
|
+ //电销
|
|
|
+ //50w 排第一个
|
|
|
+
|
|
|
+ //面销
|
|
|
+ if (roleCode.contains("facePin")){
|
|
|
+ resultList.remove(map3);
|
|
|
+ //200W 排第一个
|
|
|
+ resultList.add(0,map3);
|
|
|
+ }
|
|
|
+
|
|
|
+ return ResultResponse.successMsg("查询成功",resultList);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
|