Merge remote-tracking branch 'origin/master'

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/invoices/entity/FinInvoicesItems.java

@@ -563,6 +563,22 @@ public class FinInvoicesItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否生成发票")
 	private String generateInvoices;
+	/**
+	 * 税票号
+	 */
+	@ApiModelProperty(value = "税票号")
+	private String taxInvoiceNumber;
+
+	/**
+	 * 税票日期
+	 */
+	@ApiModelProperty(value = "税票日期")
+	private Date taxInvoiceDate;
+	/**
+	 * 扣款时间
+	 */
+	@ApiModelProperty(value = "扣款时间")
+	private Date deductionTime;
 
 
 }

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

@@ -714,7 +714,6 @@ public class CorpsDescController extends BladeController {
 		if (ObjectUtils.isNotNull(corpsDesc.getCname())) {
 			String[] arr = corpsDesc.getCname().split(" ");
 			for (String item : arr) {
-				lambdaQueryWrapper.like(CorpsDesc::getCname, item);
 				lambdaQueryWrapper.and(i -> i.like(CorpsDesc::getCname, item)
 					.or().like(CorpsDesc::getCode, item)
 					.or().like(CorpsDesc::getShortName, item));

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -483,6 +483,24 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setBuyerName(order.get$buyerId());
 			order.setDocumenterName(order.get$documenterId());
 			baseMapper.updateById(order);
+			if (order.getTradeType().equals(OrderTypeEnum.EXPORT.getType())) {
+				Order order1 = baseMapper.selectById(order.getId());
+				if (order1.getOrderNo().equals(order.getOrderNo())){
+					List<Order> orderList = baseMapper.selectList(new LambdaQueryWrapper<Order>()
+						.eq(Order::getTenantId,AuthUtil.getTenantId())
+						.eq(Order::getIsDeleted,0)
+						.eq(Order::getBillType,"CG")
+						.eq(Order::getSrcOrderNo,order1.getOrderNo()));
+					if (!orderList.isEmpty()){
+						for (Order item : orderList){
+							item.setSrcOrderNo(order.getOrderNo());
+							item.setUpdateTime(new Date());
+							item.setUpdateUser(AuthUtil.getUserId());
+						}
+						this.updateBatchById(orderList);
+					}
+				}
+			}
 		}
 		// 保存订单费用明细
 		if (CollectionUtils.isNotEmpty(order.getOrderFeesList())) {
@@ -8076,7 +8094,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			String date1 = format.format(new Date());
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "管理员");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null,null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					StringBuilder openIds = new StringBuilder();
 					for (User datum : userList.getData()) {
@@ -8276,7 +8294,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null,null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息
@@ -8375,7 +8393,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		BigDecimal purchaseAmount = orderItemsList.stream().map(e -> e.getPurchaseAmount().multiply(e.getOrderQuantity())).reduce(BigDecimal.ZERO, BigDecimal::add);
 		// 配资比例
 		BigDecimal proportion = order.getFundingRatio().divide(BigDecimal.valueOf(100), NumberEnum.SIX.number, RoundingMode.DOWN);
-		BigDecimal daysInterestRate = order.getInterestRate().divide(BigDecimal.valueOf(100), NumberEnum.TWO.number, RoundingMode.DOWN).divide(BigDecimal.valueOf(365) ,NumberEnum.TEN.number, RoundingMode.DOWN);
+		BigDecimal daysInterestRate = order.getInterestRate().divide(BigDecimal.valueOf(100), NumberEnum.TWO.number, RoundingMode.DOWN).divide(BigDecimal.valueOf(365), NumberEnum.TEN.number, RoundingMode.DOWN);
 		BigDecimal interestAmount = purchaseAmount.multiply(proportion).multiply(daysInterestRate).multiply(BigDecimal.valueOf(order.getDays())).setScale(0, RoundingMode.HALF_UP);
 		order.setInterestAmount(interestAmount);
 
@@ -8935,7 +8953,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null,null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -9142,7 +9160,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null,null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息