2022年8月8日13点43分

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

@@ -117,7 +117,7 @@ public class BasicCorpsProfitChangeController extends BladeController {
 		CorpsDesc corpsDesc = corpsDescService.getOne(lambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(corpsDesc)) {
 			//总返利
-			BigDecimal profitReturn = corpsDesc.getProfitReturn().subtract(basicCorpsProfitChange.getChangeProfitReturn());
+			BigDecimal profitReturn = corpsDesc.getProfitReturn().add(basicCorpsProfitChange.getChangeProfitReturn());
 			//可用返利
 			BigDecimal surplusProfit = profitReturn.subtract(corpsDesc.getUsedProfit());
 			corpsDesc.setProfitReturn(profitReturn);
@@ -126,8 +126,8 @@ public class BasicCorpsProfitChangeController extends BladeController {
 		} else {
 			R.fail("客户不存在");
 		}
-		basicCorpsProfitChange.setUpdateTime(LocalDateTime.now());
-		basicCorpsProfitChange.setUpdateUser(AuthUtil.getUserId());
+		basicCorpsProfitChange.setCreateTime(new Date());
+		basicCorpsProfitChange.setCreateUser(AuthUtil.getUserId());
 		return R.status(basicCorpsProfitChangeService.saveOrUpdate(basicCorpsProfitChange));
 	}
 

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

@@ -56,6 +56,9 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		List<ServiceProjectFiles> filesList = serviceProject.getFilesList();
 		//新增操作,不用考虑子项问题,子项必然是新增
 		if (serviceProject.getId() == null) {
+			serviceProject.setDebitAmount(serviceProject.getDebitAmount() == null?new BigDecimal(0):serviceProject.getAdvanceAmount());
+			serviceProject.setSettlmentAmount(serviceProject.getSettlmentAmount() == null?new BigDecimal(0):serviceProject.getSettlmentAmount());
+			serviceProject.setBalanceAmount(serviceProject.getBalanceAmount() == null?new BigDecimal(0):serviceProject.getBalanceAmount());
 			BigDecimal debitAmount = serviceProject.getDebitAmount();//合同总金额
 			BigDecimal settlmentAmount = serviceProject.getSettlmentAmount();//已收金额
 			BigDecimal balanceAmount = serviceProject.getBalanceAmount();//未收金额

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/LeadsServiceImpl.java

@@ -270,6 +270,7 @@ public class LeadsServiceImpl extends ServiceImpl<LeadsMapper, Leads> implements
 	 * @return
 	 */
 	@Override
+	@Transactional
 	public Object leadsSubmit(Leads leads) {
 
 		// 判断该客户是否存在  如果存在直接返回，不存在怎么新增客户并将新客户id添加到销售机会中