diff --git a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/cache/FirmInfoCache.java b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/cache/FirmInfoCache.java index 8e082c4..deea44a 100644 --- a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/cache/FirmInfoCache.java +++ b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/cache/FirmInfoCache.java @@ -1,8 +1,7 @@ package com.dragon.vehicle.firm.domain.cache; import com.dragon.common.core.annotation.Excel; -import com.dragon.common.core.web.domain.BaseEntity; -import com.dragon.vehicle.firm.domain.common.FirmInfo; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -78,11 +77,5 @@ public class FirmInfoCache{ /** *创建 */ - public static FirmInfoCache getCache(FirmInfo firmInfo) { - return FirmInfoCache.builder() - .firmName(firmInfo.getFirmName()) - .firmTel(firmInfo.getFirmTel()) - .firmAddress(firmInfo.getFirmAddress()). - build(); - } + } diff --git a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java index ec79129..a19d697 100644 --- a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java +++ b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java @@ -10,6 +10,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + /** * @author 冯凯 * @version 1.0 @@ -90,6 +91,8 @@ public class FirmInfo { private Long createBy; + + public static FirmInfo registry(FirmRegisterReq firmRegisterReq) { return FirmInfo.builder() .firmName(firmRegisterReq.getFirmName()) @@ -100,6 +103,7 @@ public class FirmInfo { .firmBusinessLicense(firmRegisterReq.getFirmBusinessLicense()) .firmRepresentative(firmRegisterReq.getFirmRepresentative()) .firmRepresentativeId(firmRegisterReq.getFirmRepresentativeId()). + createBy(firmRegisterReq.getCreateBy()). build(); } } diff --git a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/req/FirmRegisterReq.java b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/req/FirmRegisterReq.java index 3dc5d6d..9e546d4 100644 --- a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/req/FirmRegisterReq.java +++ b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/req/FirmRegisterReq.java @@ -1,13 +1,9 @@ package com.dragon.vehicle.firm.domain.req; -import com.dragon.common.core.annotation.Excel; -import com.dragon.vehicle.firm.domain.cache.FirmInfoCache; -import com.dragon.vehicle.firm.domain.common.FirmInfo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.UniqueElements; import javax.validation.constraints.NotNull; diff --git a/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java index a404e45..5f282bf 100644 --- a/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java @@ -57,6 +57,7 @@ public class FirmInfoController { firmRegisterReq.setCreateBy(SecurityUtils.getUserId()); //企业入驻 + firmService.save(FirmInfo.registry(firmRegisterReq)); return Result.success("", "入驻成功!!!"); } diff --git a/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java index 6066e93..0206ef6 100644 --- a/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java @@ -2,8 +2,6 @@ package com.dragon.vehicle.firm.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dragon.vehicle.firm.domain.common.FirmInfo; -import org.apache.ibatis.annotations.Mapper; -import org.mybatis.spring.annotation.MapperScan; /** * @author 冯凯