Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

 Conflicts:

	blade-service/blade-client/src/main/java/org/springblade/client/ClientApplication.java

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -281,6 +281,11 @@ public class CorpsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "客户类型")
 	private String corpType;
+	/**
+	 * 分管员
+	 */
+	@ApiModelProperty(value = "分管员")
+	private String adminProfiles;
 
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -28,6 +28,7 @@ public interface ICorpsDescClient {
 	String GET_BY_CNAME = API_PREFIX + "get_by_name";
 	String LIST_BY_NAME = API_PREFIX + "/listCorpByName";
 	String LIST_BANK_BY_CORP_ID=API_PREFIX+"/listBankByCorpId";
+	String GET_CORPS_DESC= API_PREFIX + "/getCorpsDesc";
 
 	/**
 	 * 获取CorpsDesc列表
@@ -80,4 +81,12 @@ public interface ICorpsDescClient {
 	@GetMapping(LIST_BANK_BY_CORP_ID)
 	List<CorpsBank> listBankByCorpId (@RequestParam("corpsId") Long corpsId);
 
+	/**
+	 * 获取商品信息
+	 * @param corpsDesc
+	 * @return
+	 */
+	@GetMapping(GET_CORPS_DESC)
+	CorpsDesc getCorpsDesc(CorpsDesc corpsDesc);
+
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpsDescVO.java

@@ -50,5 +50,10 @@ public class CorpsDescVO extends CorpsDesc {
 	 */
 	@ApiModelProperty(value = "客户类别")
 	private List<Long> typeList;
+	/**
+	 * 分管员中文名
+	 */
+	@ApiModelProperty(value = "分管员中文名")
+	private String adminProfilesName;
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -26,12 +26,15 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -47,6 +50,7 @@ import java.util.List;
 public class CorpsDescController extends BladeController {
 
 	private final ICorpsDescService corpsDescService;
+	private final IUserClient userClient;
 
 	/**
 	 * 详情
@@ -69,6 +73,23 @@ public class CorpsDescController extends BladeController {
 		corpsDesc.setIsDeleted(0);//默认查有效的
 		corpsDesc.setTenantId(SecureUtil.getTenantId());
 		IPage<CorpsDescVO> pages = corpsDescService.selectCorpsDescPage(Condition.getPage(query), corpsDesc);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				if(StringUtils.isNotBlank(item.getAdminProfiles())){
+					List<String> list = Arrays.asList(item.getAdminProfiles().split(","));
+					StringBuffer stringBuffer = new StringBuffer();
+					if (CollectionUtils.isNotEmpty(list)){
+						list.stream().forEach(items ->{
+							R<User> user = userClient.userInfoById(Long.valueOf(items));
+							if (user.isSuccess() && user.getData() != null){
+								stringBuffer.append(user.getData().getName()+",");
+							}
+						});
+					}
+					item.setAdminProfilesName(stringBuffer.toString());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 
@@ -152,13 +173,13 @@ public class CorpsDescController extends BladeController {
 	@PostMapping("/import-desc")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入客户资料", notes = "传入excel")
-	public R importUser(MultipartFile file) {
+	public R importUser(@RequestParam("file") MultipartFile file,@RequestParam("corpType")String corpType) {
 		List<CorpsExcel> excelList = ExcelUtil.read(file, CorpsExcel.class);
 		if(CollectionUtils.isEmpty(excelList))
 		{
 			throw new SecurityException("数据不能为空");
 		}
-		return corpsDescService.importUser(excelList,false);
+		return corpsDescService.importUser(excelList,false,corpType);
 	}
 
 
@@ -170,7 +191,7 @@ public class CorpsDescController extends BladeController {
 	@ApiOperation(value = "导出模板")
 	public void exportPrice(HttpServletResponse response) {
 		List<CorpsExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "客户导入模板", "客户导入数据表", list, CorpsExcel.class);
+		ExcelUtil.export(response, "导入模板", "导入数据表", list, CorpsExcel.class);
 	}
 	/**
 	 * 客户信息

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/CorpsImport.java

@@ -21,6 +21,6 @@ public class CorpsImport implements ExcelImporter<CorpsExcel> {
 	private final Boolean isCovered;
 	@Override
 	public void save(List<CorpsExcel> data) {
-		corpsDescService.importUser(data,isCovered);
+		corpsDescService.importUser(data,isCovered,null);
 	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -1,6 +1,7 @@
 package org.springblade.client.corps.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -97,4 +99,11 @@ public class CorpsDescClient implements ICorpsDescClient {
 		bankLambdaQueryWrapper.eq(CorpsBank::getPid,corpsId);
 		return bankService.list(bankLambdaQueryWrapper);
 	}
+
+	@Override
+	public CorpsDesc getCorpsDesc(CorpsDesc corpsDesc) {
+		corpsDesc.setTenantId(SecureUtil.getTenantId());
+		corpsDesc.setIsDeleted(0);
+		return service.getOne(new QueryWrapper<CorpsDesc>().setEntity(corpsDesc));
+	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -46,10 +46,11 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="payment_type" property="paymentType"/>
         <result column="corp_type" property="corpType"/>
+        <result column="admin_profiles" property="adminProfiles"/>
     </resultMap>
 
 
-    <select id="selectCorpsDescPage" resultMap="corpsDescResultMap">
+    <select id="selectCorpsDescPage" resultType="org.springblade.client.vo.CorpsDescVO">
         select
         *
         from
@@ -134,6 +135,9 @@
         <if test="CorpsDesc.creditLevel!=null and CorpsDesc.creditLevel != ''">
             and credit_level like CONCAT(CONCAT('%',  #{CorpsDesc.creditLevel}), '%')
         </if>
+        <if test="CorpsDesc.adminProfiles!=null and CorpsDesc.adminProfiles != ''">
+            and admin_profiles like CONCAT(CONCAT('%',  #{CorpsDesc.adminProfiles}), '%')
+        </if>
         <if test="CorpsDesc.creditGrant!=null">
             and credit_grant = #{CorpsDesc.creditGrant}
         </if>

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/ICorpsDescService.java

@@ -93,6 +93,6 @@ public interface ICorpsDescService extends IService<CorpsDesc> {
 	 * @param
 	 * @return
 	 */
-	R importUser(List<CorpsExcel> data,Boolean isCovered);
+	R importUser(List<CorpsExcel> data,Boolean isCovered,String corpType);
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -164,7 +164,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 
 	@Override
 	@Transactional
-	public R importUser(List<CorpsExcel> data, Boolean isCovered)
+	public R importUser(List<CorpsExcel> data, Boolean isCovered,String corpType)
 	{
 		try {
 			if(org.springframework.util.CollectionUtils.isEmpty(data))
@@ -200,6 +200,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 					corpsDesc.setCompanytype(e.getCompanytype());
 					corpsDesc.setPosition(e.getPosition());
 					corpsDesc.setCorpsTypeId(String.valueOf(corpsType.getId()));
+					corpsDesc.setCorpType(corpType);
 					//名称相等视为重复数据
 					LambdaQueryWrapper<CorpsDesc> queryWrapper = new LambdaQueryWrapper<>();
 					queryWrapper.eq(CorpsDesc::getCname,corpsDesc.getCname());

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -72,6 +72,8 @@ public class GoodsExcel implements Serializable {
 
 	@ExcelProperty("备注")
 	private String remarks;
+	@ExcelProperty("供应商")
+	private String CorpName;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/feign/GoodsDescClient.java

@@ -125,7 +125,11 @@ public class GoodsDescClient implements IGoodsDescClient {
 
 	@Override
 	public GoodsDesc getGoodName(String cname,Long corpId) {
-		return goodsDescService.getOne(new QueryWrapper<GoodsDesc>().eq("cname",cname).eq("corp_id",corpId)
-		.eq("tenant_id",SecureUtil.getTenantId()).eq("is_deleted",0));
+		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getIsDeleted,0);
+		lambdaQueryWrapper.eq(GoodsDesc::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(GoodsDesc::getCname,cname);
+		lambdaQueryWrapper.eq(Func.isNotEmpty(corpId),GoodsDesc::getCorpId,corpId);
+		return goodsDescService.getOne(lambdaQueryWrapper);
 	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.*;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.goods.mapper.*;
 import org.springblade.client.goods.service.IGoodsDescService;
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -53,18 +55,13 @@ import java.util.stream.Collectors;
 public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc> implements IGoodsDescService {
 	private GoodsTypeDescServiceImpl goodsTypeDescService;  //商品-商品类别对应表
 	private GoodsTypeServiceImpl goodsTypeService;//商品类别信息
-	@Autowired
-	private GoodsTypeMapper goodsTypeMapper;
-	@Autowired
-	private GoodsDescMapper goodsDescMapper;
-	@Autowired
-	private GoodsPriceMapper goodsPriceMapper;
-	@Autowired
-	private GoodsTypeDescMapper goodsTypeDescMapper;
-	@Autowired
-	private GoodsFilesMapper goodsFilesMapper;
-	@Autowired
-	private GoodsSpecificationMapper goodsSpecificationMapper;
+	private final GoodsTypeMapper goodsTypeMapper;
+	private final GoodsDescMapper goodsDescMapper;
+	private final GoodsPriceMapper goodsPriceMapper;
+	private final GoodsTypeDescMapper goodsTypeDescMapper;
+	private final GoodsFilesMapper goodsFilesMapper;
+	private final GoodsSpecificationMapper goodsSpecificationMapper;
+	private final ICorpsDescClient corpsDescClient;
 
 
 	@Override
@@ -368,6 +365,15 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					goodsDesc.setRemarks(e.getRemarks());
 					goodsDesc.setType(0L);
 					goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));
+					//获取供应商
+					CorpsDesc corpsDesc = new CorpsDesc();
+					corpsDesc.setCname(e.getCorpName());
+					corpsDesc.setCorpType("GYS");
+					CorpsDesc corpByName = corpsDescClient.getCorpsDesc(corpsDesc);
+					if (corpByName != null){
+						goodsDesc.setCorpId(corpByName.getId());
+						goodsDesc.setCorpName(corpByName.getCname());
+					}
 					//如果名称相等 就认为重复
 					LambdaQueryWrapper<GoodsDesc> queryWrapper = new LambdaQueryWrapper<>();
 					queryWrapper.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId());

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -141,17 +141,20 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 			//采购报价=单价 / (1+税率/100) *（1+FOB系数/100）
 			priceBank.setPurchaseAmount(priceBank.getPrice().divide((new BigDecimal(1).add((priceBank.getTaxRate().divide(new BigDecimal(100))))),4).multiply(new BigDecimal(1).add((priceBank.getCoefficient().divide(new BigDecimal(100))))));
 			if (StringUtils.isNotBlank(item.getCorpName())){
-				R<CorpsDesc> corpByName = corpsDescClient.getCorpByName(item.getCorpName(), SecureUtil.getTenantId());
-				if (corpByName.isSuccess() && corpByName.getData() != null){
+				CorpsDesc corpsDesc = new CorpsDesc();
+				corpsDesc.setCname(item.getCorpName());
+				corpsDesc.setCorpType("GYS");
+				CorpsDesc corpByName = corpsDescClient.getCorpsDesc(corpsDesc);
+				if (corpByName != null){
 					priceBank.setCorpName(item.getCorpName());//供应商
-					priceBank.setCorpId(corpByName.getData().getId());//供应商id
+					priceBank.setCorpId(corpByName.getId());//供应商id
 					//查商品id
 					GoodsType goodsType = goodsDescClient.goodTypeCname(item.getGoodsTypeName());
 					if (goodsType != null){
 						priceBank.setGoodTypeId(goodsType.getId());
 					}
 					//查商品看商品是否存在
-					GoodsDesc goodName = goodsDescClient.getGoodName(item.getCname(), priceBank.getCorpId());
+					GoodsDesc goodName = goodsDescClient.getGoodName(item.getCname(), null);
 					if (goodName != null){
 						priceBank.setCname(item.getCname());//商品名
 						priceBank.setItemId(goodName.getId());//商品id