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

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProject.java

@@ -116,6 +116,8 @@ public class ServiceProject  implements Serializable {
 
 	private BigDecimal matMoney;
 
+	private BigDecimal costReturn;
+
 	//客户联系人名称
 	@TableField(exist = false)
 	private String corpNames;

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProjectItem.java

@@ -128,5 +128,11 @@ public class ServiceProjectItem extends TenantEntity implements Serializable {
 
 	private BigDecimal matMoney;
 
+	private BigDecimal costReturn;
+
+	private Integer projectType;
+
+	private BigDecimal grossIncome;
+
 
 }

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -171,7 +171,7 @@ public class ProjectController {
 
 		if(!CollectionUtils.isEmpty(serviceProjectItems))
 		{
-			String[] str = new String[]{"录入","已请核","审核中","审核通过","正在结算","结算完成"};
+			String[] str = new String[]{"录入","已请核","审核中","审核通过","正在结算","结算完成","追加","退费"};
 			serviceProjectItems.forEach(e->{
 
 				e.setStrStatus(str[e.getStatus()]);
@@ -296,7 +296,10 @@ public class ProjectController {
 				  {
 					  e.setUserName(userR.getData().getRealName());
 				  }*/
+                  //毛收入
+				  e.setGrossIncome((e.getServiceCharge().add(e.getMatMoney())).subtract(e.getCostReturn()));
 			  });
+
 		  }
 		  return R.data(iPage);
 	}

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -211,9 +211,16 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper=new LambdaQueryWrapper();
 		itemLambdaQueryWrapper.eq(ServiceProjectItem::getPId,serviceProject.getId());
 		List<ServiceProjectItem> serviceProjectItems = serviceProjectItemMapper.selectList(itemLambdaQueryWrapper);
-
+        //检查金额是否超额
 		checkMoney(serviceProject.getId(),serviceProjectItems);
-
+        //绑定主表对应的额度
+		BigDecimal totalServiceCharge = serviceProjectItems.stream().filter(e -> e.getServiceCharge() != null).map(ServiceProjectItem::getServiceCharge).reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal totalMatMoney = serviceProjectItems.stream().filter(e -> e.getMatMoney() != null).map(ServiceProjectItem::getMatMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal totalCostReturn = serviceProjectItems.stream().filter(e -> e.getCostReturn() != null).map(ServiceProjectItem::getCostReturn).reduce(BigDecimal.ZERO, BigDecimal::add);
+		serviceProject.setServiceCharge(totalServiceCharge);
+		serviceProject.setMatMoney(totalMatMoney);
+		serviceProject.setCostReturn(totalCostReturn);
+		serviceProjectMapper.updateById(serviceProject);
 	}
 
 	@Override