diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java index 4e470653..f54c7284 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/SupplierInfo.java @@ -49,7 +49,7 @@ public class SupplierInfo implements Serializable { @Column(name = "remark") private String remark; - // 供应商地址地址数组[{“province”:””,”city”:””,”area”:””,”address_detail”:””,”sort”:””}] + // 供应商地址地址数组[{“province”:””,”city”:””,”area”:””,”addressDetail”:””,”sort”:””}] @Column(name = "supplier_address") private String supplierAddress; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/CreateSupplierInfoRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/CreateSupplierInfoRequest.java new file mode 100644 index 00000000..21525222 --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/CreateSupplierInfoRequest.java @@ -0,0 +1,57 @@ +package me.zhengjie.modules.wms.bd.request; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import lombok.Data; +import me.zhengjie.modules.wms.bd.domain.SupplierInfo; + +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.List; + +/** + * @author 黄星星 + * @date 2019-08-18 + */ +@Data +public class CreateSupplierInfoRequest implements Serializable { + + + private Long id; + + // 供应商名称 + private String supplierName; + + // 期初预收款 + private Long initialPreMoney; + + // 供应商编号 + private String supplierCode; + + // 创建时间 + private Timestamp createTime; + + // 更新时间 + private Timestamp updateTime; + + // 备注 + private String remark; + + // 供应商地址地址数组[{“province”:””,”city”:””,”area”:””,”address_detail”:””,”sort”:””}] + private List supplierAddress; + + // 供应商联系人[{“sort”:””,”name”:””,”mobile”:””,”phone”:””,”email”:””,”qq”:””,”weixin”:””,”firstTag”:””}]firstTag 0:非首要联系人 1:首要联系人 + private List supplierContact; + + private Boolean status; + + // 供应商类别主键 + private Long supplierCategoryId; + + // 供应商类别名称 + private String supplierCategoryName; + + public void copy(SupplierInfo source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/SupplierAddress.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/SupplierAddress.java new file mode 100644 index 00000000..025b99db --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/SupplierAddress.java @@ -0,0 +1,22 @@ +package me.zhengjie.modules.wms.bd.request; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author 黄星星 + * @date 2019-08-18 + */ +@Data +public class SupplierAddress implements Serializable { + private String province; + + private String city; + + private String area; + + private String addressDetail; + + private Integer sort; +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/SupplierContact.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/SupplierContact.java new file mode 100644 index 00000000..2f3d528a --- /dev/null +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/request/SupplierContact.java @@ -0,0 +1,31 @@ +package me.zhengjie.modules.wms.bd.request; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author 黄星星 + * [{“sort”:””,”name”:””,”mobile”:””,”phone”:””,”email”:””,”qq”:””,”weixin”:””,”firstTag”:””}]firstTag 0:非首要联系人 1:首要联系人 + * @date 2019-08-18 + */ +@Data +public class SupplierContact implements Serializable { + + private Integer sort; + + private String name; + + private String mobile; + + private String phone; + + private String email; + + private String qq; + + private String weixin; + + private Integer firstTag; + +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java index f49c9648..78ed026f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java @@ -2,6 +2,7 @@ package me.zhengjie.modules.wms.bd.rest; import me.zhengjie.aop.log.Log; import me.zhengjie.modules.wms.bd.domain.SupplierInfo; +import me.zhengjie.modules.wms.bd.request.CreateSupplierInfoRequest; import me.zhengjie.modules.wms.bd.service.SupplierInfoService; import me.zhengjie.modules.wms.bd.service.dto.SupplierInfoQueryCriteria; import org.springframework.beans.factory.annotation.Autowired; @@ -68,8 +69,8 @@ public class SupplierInfoController { @ApiOperation(value = "新增供应商资料") @PostMapping(value = "/supplierInfo") @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_CREATE')") - public ResponseEntity create(@Validated @RequestBody SupplierInfo resources){ - return new ResponseEntity(supplierInfoService.create(resources),HttpStatus.CREATED); + public ResponseEntity create(@RequestBody CreateSupplierInfoRequest createSupplierInfoRequest){ + return new ResponseEntity(supplierInfoService.create(createSupplierInfoRequest),HttpStatus.CREATED); } @Log("修改供应商资料") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/SupplierInfoService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/SupplierInfoService.java index b904fd8e..07a387d2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/SupplierInfoService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/SupplierInfoService.java @@ -1,6 +1,7 @@ package me.zhengjie.modules.wms.bd.service; import me.zhengjie.modules.wms.bd.domain.SupplierInfo; +import me.zhengjie.modules.wms.bd.request.CreateSupplierInfoRequest; import me.zhengjie.modules.wms.bd.service.dto.SupplierInfoDTO; import me.zhengjie.modules.wms.bd.service.dto.SupplierInfoQueryCriteria; //import org.springframework.cache.annotation.CacheConfig; @@ -42,11 +43,11 @@ public interface SupplierInfoService { /** * create - * @param resources + * @param createSupplierInfoRequest * @return */ //@CacheEvict(allEntries = true) - SupplierInfoDTO create(SupplierInfo resources); + SupplierInfoDTO create(CreateSupplierInfoRequest createSupplierInfoRequest); /** * update diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/SupplierInfoDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/SupplierInfoDTO.java index ffc9521c..8bde8898 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/SupplierInfoDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/dto/SupplierInfoDTO.java @@ -1,8 +1,12 @@ package me.zhengjie.modules.wms.bd.service.dto; import lombok.Data; +import me.zhengjie.modules.wms.bd.request.SupplierAddress; +import me.zhengjie.modules.wms.bd.request.SupplierContact; + import java.sql.Timestamp; import java.io.Serializable; +import java.util.List; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/SupplierInfoServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/SupplierInfoServiceImpl.java index a1523a60..49925e39 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/SupplierInfoServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/SupplierInfoServiceImpl.java @@ -1,14 +1,19 @@ package me.zhengjie.modules.wms.bd.service.impl; +import com.google.gson.Gson; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.wms.bd.domain.CustomerInfo; import me.zhengjie.modules.wms.bd.domain.SupplierInfo; +import me.zhengjie.modules.wms.bd.request.CreateSupplierInfoRequest; +import me.zhengjie.modules.wms.bd.request.SupplierAddress; +import me.zhengjie.modules.wms.bd.request.SupplierContact; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.wms.bd.repository.SupplierInfoRepository; import me.zhengjie.modules.wms.bd.service.SupplierInfoService; import me.zhengjie.modules.wms.bd.service.dto.SupplierInfoDTO; import me.zhengjie.modules.wms.bd.service.dto.SupplierInfoQueryCriteria; import me.zhengjie.modules.wms.bd.service.mapper.SupplierInfoMapper; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; @@ -95,11 +100,23 @@ public class SupplierInfoServiceImpl implements SupplierInfoService { @Override @Transactional(rollbackFor = Exception.class) - public SupplierInfoDTO create(SupplierInfo resources) { - resources.setStatus(true); - SupplierInfo supplierInfo = supplierInfoRepository.save(resources); - supplierInfoMapper.toDto(supplierInfo); - return supplierInfoMapper.toDto(supplierInfo); + public SupplierInfoDTO create(CreateSupplierInfoRequest createSupplierInfoRequest) { + SupplierInfo supplierInfo = new SupplierInfo(); + BeanUtils.copyProperties(createSupplierInfoRequest, supplierInfo); + supplierInfo.setStatus(true); + List supplierAddressList = createSupplierInfoRequest.getSupplierAddress(); + if(!CollectionUtils.isEmpty(supplierAddressList)){ + String supplierAddressStr = new Gson().toJson(supplierAddressList); + supplierInfo.setSupplierAddress(supplierAddressStr); + } + List supplierContactList = createSupplierInfoRequest.getSupplierContact(); + if(!CollectionUtils.isEmpty(supplierContactList)){ + String supplierContactStr = new Gson().toJson(supplierContactList); + supplierInfo.setSupplierContact(supplierContactStr); + } + supplierInfo = supplierInfoRepository.save(supplierInfo); + SupplierInfoDTO supplierInfoDTO = supplierInfoMapper.toDto(supplierInfo); + return supplierInfoDTO; } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java index 54c2ee97..1a506ab5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetDTO.java @@ -16,7 +16,7 @@ public class OutSourceProcessSheetDTO implements Serializable { private Long id; // 状态 - private Integer status; + private Boolean status; // 创建时间 private Timestamp createTime; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetProductDTO.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetProductDTO.java index a0dfb978..562e8ef7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetProductDTO.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetProductDTO.java @@ -16,7 +16,7 @@ public class OutSourceProcessSheetProductDTO implements Serializable { private Long id; // 状态 - private Integer status; + private Boolean status; // 创建时间 private Timestamp createTime; diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml index 87c857de..a52de8aa 100644 --- a/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin-system/src/main/resources/config/application.yml @@ -3,10 +3,9 @@ server: spring: profiles: - active: dev + active: prod jackson: - time-zon - e: GMT+8 + time-zone: GMT+8 data: redis: repositories: