Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1,5 +1,6 @@
 package org.springblade.client.feign;
 
+import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.common.constant.LauncherConstant;
@@ -26,6 +27,7 @@ public interface ICorpsDescClient {
 	String GET_CORPS_MESSAGE = API_PREFIX + "/get_corps_message";
 	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";
 
 	/**
 	 * 获取CorpsDesc列表
@@ -75,4 +77,7 @@ public interface ICorpsDescClient {
 	@GetMapping(LIST_BY_NAME)
 	List<CorpsDesc> listCorpByName (@RequestParam("cname") String cname);
 
+	@GetMapping(LIST_BANK_BY_CORP_ID)
+	List<CorpsBank> listBankByCorpId (@RequestParam("corpsId") Long corpsId);
+
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Items.java

@@ -194,4 +194,14 @@ public class Items implements Serializable {
 	@ApiModelProperty(value = "费用类型")
 	@TableField("cost_type")
 	private String costType;
+
+	@ApiModelProperty(value = "提单号")
+	private String billNo;
+
+	@TableField(exist = false)
+	private String corpName;
+
+	@TableField(exist = false)
+	private String itemName;
+
 }

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Settlement.java

@@ -208,5 +208,11 @@ public class Settlement  implements Serializable {
 	@ApiModelProperty(value = "清核状态")
 	private String checkStatus;
 
+	@TableField(exist = false)
+	private List<?> bankList;
+
+	@ApiModelProperty(value = "提单号")
+	private String billNo;
+
 
 }

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.client.corps.assemble.mapstruct.CorpsDescMapstructMapper;
+import org.springblade.client.corps.service.ICorpsBankService;
 import org.springblade.client.corps.service.ICorpsDescService;
+import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.vo.CorpsDescVO;
@@ -32,6 +34,8 @@ public class CorpsDescClient implements ICorpsDescClient {
 
 	private final CorpsDescMapstructMapper corpsDescMapstructMapper;
 
+	private final ICorpsBankService bankService;
+
 	@Override
 	public BladePage<CorpsDesc> top(Integer current, Integer size) {
 		Query query = new Query();
@@ -84,4 +88,13 @@ public class CorpsDescClient implements ICorpsDescClient {
 		corpsDescLambdaQueryWrapper.like(CorpsDesc::getCname,cname);
 		return service.list(corpsDescLambdaQueryWrapper);
 	}
+
+	@Override
+	@GetMapping(LIST_BANK_BY_CORP_ID)
+	public List<CorpsBank> listBankByCorpId(Long corpsId)
+	{
+		LambdaQueryWrapper<CorpsBank> bankLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		bankLambdaQueryWrapper.eq(CorpsBank::getPid,corpsId);
+		return bankService.list(bankLambdaQueryWrapper);
+	}
 }

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -35,13 +35,16 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import lombok.Data;
+import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.feign.IFeesDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -65,7 +68,11 @@ public class SettlementController extends BladeController {
 
 	private final IItemsService itemsService;
 
-	private ICorpsDescClient corpsDescClient;//获取客户信息
+	private final ICorpsDescClient corpsDescClient;//获取客户信息
+
+	private final IUserClient iUserClient;
+
+	private final IFeesDescClient iFeesDescClient;
 	/**
 	 * 详情
 	 */
@@ -77,6 +84,20 @@ public class SettlementController extends BladeController {
 		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		itemsLambdaQueryWrapper.eq(Items::getPid,detail.getId());
 		List<Items> list = itemsService.list(itemsLambdaQueryWrapper);
+
+		if(CollectionUtils.isNotEmpty(list))
+		{
+			list.forEach(e->{
+				//录入人
+				e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
+				//客户名称
+                e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
+				//费用名称
+				e.setItemName(iFeesDescClient.detail(Long.valueOf(e.getCostType())).getData().getCname());
+
+			});
+		}
+
 		detail.setItemsList(list);
 		//获取客户中文名
 		if (detail.getCorpId() != null){
@@ -85,6 +106,12 @@ public class SettlementController extends BladeController {
 				detail.setCustomerModel(corpMessage.getData());
 			}
 		}
+
+		List<CorpsBank> corpsBanks = corpsDescClient.listBankByCorpId(detail.getCorpId());
+		detail.setBankList(corpsBanks);
+		//制单人
+		detail.setCreateUserName(iUserClient.userInfoById(detail.getCreateUser()).getData().getRealName());
+
 		return R.data(detail);
 	}
 
@@ -184,7 +211,6 @@ public class SettlementController extends BladeController {
           {
           	throw new SecurityException("传入数据不能为空");
 		  }
-		  ;
           return R.data(settlementService.apply(dto.getItemsList(),dto.getBillType()));
 	}
 

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -30,6 +30,8 @@ import com.trade.finance.mapper.ItemsMapper;
 import com.trade.finance.mapper.SettlementMapper;
 import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
+import org.springblade.client.entity.CorpsBank;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -59,6 +61,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	private ISerialClient serialClient;//生成系统编号
 	@Autowired
 	private AccMapper accMapper;
+    @Autowired
+	private ICorpsDescClient corpsDescClient;
 
 	@Override
 	public IPage<SettlementVO> selectSettlementPage(IPage<SettlementVO> page, SettlementVO settlement) {
@@ -196,7 +200,10 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			   e.setCreateUser(AuthUtil.getUserId());
 			   itemsMapper.insert(e);
 		   });
-		   return settlement;
+		List<CorpsBank> corpsBanks = corpsDescClient.listBankByCorpId(settlement.getCorpId());
+		settlement.setBankList(corpsBanks);
+		return settlement;
+
 
 	}