From 4311f9afb79544bd1f98cce6730835a92a869909 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 13 May 2022 17:45:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=81=94=E8=B0=83=E3=80=82=20=E5=A4=96=E9=87=87?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9Edata?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedistributorlegal/BaseDistributorLegalDto.java    | 3 +++
 .../api/basedistributorlegal/BaseDistributorLegalVo.java | 4 ++--
 .../basedistributorperson/BaseDistributorPersonVo.java   | 4 ++--
 .../base/biz/basedistributor/BaseDistributorService.java | 1 +
 .../basedistributorlegal/BaseDistributorLegalRest.java   | 1 +
 .../BaseDistributorPersonService.java                    | 9 +++++----
 .../BaseOutsourcingApplicationService.java               | 2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java
index 7b2e996eff..7a53e23a11 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalDto.java
@@ -70,6 +70,9 @@ public class BaseDistributorLegalDto implements Dto {
     @ApiModelProperty(value = "通讯地址邮编", required = true)
     private String zipCode;
 
+    @ApiModelProperty(value = "通讯地址")
+    private String address;
+
     @ApiModelProperty(value = "使用组织", required = true)
     private String useOrg;
     @ApiModelProperty(value = "使用组织Name", required = true)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java
index 4f7ee546e3..b4c50af04d 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorlegal/BaseDistributorLegalVo.java
@@ -16,8 +16,8 @@ import java.util.List;
 @Data
 public class BaseDistributorLegalVo implements Vo {
 
-    @ApiModelProperty("经销商sid（陕汽必须字段）")
-    private String distributorSid;
+    @ApiModelProperty("企业经销商sid")
+    private String sid;
 
     @ApiModelProperty("userSid")
     private String userSid;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java
index 06c2c7429b..5befd61c3d 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributorperson/BaseDistributorPersonVo.java
@@ -11,8 +11,8 @@ import java.util.List;
 @Data
 public class BaseDistributorPersonVo implements Vo {
 
-	@ApiModelProperty("经销商sid（陕汽必须字段）")
-    private String distributorSid;
+	@ApiModelProperty("个人经销商sid")
+    private String sid;
 
     @ApiModelProperty("userSid")
     private String userSid;
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
index 997450912a..6e03e4b918 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
@@ -92,6 +92,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
      */
     public ResultBean<String> saveFrDto(BaseDistributorLegalDto dto) {
         BaseDistributor baseDistributor = new BaseDistributor();
+        baseDistributor.setAddress(dto.getAddress());
         baseDistributor.setCreateBySid(dto.getUserSid());
         baseDistributor.setDistributorName(dto.getDistributorName());//经销商名称
         baseDistributor.setDistributorType(dto.getDistributorType());//经销商类型
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java
index 849320573d..e606678322 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorlegal/BaseDistributorLegalRest.java
@@ -187,6 +187,7 @@ public class BaseDistributorLegalRest implements BaseDistributorLegalFeign {
         baseDistributorLegalOneDto.setBusinessTermEndTime(dto.getBusinessTermEndTime());
         //修改经销商基础信息
         BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setAddress(dto.getAddress());
         baseDistributorDto.setDistributorType(dto.getDistributorType());
         baseDistributorDto.setDistributorLevel(dto.getDistributorLevel());
         baseDistributorDto.setNumCode(dto.getNumCode());
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java
index 4e47d147ba..068252a9ae 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorperson/BaseDistributorPersonService.java
@@ -158,6 +158,7 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
         baseDistributorPersonOneDto.setRemarks(dto.getRemarks());
         //修改经销商基础信息
         BaseDistributorDto baseDistributorDto = new BaseDistributorDto();
+        baseDistributorDto.setZipCode(dto.getZipCode());
         baseDistributorDto.setNumCode(dto.getNumCode());
         baseDistributorDto.setDistributorName(dto.getDistributorName());
         baseDistributorDto.setAddress(dto.getAddress());
@@ -168,7 +169,7 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
         if (count1 == 0 || count == 0) {
             return rb.setMsg("修改失败");
         }
-        baseDistributorAppendixService.delByLinkSid(sid);
+        baseDistributorAppendixService.delByLinkSid(baseDistributorPerson.getDistributorSid());
         for (BaseDistributorAppendixDto baseDistributorAppendix : baseDistributorAppendixs) {
             BaseDistributorAppendix entity = new BaseDistributorAppendix();
             BeanUtil.copyProperties(baseDistributorAppendix, entity);
@@ -179,14 +180,14 @@ public class BaseDistributorPersonService extends MybatisBaseService<BaseDistrib
                 filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
             }
             entity.setFilePath(filePath);
-            entity.setLinkSid(sid);
+            entity.setLinkSid(baseDistributorPerson.getDistributorSid());
             baseDistributorAppendixService.save(entity);
         }
-        baseDistributorBankService.delByDistributorSid(sid);
+        baseDistributorBankService.delByDistributorSid(baseDistributorPerson.getDistributorSid());
         for (BaseDistributorBankDto baseDistributorBank : baseDistributorBanks) {
             BaseDistributorBank entity = new BaseDistributorBank();
             BeanUtil.copyProperties(baseDistributorBank, entity);
-            entity.setDistributorSid(sid);
+            entity.setDistributorSid(baseDistributorPerson.getDistributorSid());
             baseDistributorBankService.save(entity);
         }
         return rb.success().setMsg("修改成功");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index aa67ca0026..f4a606e1ee 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -164,7 +164,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 				baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
 				baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
 			}
-			return rb.success().setMsg("添加成功");
+			return rb.success().setMsg("添加成功").setData(entity.getSid());
 		}
 		updateBySid(dto,sid);
 		baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);