提交代码

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

@@ -56,4 +56,6 @@ public class CorpsDescVO extends CorpsDesc {
 	@ApiModelProperty(value = "分管员中文名")
 	private String adminProfilesName;
 
+	private String belongCompany;
+
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -365,4 +365,6 @@ public class Delivery implements Serializable {
 	private String overpayment;
 
 	private BigDecimal createProfit;
+
+	private String belongCompany;
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -725,4 +725,6 @@ public class Order implements Serializable {
 	private Integer isLabel;
     //客户对应的分管员
 	private String chargeMember;
+
+	private String belongCompany;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/ApplyDTO.java

@@ -48,4 +48,5 @@ public class ApplyDTO extends Acc {
 	private String pageStatus;
 	private String pageLabel;
 	private String checkType;
+	private String belongCompany;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/SettlementDTO.java

@@ -47,4 +47,6 @@ public class SettlementDTO extends Settlement {
 
 	@ApiModelProperty(value = "原结算单状态")
 	private String originBillType;
+
+	private String belongCompany;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdModule.java

@@ -17,6 +17,9 @@
 package org.springblade.finance.entity;
 
 import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -50,6 +53,9 @@ public class JdModule implements Serializable {
 	*/
 		@ApiModelProperty(value = "科目编码")
 		private String projectCode;
+
+		@ApiModelProperty(value = "科目编码")
+		private String projectName;
 	/**
 	* 所属账套id
 	*/
@@ -64,5 +70,56 @@ public class JdModule implements Serializable {
 	@ApiModelProperty(value = "租户id")
 	private String tenantId;
 
+	@ApiModelProperty(value = "版本")
+	private String version;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private Long updateUser;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 状态（0 正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0 正常 1停用）")
+	private Integer status;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
+
+	private String currency;
+
+	private String currencyCode;
+
+	private String voucher;
+
+	private String voucherType;
+
+	private String projectType;
+
+	private String abstractStatic;
+
+	private String abstractFormula;
 
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Settlement.java

@@ -265,4 +265,9 @@ public class Settlement  implements Serializable {
 	private String bankNo;//开户银行号
 	private String addressPhone;//地址电话
 
+	private String belongCompany;
+
+	private Long salesCompany;
+
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -617,4 +617,6 @@ public class Order extends OrderBase {
 
 	private BigDecimal refundForeignSettlmentAmount;
 
+	private String belongCompany;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/lock/controller/LockController.java

@@ -138,6 +138,7 @@ public class LockController extends BladeController {
 	@ApiOperation(value = "检查当前表单是否可以编辑", notes = "")
 	public R<?> checkLock(@ApiParam(value = "模块名称", required = true) @RequestParam String moduleName,
 								@ApiParam(value = "数据表名称", required = true) @RequestParam String tableName,
+						       @ApiParam(value = "电脑序列号", required = true) @RequestParam String no,
 								@ApiParam(value = "单据id", required = true) @RequestParam Long billId)
 	{
 		//先查看当前租户是在此模块否配置锁,如果没有锁或者没开启,直接返回true
@@ -174,7 +175,7 @@ public class LockController extends BladeController {
 			return R.fail("账号:"+lock.getRealName()+"于"+simpleDateFormat.format(lock.getLockTime())+"正在编辑请稍后再试!");
 		}
         //有锁 是自己
-		else if( lock.getUserId().longValue()==userId.longValue())
+		else if( lock.getUserId().longValue()==userId.longValue() && lock.getLockNo().equals(no+AuthUtil.getUserName()))
 		{
 			return R.success("目前订单可以编辑");
 		}
@@ -198,6 +199,7 @@ public class LockController extends BladeController {
 		//校验防止上锁多次
 		LambdaQueryWrapper<Lock> lockLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		lockLambdaQueryWrapper
+			.eq(Lock::getLockNo,no+AuthUtil.getUserName())
 			.eq(Lock::getBillId,billId)
 			.eq(Lock::getMoudleName,moduleName)
 			.eq(Lock::getTableName,tableName)
@@ -230,8 +232,8 @@ public class LockController extends BladeController {
 			lock.setBillId(billId);
 			lock.setBillNo(billNo);
 			//生成16位 code
-			int code = (no + AuthUtil.getUserName()).hashCode();
-			lock.setLockNo(String.valueOf(code));
+			/*int code = (no + AuthUtil.getUserName()).hashCode();*/
+			lock.setLockNo(no+AuthUtil.getUserName());
 			lock.setCreateTime(new Date());
 			lock.setCreateUser(AuthUtil.getUserId());
 			lockService.save(lock);

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -294,7 +294,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 				try
 				{
-					String accountName="金蝶开发者测试账套";
+					String accountName=select.getBelongCompany();
 					//测试账套-收货生成凭证
 					this.testDeliverGoodsSaveVoucher(accountName,corpName,wareHouse,purchaseTotalAmount,deliveryAmount,saleOrderNo,purchaseOrderNo);
 				}
@@ -483,7 +483,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			//todo
 			try
 			{
-				String accountName="金蝶开发者测试账套";
+				String accountName=select.getBelongCompany();
 				//测试账套-收货生成凭证
 				this.testTakeGoodsSaveVoucher(accountName,corpName,wareHouse,acoount,orderNo);
 			}
@@ -957,14 +957,14 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		List<JDYassist> dList=new ArrayList<>();
 
 
-		warehouse="测试客户";//具体到时候用哪个,需要关联查询传参,今天先用测试的
+		//warehouse="测试客户";//具体到时候用哪个,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper=new LambdaQueryWrapper<>();
 		corpsQueryWrapper
 			.eq(JdCorps::getCorpsType,1)
 			.eq(JdCorps::getAccountId,accountId)
 			.eq(JdCorps::getTenantId,AuthUtil.getTenantId())
 			.last("limit 1")
-			.eq(JdCorps::getCorpsName,warehouse);
+			.eq(JdCorps::getCorpsName,copsName);
 		JdCorps jdCorps = corpsMapper.selectOne(corpsQueryWrapper);
 
 		JDYassist jdYassist=new JDYassist();
@@ -1052,7 +1052,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		List<JDYassist> cList2=new ArrayList<>();
 
 
-		warehouse="测试仓库";//具体到时候用哪个,需要关联查询传参,今天先用测试的
+		//warehouse="测试仓库";//具体到时候用哪个,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper2=new LambdaQueryWrapper<>();
 		corpsQueryWrapper2
 			.eq(JdCorps::getCorpsType,4)
@@ -1130,7 +1130,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		List<JDYassist> dList=new ArrayList<>();
 
 
-		warehouse="测试仓库";//具体到时候用哪个,需要关联查询传参,今天先用测试的
+		//warehouse="测试仓库";//具体到时候用哪个,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper=new LambdaQueryWrapper<>();
 		corpsQueryWrapper
 			.eq(JdCorps::getCorpsType,4)
@@ -1179,7 +1179,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		List<JDYassist> cList=new ArrayList<>();
 
 
-		copsName="测试供应商";//具体到时候用哪个,需要关联查询传参,今天先用测试的
+		//copsName="测试供应商";//具体到时候用哪个,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper2=new LambdaQueryWrapper<>();
 		corpsQueryWrapper2
 			.eq(JdCorps::getCorpsType,2)

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/tool/JdyTool.java

@@ -2,6 +2,7 @@ package org.springblade.deliver.goods.tool;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import com.github.kevinsawicki.http.HttpRequest;
@@ -39,6 +40,27 @@ public class JdyTool
 		log.info("请求结果结果:"+saveResponse.getSuccess());
 		log.info("请求结果状态码:"+saveResponse.getErrorCode());
 		/*log.info("请求返回体:"+saveResponse.toString());*/
+        //验证,如果返回不对, 连同业务回滚
+		boolean error=false;
+		if(CollectionUtils.isNotEmpty(saveResponse.getData()))
+		{
+			error = saveResponse.getData().stream().anyMatch(e -> e.getSuccess() == false);
+		}
+
+		if(saveResponse.getSuccess()==false)
+		{
+			throw new SecurityException("调用凭证API失败,请检查日志");
+		}
+		else
+		{
+
+			if(error)
+			{
+				throw new SecurityException("保存凭证失败,请检查日志");
+			}
+		}
+
+
 		//获取主表id
 		List<String> successPkIds = saveResponse.getData().get(0).getSuccessPkIds();
 		/*System.out.println("请求body===="+httpRequest.body().toString());

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdModuleController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.finance.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -66,7 +67,9 @@ public class JdModuleController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入jdModule")
 	public R<IPage<JdModule>> list(JdModule jdModule, Query query) {
-		IPage<JdModule> pages = jdModuleService.page(Condition.getPage(query), Condition.getQueryWrapper(jdModule));
+		QueryWrapper<JdModule> queryWrapper = Condition.getQueryWrapper(jdModule);
+		queryWrapper.eq("is_deleted",0);
+		IPage<JdModule> pages = jdModuleService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
 	}
 
@@ -111,7 +114,7 @@ public class JdModuleController extends BladeController {
 		return R.status(jdModuleService.saveOrUpdate(jdModule));
 	}
 
-	
+
 	/**
 	 * 删除 租户jd模块表
 	 */
@@ -122,5 +125,18 @@ public class JdModuleController extends BladeController {
 		return R.status(jdModuleService.removeByIds(Func.toLongList(ids)));
 	}
 
-	
+	@PostMapping("/delete")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam Long id)
+	{
+		JdModule jdModule=new JdModule();
+		jdModule.setId(id);
+		jdModule.setIsDeleted(1);
+		jdModuleService.updateById(jdModule);
+		return R.success("操作成功");
+
+	}
+
+
 }

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

@@ -24,6 +24,7 @@ import org.springblade.finance.dto.SettlementDTO;
 import org.springblade.finance.entity.InvoiceItem;
 import org.springblade.finance.mapper.InvoiceItemMapper;
 import org.springblade.finance.service.IInvoiceItemService;
+import org.springblade.finance.tool.JdyTool;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
@@ -300,7 +301,7 @@ public class SettlementController extends BladeController {
 	@ApiOperation(value = "付销售-收款结算-生成-销售收费账单", notes = "传入销售申请对象")
 	public R paymentApply (@RequestBody ApplyDTO dto)
 	{
-		settlementService.paymentApply(dto.getItemsList(),dto.getBillType());
+		settlementService.paymentApply(dto.getItemsList(),dto.getBillType(),dto.getBelongCompany());
 		return R.success("操作成功");
 	}
 
@@ -379,6 +380,13 @@ public class SettlementController extends BladeController {
 		return R.data(settlementService.getProjectList(search, accountName));
 	}
 
+	@GetMapping("getAccountList")
+	public R<List<?>>  getAccountList() throws Exception
+	{
+		List<JdyTool.AccountGroup> accountList = settlementService.getAccountList();
+		return R.data(accountList);
+	}
+
 
 
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/service/ISettlementService.java

@@ -20,6 +20,7 @@ package org.springblade.finance.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.finance.dto.SettlementDTO;
+import org.springblade.finance.tool.JdyTool;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
 import org.springblade.finance.vo.SettlementVO;
@@ -54,7 +55,7 @@ public interface ISettlementService extends IService<Settlement> {
 
 	void check(Settlement settlement);
 
-	void paymentApply(List<Items> itemsList, String billType);
+	void paymentApply(List<Items> itemsList, String billType,String belongCompany);
 
 	SettlementDTO saveOrEdit(SettlementDTO settlementDTO);
 
@@ -70,4 +71,6 @@ public interface ISettlementService extends IService<Settlement> {
 
 	String getProjectList(String search,String accountName);
 
+	List<JdyTool.AccountGroup> getAccountList() throws Exception;
+
 }

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

@@ -70,6 +70,8 @@ import org.springblade.purchase.sales.entity.OrderFees;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.purchase.sales.feign.IOrderFeesClient;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -113,6 +115,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	private ICheckClient iCheckClient;
 
+	private IUserClient userClient;
+
 	private final IOrderFeesClient orderFeesClient;
 
 	private final IBusinessOverpaymentClient businessOverpaymentClient; //溢付款对外访问接口
@@ -216,11 +220,19 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		Long id = settlementDTO.getId();
 		Settlement settlement = baseMapper.selectById(id);
 		String corpsName=null;
+		String createUser=null;
+		//供应商
 		R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(settlement.getCorpId());
 		if(corpMessage.isSuccess()&&corpMessage.getData()!=null)
 		{
 			corpsName=corpMessage.getData().getCname();
 		}
+        //业务员
+		R<User> userR = userClient.userInfoById(settlement.getCreateUser());
+		if(userR.isSuccess()&&userR.getData()!=null)
+		{
+			createUser=userR.getData().getName();
+		}
 
 
 		//测试账套-保存凭证
@@ -246,7 +258,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
                         {
 			                try
 							{
-								String accountName="金蝶开发者测试账套";
+								String accountName=settlement.getBelongCompany();
 								//测试账套-销售保存凭证
 								this.testSaleCollectionSaveVoucher(accountName,corpsName,settlement.getAmount().toString());
 							}
@@ -264,9 +276,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						{
 							try
 							{
-								String accountName="金蝶开发者测试账套";
+								String accountName=settlement.getBelongCompany();
 								//测试账套-销售保存凭证
-								this.testPurchaseSaveVoucher(accountName,corpsName,settlement.getAmount().toString());
+								this.testPurchaseSaveVoucher(accountName,createUser,corpsName,settlement.getAmount().toString());
 							}
 							catch (Exception exception)
 							{
@@ -882,7 +894,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	@Override
 	@Transactional
-	public void paymentApply(List<Items> itemsList, String billType) {
+	public void paymentApply(List<Items> itemsList, String billType,String belongCompany) {
 		itemsList.forEach(e -> {
             //产生凭证: 销售订单-生成账单
 			if(e.getSrcType()==1 && e.getItemType().equals("销售"))
@@ -891,7 +903,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				{
 					String accountName="金蝶开发者测试账套";
 					//测试账套-销售保存凭证
-					this.testSaleSaveVoucher(accountName,e);
+					this.testSaleSaveVoucher(belongCompany,e);
 				}
 				catch (Exception exception)
 				{
@@ -1268,8 +1280,33 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		return null;
 	}
 
+	@Override
+	public List<JdyTool.AccountGroup> getAccountList()  throws Exception
+	{
+		//获取token
+		String token = this.getAccountGroupRequest();
+		//获取套账url
+		String getAccountUrl="https://api.kingdee.com/jdy/sys/accountGroup?access_token="+token;
+		Map<String, String> urlParams=new HashMap<>();
+		String result = this.doPost(getAccountUrl, urlParams);
+		JdyTool.getAccountGroup getAccountGroup = JSONObject.parseObject(result, JdyTool.getAccountGroup.class);
+		List<JdyTool.AccountGroup> list=new ArrayList<>();
+		List<JdyTool.AccountGroups> groupsList = getAccountGroup.getData();
+		if(!CollectionUtils.isNotEmpty(groupsList))
+		{
+			throw new SecurityException("操作失败,暂无账套信息");
+		}
+		getAccountGroup.getData().forEach(e->{
+			list.addAll(e.getAccountGroups());
+		});
+		//匹配账套
+
+
+		return list;
+	}
+
 	//金蝶保存凭证测试-采购付款生成凭证
-	public void toPurchaseJinDie(String Account,String corpName,String accountId,String groupName,JdTenant jdTenant)
+	public void toPurchaseJinDie(String Account,String createUser,String corpName,String accountId,String groupName,JdTenant jdTenant)
 	{
 		JDYitems item = new JDYitems();
 		item.setDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
@@ -1321,14 +1358,14 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		List<JDYassist> cList=new ArrayList<>();
 
 		//查询业务员
-		String jdCorpName="测试业务员";//具体到时候用哪个客户,需要关联查询传参,今天先用测试的
+		//String jdCorpName="测试业务员";//具体到时候用哪个客户,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper=new LambdaQueryWrapper<>();
 		corpsQueryWrapper
 			.eq(JdCorps::getCorpsType,3)
 			.eq(JdCorps::getAccountId,accountId)
 			.eq(JdCorps::getTenantId,AuthUtil.getTenantId())
 			.last("limit 1")
-			.eq(JdCorps::getCorpsName,jdCorpName);
+			.eq(JdCorps::getCorpsName,createUser);
 		JdCorps jdCorps = corpsMapper.selectOne(corpsQueryWrapper);
 
 		JDYassist jdYassist=new JDYassist();
@@ -1341,14 +1378,14 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 
 		//查询供应商
-		String jdCorpName2="测试供应商";//具体到时候用哪个客户,需要关联查询传参,今天先用测试的
+		//String jdCorpName2="测试供应商";//具体到时候用哪个客户,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper2=new LambdaQueryWrapper<>();
 		corpsQueryWrapper2
 			.eq(JdCorps::getCorpsType,2)
 			.eq(JdCorps::getAccountId,accountId)
 			.eq(JdCorps::getTenantId,AuthUtil.getTenantId())
 			.last("limit 1")
-			.eq(JdCorps::getCorpsName,jdCorpName2);
+			.eq(JdCorps::getCorpsName,corpName);
 		JdCorps jdCorps2 = corpsMapper.selectOne(corpsQueryWrapper2);
 
 		JDYassist jdYassist2=new JDYassist();
@@ -1431,14 +1468,14 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		List<JDYassist> cList=new ArrayList<>();
 
 		//查询客户
-		String jdCorpName="测试客户";//具体到时候用哪个客户,需要关联查询传参,今天先用测试的
+		//String jdCorpName="测试客户";//具体到时候用哪个客户,需要关联查询传参,今天先用测试的
 		LambdaQueryWrapper<JdCorps> corpsQueryWrapper=new LambdaQueryWrapper<>();
 		corpsQueryWrapper
 			.eq(JdCorps::getCorpsType,1)
 			.eq(JdCorps::getAccountId,accountId)
 			.eq(JdCorps::getTenantId,AuthUtil.getTenantId())
 			.last("limit 1")
-			.eq(JdCorps::getCorpsName,jdCorpName);
+			.eq(JdCorps::getCorpsName,corpName);
 		JdCorps jdCorps = corpsMapper.selectOne(corpsQueryWrapper);
 
 		JDYassist jdYassist=new JDYassist();
@@ -1570,7 +1607,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	}
 
 	//采购付款生成凭证
-	public void testPurchaseSaveVoucher(String accountName,String corpName,String account)throws Exception
+	public void testPurchaseSaveVoucher(String accountName,String createUser,String corpName,String account)throws Exception
 	{
 
 		//非达沃特用户直接返回
@@ -1625,7 +1662,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			return;
 		}
 		//2.销售收款-保存凭证
-		toPurchaseJinDie(account,corpName,jdTenant.getAccountId(),group.getGroupName(),jdTenant);
+		toPurchaseJinDie(account,createUser,corpName,jdTenant.getAccountId(),group.getGroupName(),jdTenant);
 	}
 
 
@@ -1687,6 +1724,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
         toSaleCollectionJinDie(account,corpName,jdTenant.getAccountId(),group.getGroupName(),jdTenant);
 	}
 
+
+
 	//销售生成账单
 	public void testSaleSaveVoucher(String accountName,Items items) throws Exception
 	{
@@ -1739,11 +1778,12 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	}
 
 	//测试获取AccountGroupRequest
-	public String  getAccountGroupRequest() throws Exception
+	public String  getAccountGroupRequest( ) throws Exception
 	{
 		//校验当前租户配置,如果存在配置,返回token
 		LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		jdTenantLambdaQueryWrapper
+			.last("limit 1")
 			.eq(JdTenant::getTenantId,AuthUtil.getTenantId())
 			.eq(JdTenant::getIsEnable,1);
 		JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);

blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyun.tea.NameInMap;
 import com.aliyun.tea.TeaConverter;
 import com.aliyun.tea.TeaPair;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jdy.v7sdk.business.models.SaveResponse;
 import com.jdy.v7sdk.business.models.errorInfo;
 import com.jdy.v7sdk.models.AccountGroupRequest;
@@ -102,6 +103,26 @@ public class JdyTool
 		JDYSaveResponse  saveResponse = JSONObject.parseObject(body, JDYSaveResponse.class);
 		log.info("请求结果结果:"+saveResponse.getSuccess());
 		log.info("请求结果状态码:"+saveResponse.getErrorCode());
+		//验证,如果返回不对, 连同业务回滚
+		boolean error=false;
+		if(CollectionUtils.isNotEmpty(saveResponse.getData()))
+		{
+			error = saveResponse.getData().stream().anyMatch(e -> e.getSuccess() == false);
+		}
+
+		if(saveResponse.getSuccess()==false)
+		{
+            throw new SecurityException("调用凭证API失败,请检查日志");
+		}
+		else
+		{
+
+			if(error)
+			{
+				throw new SecurityException("保存凭证失败,请检查日志");
+			}
+		}
+
 		/*log.info("请求返回体:"+saveResponse.toString());*/
 		//获取主表id
 		List<String> successPkIds = saveResponse.getData().get(0).getSuccessPkIds();