供应商信息调整

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java

@@ -51,7 +51,7 @@ import java.util.List;
  */
 @Api(tags = "供应商信息")
 @RestController
-@RequestMapping("/apiadmin/base/basesupplierinfo")
+@RequestMapping("v1/basesupplierinfo")
 public class BaseSupplierInfoRest {
 
 	@Autowired

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfo.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: yxt-base(供应商管理) <br/>
  * File: BaseSupplierInfo.java <br/>
@@ -102,6 +104,8 @@ public class BaseSupplierInfo extends BaseEntity {
     private String billingTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
     private String billingTypeValue; // 开票类型value
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织名称")

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -106,6 +107,8 @@ public class BaseSupplierInfoDetailsVo implements Vo {
     private String billingTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
     private String billingTypeValue; // 开票类型value
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织名称")

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -106,6 +107,8 @@ public class BaseSupplierInfoDto implements Dto {
     private String billingTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
     private String billingTypeValue; // 开票类型value
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织名称")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -115,5 +116,5 @@ public class PmsSupplierInfoDto implements Dto {
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("开户行信息")
-    private List<PmsSupplierBankDto> pmsSupplierBankList;
+    private List<PmsSupplierBankDto> pmsSupplierBankList = new ArrayList<>();
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@@ -37,10 +37,14 @@ import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierBankDto;
+import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto;
+import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -61,6 +65,8 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 
 	@Autowired
 	private PmsSupplierBankService pmsSupplierBankService;
+	@Autowired
+	private BaseSupplierInfoFeign baseSupplierInfoFeign;
 
 	public PagerVo<PmsSupplierInfoVo> listPageVo(PagerQuery<PmsSupplierInfoQuery> pq) {
 		PmsSupplierInfoQuery query = pq.getParams();
@@ -89,54 +95,28 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 	
 	public ResultBean saveOrUpdateDto(PmsSupplierInfoDto dto){
 		ResultBean rb = ResultBean.fireFail();
-        String dtoSid = dto.getSid();
+		//获取pms下供应商开户行信息
-		List<PmsSupplierBankDto> pmsSupplierBankDtoList = dto.getPmsSupplierBankList();
+		List<PmsSupplierBankDto> pmsSupplierBankList = dto.getPmsSupplierBankList();
-		if (pmsSupplierBankDtoList == null || pmsSupplierBankDtoList.size() == 0){
+		//创建base下供应商信息对象
-			return rb.setMsg("开户行信息不能为空");
+		BaseSupplierInfoDto baseSupplierInfoDto = new BaseSupplierInfoDto();
-		}
+		//复制pms供应商信息到base供应商信息中
-		if (StringUtils.isBlank(dtoSid)) {
+		BeanUtil.copyProperties(dto,baseSupplierInfoDto);
-			String sid = this.insertByDto(dto);
+		//创建base下供应商开户行信息list对象
-			for (PmsSupplierBankDto pmsSupplierBankDto : pmsSupplierBankDtoList) {
+		List<BaseSupplierBankDto> baseSupplierBankDtos = new ArrayList<>();
-				pmsSupplierBankDto.setSupplierSid(sid);
+		//循环pms下供应商开户行list对象
-				pmsSupplierBankService.saveOrUpdateDto(pmsSupplierBankDto);
+		for (PmsSupplierBankDto pmsSupplierBankDto : pmsSupplierBankList) {
-			}
+			//创建base下供应商开户行信息
-			return rb.success();
+			BaseSupplierBankDto baseSupplierBankDto = new BaseSupplierBankDto();
-        } 
+			//复制pms供应商开户行信息到base供应商开户行信息中
-		this.updateByDto(dto);
+			BeanUtil.copyProperties(pmsSupplierBankDto,baseSupplierBankDto);
-		for (PmsSupplierBankDto pmsSupplierBankDto : pmsSupplierBankDtoList) {
+			//添加base供应商开户行信息到base供应商开户行list对象中
-			String bankSid = pmsSupplierBankDto.getSid();
+			baseSupplierBankDtos.add(baseSupplierBankDto);
-			if(StringUtils.isNotBlank(bankSid)){
+		}
-				PmsSupplierBank pmsSupplierBank = pmsSupplierBankService.fetchBySid(bankSid);
+		baseSupplierInfoDto.setBaseSupplierBankList(baseSupplierBankDtos);
-				BeanUtil.copyProperties(pmsSupplierBankDto,pmsSupplierBank,"sid");
+		baseSupplierInfoFeign.save(baseSupplierInfoDto);
-				pmsSupplierBank.setSupplierSid(dtoSid);
-				pmsSupplierBankService.updateById(pmsSupplierBank);
-			}else{
-				PmsSupplierBank pmsSupplierBank = new PmsSupplierBank();
-				BeanUtil.copyProperties(pmsSupplierBankDto,pmsSupplierBank,"sid");
-				pmsSupplierBank.setSupplierSid(dtoSid);
-				pmsSupplierBankService.insert(pmsSupplierBank);
-			}
-		}
 		return rb.success();
 	}
 	
-	public String insertByDto(PmsSupplierInfoDto dto){
-		PmsSupplierInfo entity = new PmsSupplierInfo();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-		return entity.getSid();
-	}
-	
-	public void updateByDto(PmsSupplierInfoDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsSupplierInfo entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
 	public PmsSupplierInfoDetailsVo fetchDetailsVoBySid(String sid){
 		PmsSupplierInfo entity = fetchBySid(sid);
 		PmsSupplierInfoDetailsVo vo = new PmsSupplierInfoDetailsVo();

yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -105,6 +106,8 @@ public class BaseSupplierInfoDto implements Dto {
     private String billingTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
     private String billingTypeValue; // 开票类型value
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织名称")