diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java index 3050cea..f797414 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCustomController.java @@ -99,9 +99,11 @@ public class PsCustomController extends BaseController { add.setCustomSource("官网"); add.setCustomLevel("2"); add.setCreateTime(new Date()); + add.setTenantId("000000"); + + add.setCustomName(bo.getCustomName()); add.setCustomMobile(bo.getCustomMobile()); add.setServiceType(bo.getServiceType()); - add.setTenantId("000000"); psCustomInfoService.insertByBo(add); noticeService.sendNotice(SysNoticeBo.getGonghaiInstance()); @@ -109,8 +111,8 @@ public class PsCustomController extends BaseController { } @SaIgnore - @Log(title = "getAllServiceType", businessType = BusinessType.INSERT) - @RepeatSubmit() +// @Log(title = "getAllServiceType", businessType = BusinessType.INSERT) +// @RepeatSubmit() @GetMapping("/getAllServiceType") public R> getAllDictByDictType() { Map allDictByDictType = dictService.getAllDictByDictType("contract_type"); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java index daa239e..76dd59a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoWebBo.java @@ -25,24 +25,24 @@ import java.util.List; @EqualsAndHashCode @AutoMapper(target = PsCustomInfo.class) public class PsCustomInfoWebBo { - /** - * 类型 1客户列表 2黑名单 3公海 - */ - private Integer type; - - /** - * 客户来源 - */ - private String customSource; - - /** - * 客户级别 - */ - private String customLevel; - - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm") - private Date createTime; +// /** +// * 类型 1客户列表 2黑名单 3公海 +// */ +// private Integer type; +// +// /** +// * 客户来源 +// */ +// private String customSource; +// +// /** +// * 客户级别 +// */ +// private String customLevel; +// +// +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm") +// private Date createTime; /** * 服务类别 @@ -55,4 +55,9 @@ public class PsCustomInfoWebBo { @Length(max = 500) private String customMobile; + /** + * 客户姓名 + */ + private String customName; + } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index 0f083d8..9800c6c 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -264,7 +264,11 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { //客户经理就是登录用户 add.setCustomManager(LoginHelper.getUserId()); add.setBlack(CommonStatusEnum.N.getCode()); + add.setCustomStatus(CustomerStatusEnum.INIT.getCode()); + if (bo.getType() == 3){ + add.setCustomStatus(CustomerStatusEnum.PUBLIC.getCode()); + } add.setAcceptDate(new Date()); boolean flag = baseMapper.insert(add) > 0; if(CollectionUtils.isNotEmpty(bo.getPriceBos())){