From cda4939092fc9ca55f8e2b827ba7fd32c606260d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 29 Sep 2022 10:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E4=BB=8B=E4=BA=BA=E5=91=98=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=AE=A2=E6=88=B7=E6=B7=BB=E5=8A=A0=E7=BC=96=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A7=93=E5=90=8D=E9=A6=96=E5=AD=97=E6=AF=8D=E5=8A=A0?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basemiddleman/BaseMiddleman.java | 2 ++ .../api/basemiddleman/BaseMiddlemanDto.java | 5 ++++ .../api/basemiddleman/BaseMiddlemanFeign.java | 2 +- .../api/basevehicleout/BaseVehicleOutDto.java | 25 ++++++++++++----- .../basemiddleman/BaseMiddlemanService.java | 5 ++++ .../AppCrmCustomerTempDto.java | 1 + .../CrmCustomerTempService.java | 27 ++++++++++++------- doc/databases/base_tables.sql | 12 ++++----- 8 files changed, 55 insertions(+), 24 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java index 04629456fb..2c2670ff8e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java @@ -64,5 +64,7 @@ public class BaseMiddleman extends BaseEntity { private String createOrgSid; @ApiModelProperty("使用组织sid") private String useOrgSid; + @ApiModelProperty("编码") + private String middleCode; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java index c71bd8f9c7..f91f9ce9ac 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * Project: anrui-base(基础)
* File: BaseMiddlemanDto.java
@@ -53,8 +55,10 @@ public class BaseMiddlemanDto implements Dto { private String sid; @ApiModelProperty("姓名") + @NotBlank(message = "姓名不能为空") private String name; @ApiModelProperty("手机号") + @NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty("所在单位") private String company; @@ -63,6 +67,7 @@ public class BaseMiddlemanDto implements Dto { @ApiModelProperty("银行账号") private String bankAccount; @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：用户sid不能为空") private String createBySid; @ApiModelProperty(value = "备注") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java index 278480ec6a..6d610878d8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java @@ -64,7 +64,7 @@ public interface BaseMiddlemanFeign { @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody BaseMiddlemanDto dto); + public ResultBean save(@Valid @RequestBody BaseMiddlemanDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index 1ac6a38eb3..92992b2400 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -15,7 +15,9 @@ import java.util.List; public class BaseVehicleOutDto implements Dto { private static final long serialVersionUID = 7393182384733981516L; - private List queryList; + + private String vinSid; + private String vinNo; @ApiModelProperty("出库类型") private String type; private String typeKey; @@ -41,17 +43,26 @@ public class BaseVehicleOutDto implements Dto { private String mobile; @ApiModelProperty("赠品说明") private String giftsDescription; - @ApiModelProperty("二次经销商") - private String distributorName; - @ApiModelProperty("二次经销商sid") - private String distributorSid; + @ApiModelProperty("返利金额") private String rebateAmount; - @ApiModelProperty("实际购车人名称") + /* @ApiModelProperty("实际购车人名称") private String actualCustomer; @ApiModelProperty("实际购车人电话") private String actualMobile; @ApiModelProperty("实际购车人sid") - private String actualSid; + private String actualSid;*/ + /* @ApiModelProperty("二次经销商") + private String distributorName; + @ApiModelProperty("二次经销商sid") + private String distributorSid;*/ + private List queryList; + + //销售折让 + //中介人1 + //返利金额1 + //中介人2 + //返利金额2 + //备注 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java index c4a31cde3b..69eb9808f7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java @@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basemiddleman.*; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.HanZiConverterPinYin; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -85,6 +86,8 @@ public class BaseMiddlemanService extends MybatisBaseService map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo); +// Map map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo); customerTemp.setCreateBySid(dto.getUserSid()); customerTemp.setStaffSid(userOrgInfoVo.getStaffSid()); customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid()); - customerTemp.setCustomerNo(map.get("code")); +// customerTemp.setCustomerNo(map.get("code")); customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02"); customerTemp.setCertificateType(customerTemp.getCustomerTypeKey().equals("1") ? "身份证" : "营业执照"); ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0"); @@ -592,6 +591,9 @@ public class CrmCustomerTempService extends MybatisBaseService paramMap = new HashMap<>(); @@ -756,14 +758,17 @@ public class CrmCustomerTempService extends MybatisBaseService map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo); - crmCustomerTemp.setCustomerNo(map.get("code")); + /*Map map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo); + crmCustomerTemp.setCustomerNo(map.get("code"));*/ ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0"); if (resultBean.getSuccess() && resultBean.getData() != null) { String key = resultBean.getData().toString(); crmCustomerTemp.setFollow_state_key(key); crmCustomerTemp.setFollow_state(dictCommonFeign.selectBykey(key, DictCommonType.FOLLOW_STATE).getData().getDictValue()); } + //客户编码 + String customerNo = HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTemp.getMobile(); + crmCustomerTemp.setCustomerNo(customerNo); save(crmCustomerTemp); // 增加跟进记录 String visitSid = crmVisitService.insertCrmVisitOne(dto.getUserSid(), crmCustomerTemp.getSid(), crmCustomerTemp.getIsOnRemindkey(), crmCustomerTemp.getIsOnRemind(), dto.getVisitWay(), dto.getVisitWayKey()); @@ -839,8 +844,10 @@ public class CrmCustomerTempService extends MybatisBaseService