diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCustomerController.java b/klp-wms/src/main/java/com/klp/controller/WmsCustomerController.java new file mode 100644 index 00000000..d9615494 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCustomerController.java @@ -0,0 +1,106 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsCustomerVo; +import com.klp.domain.bo.WmsCustomerBo; +import com.klp.service.IWmsCustomerService; +import com.klp.common.core.page.TableDataInfo; + +/** + * CRM 客户 + * + * @author Joshi + * @date 2025-08-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/customer") +public class WmsCustomerController extends BaseController { + + private final IWmsCustomerService iWmsCustomerService; + + /** + * 查询CRM 客户列表 + */ + @SaCheckPermission("wms:customer:list") + @GetMapping("/list") + public TableDataInfo list(WmsCustomerBo bo, PageQuery pageQuery) { + return iWmsCustomerService.queryPageList(bo, pageQuery); + } + + /** + * 导出CRM 客户列表 + */ + @SaCheckPermission("wms:customer:export") + @Log(title = "CRM 客户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCustomerBo bo, HttpServletResponse response) { + List list = iWmsCustomerService.queryList(bo); + ExcelUtil.exportExcel(list, "CRM 客户", WmsCustomerVo.class, response); + } + + /** + * 获取CRM 客户详细信息 + * + * @param customerId 主键 + */ + @SaCheckPermission("wms:customer:query") + @GetMapping("/{customerId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long customerId) { + return R.ok(iWmsCustomerService.queryById(customerId)); + } + + /** + * 新增CRM 客户 + */ + @SaCheckPermission("wms:customer:add") + @Log(title = "CRM 客户", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCustomerBo bo) { + return toAjax(iWmsCustomerService.insertByBo(bo)); + } + + /** + * 修改CRM 客户 + */ + @SaCheckPermission("wms:customer:edit") + @Log(title = "CRM 客户", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCustomerBo bo) { + return toAjax(iWmsCustomerService.updateByBo(bo)); + } + + /** + * 删除CRM 客户 + * + * @param customerIds 主键串 + */ + @SaCheckPermission("wms:customer:remove") + @Log(title = "CRM 客户", businessType = BusinessType.DELETE) + @DeleteMapping("/{customerIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] customerIds) { + return toAjax(iWmsCustomerService.deleteWithValidByIds(Arrays.asList(customerIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCustomer.java b/klp-wms/src/main/java/com/klp/domain/WmsCustomer.java new file mode 100644 index 00000000..abdbd2fb --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCustomer.java @@ -0,0 +1,111 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * CRM 客户对象 wms_customer + * + * @author Joshi + * @date 2025-08-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_customer") +public class WmsCustomer extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 编号,主键自增 + */ + @TableId(value = "customer_id") + private Long customerId; + /** + * 客户名称 + */ + private String name; + /** + * 跟进状态 + */ + private Integer followUpStatus; + /** + * 最后跟进时间 + */ + private Date contactLastTime; + /** + * 最后跟进内容 + */ + private String contactLastContent; + /** + * 下次联系时间 + */ + private Date contactNextTime; + /** + * 负责人的用户编号 + */ + private Long ownerUserId; + /** + * 成为负责人的时间 + */ + private Date ownerTime; + /** + * 成交状态 + */ + private Long dealStatus; + /** + * 手机 + */ + private String mobile; + /** + * 电话 + */ + private String telephone; + /** + * QQ + */ + private String qq; + /** + * 微信 + */ + private String wechat; + /** + * 邮箱 + */ + private String email; + /** + * 地区编号 + */ + private Long areaId; + /** + * 详细地址 + */ + private String detailAddress; + /** + * 所属行业 + */ + private Long industryId; + /** + * 客户等级 + */ + private Long level; + /** + * 客户来源 + */ + private Long source; + /** + * 备注 + */ + private String remark; + /** + * 是否删除 + */ + @TableLogic + private Long delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCustomerBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCustomerBo.java new file mode 100644 index 00000000..fefc467a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCustomerBo.java @@ -0,0 +1,123 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * CRM 客户业务对象 wms_customer + * + * @author Joshi + * @date 2025-08-12 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCustomerBo extends BaseEntity { + + /** + * 编号,主键自增 + */ + private Long customerId; + + /** + * 客户名称 + */ + private String name; + + /** + * 跟进状态 + */ + private Integer followUpStatus; + + /** + * 最后跟进时间 + */ + private Date contactLastTime; + + /** + * 最后跟进内容 + */ + private String contactLastContent; + + /** + * 下次联系时间 + */ + private Date contactNextTime; + + /** + * 负责人的用户编号 + */ + private Long ownerUserId; + + /** + * 成为负责人的时间 + */ + private Date ownerTime; + + /** + * 成交状态 + */ + private Long dealStatus; + + /** + * 手机 + */ + private String mobile; + + /** + * 电话 + */ + private String telephone; + + /** + * QQ + */ + private String qq; + + /** + * 微信 + */ + private String wechat; + + /** + * 邮箱 + */ + private String email; + + /** + * 地区编号 + */ + private Long areaId; + + /** + * 详细地址 + */ + private String detailAddress; + + /** + * 所属行业 + */ + private Long industryId; + + /** + * 客户等级 + */ + private Long level; + + /** + * 客户来源 + */ + private Long source; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCustomerVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCustomerVo.java new file mode 100644 index 00000000..701fc342 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCustomerVo.java @@ -0,0 +1,145 @@ +package com.klp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * CRM 客户视图对象 wms_customer + * + * @author Joshi + * @date 2025-08-12 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCustomerVo { + + private static final long serialVersionUID = 1L; + + /** + * 编号,主键自增 + */ + @ExcelProperty(value = "编号,主键自增") + private Long customerId; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称") + private String name; + + /** + * 跟进状态 + */ + @ExcelProperty(value = "跟进状态") + private Integer followUpStatus; + + /** + * 最后跟进时间 + */ + @ExcelProperty(value = "最后跟进时间") + private Date contactLastTime; + + /** + * 最后跟进内容 + */ + @ExcelProperty(value = "最后跟进内容") + private String contactLastContent; + + /** + * 下次联系时间 + */ + @ExcelProperty(value = "下次联系时间") + private Date contactNextTime; + + /** + * 负责人的用户编号 + */ + @ExcelProperty(value = "负责人的用户编号") + private Long ownerUserId; + + /** + * 成为负责人的时间 + */ + @ExcelProperty(value = "成为负责人的时间") + private Date ownerTime; + + /** + * 成交状态 + */ + @ExcelProperty(value = "成交状态") + private Long dealStatus; + + /** + * 手机 + */ + @ExcelProperty(value = "手机") + private String mobile; + + /** + * 电话 + */ + @ExcelProperty(value = "电话") + private String telephone; + + /** + * QQ + */ + @ExcelProperty(value = "QQ") + private String qq; + + /** + * 微信 + */ + @ExcelProperty(value = "微信") + private String wechat; + + /** + * 邮箱 + */ + @ExcelProperty(value = "邮箱") + private String email; + + /** + * 地区编号 + */ + @ExcelProperty(value = "地区编号") + private Long areaId; + + /** + * 详细地址 + */ + @ExcelProperty(value = "详细地址") + private String detailAddress; + + /** + * 所属行业 + */ + @ExcelProperty(value = "所属行业") + private Long industryId; + + /** + * 客户等级 + */ + @ExcelProperty(value = "客户等级") + private Long level; + + /** + * 客户来源 + */ + @ExcelProperty(value = "客户来源") + private Long source; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCustomerMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCustomerMapper.java new file mode 100644 index 00000000..d26795ce --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCustomerMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsCustomer; +import com.klp.domain.vo.WmsCustomerVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * CRM 客户Mapper接口 + * + * @author Joshi + * @date 2025-08-12 + */ +public interface WmsCustomerMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCustomerService.java b/klp-wms/src/main/java/com/klp/service/IWmsCustomerService.java new file mode 100644 index 00000000..a8f97dc6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCustomerService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsCustomer; +import com.klp.domain.vo.WmsCustomerVo; +import com.klp.domain.bo.WmsCustomerBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * CRM 客户Service接口 + * + * @author Joshi + * @date 2025-08-12 + */ +public interface IWmsCustomerService { + + /** + * 查询CRM 客户 + */ + WmsCustomerVo queryById(Long customerId); + + /** + * 查询CRM 客户列表 + */ + TableDataInfo queryPageList(WmsCustomerBo bo, PageQuery pageQuery); + + /** + * 查询CRM 客户列表 + */ + List queryList(WmsCustomerBo bo); + + /** + * 新增CRM 客户 + */ + Boolean insertByBo(WmsCustomerBo bo); + + /** + * 修改CRM 客户 + */ + Boolean updateByBo(WmsCustomerBo bo); + + /** + * 校验并批量删除CRM 客户信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCustomerServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCustomerServiceImpl.java new file mode 100644 index 00000000..e3cdb2f7 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCustomerServiceImpl.java @@ -0,0 +1,126 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsCustomerBo; +import com.klp.domain.vo.WmsCustomerVo; +import com.klp.domain.WmsCustomer; +import com.klp.mapper.WmsCustomerMapper; +import com.klp.service.IWmsCustomerService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * CRM 客户Service业务层处理 + * + * @author Joshi + * @date 2025-08-12 + */ +@RequiredArgsConstructor +@Service +public class WmsCustomerServiceImpl implements IWmsCustomerService { + + private final WmsCustomerMapper baseMapper; + + /** + * 查询CRM 客户 + */ + @Override + public WmsCustomerVo queryById(Long customerId){ + return baseMapper.selectVoById(customerId); + } + + /** + * 查询CRM 客户列表 + */ + @Override + public TableDataInfo queryPageList(WmsCustomerBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询CRM 客户列表 + */ + @Override + public List queryList(WmsCustomerBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCustomerBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getName()), WmsCustomer::getName, bo.getName()); + lqw.eq(bo.getFollowUpStatus() != null, WmsCustomer::getFollowUpStatus, bo.getFollowUpStatus()); + lqw.eq(bo.getContactLastTime() != null, WmsCustomer::getContactLastTime, bo.getContactLastTime()); + lqw.eq(StringUtils.isNotBlank(bo.getContactLastContent()), WmsCustomer::getContactLastContent, bo.getContactLastContent()); + lqw.eq(bo.getContactNextTime() != null, WmsCustomer::getContactNextTime, bo.getContactNextTime()); + lqw.eq(bo.getOwnerUserId() != null, WmsCustomer::getOwnerUserId, bo.getOwnerUserId()); + lqw.eq(bo.getOwnerTime() != null, WmsCustomer::getOwnerTime, bo.getOwnerTime()); + lqw.eq(bo.getDealStatus() != null, WmsCustomer::getDealStatus, bo.getDealStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getMobile()), WmsCustomer::getMobile, bo.getMobile()); + lqw.eq(StringUtils.isNotBlank(bo.getTelephone()), WmsCustomer::getTelephone, bo.getTelephone()); + lqw.eq(StringUtils.isNotBlank(bo.getQq()), WmsCustomer::getQq, bo.getQq()); + lqw.eq(StringUtils.isNotBlank(bo.getWechat()), WmsCustomer::getWechat, bo.getWechat()); + lqw.eq(StringUtils.isNotBlank(bo.getEmail()), WmsCustomer::getEmail, bo.getEmail()); + lqw.eq(bo.getAreaId() != null, WmsCustomer::getAreaId, bo.getAreaId()); + lqw.eq(StringUtils.isNotBlank(bo.getDetailAddress()), WmsCustomer::getDetailAddress, bo.getDetailAddress()); + lqw.eq(bo.getIndustryId() != null, WmsCustomer::getIndustryId, bo.getIndustryId()); + lqw.eq(bo.getLevel() != null, WmsCustomer::getLevel, bo.getLevel()); + lqw.eq(bo.getSource() != null, WmsCustomer::getSource, bo.getSource()); + return lqw; + } + + /** + * 新增CRM 客户 + */ + @Override + public Boolean insertByBo(WmsCustomerBo bo) { + WmsCustomer add = BeanUtil.toBean(bo, WmsCustomer.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCustomerId(add.getCustomerId()); + } + return flag; + } + + /** + * 修改CRM 客户 + */ + @Override + public Boolean updateByBo(WmsCustomerBo bo) { + WmsCustomer update = BeanUtil.toBean(bo, WmsCustomer.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCustomer entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除CRM 客户 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCustomerMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCustomerMapper.xml new file mode 100644 index 00000000..adf43c54 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCustomerMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +