明细接口改造

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -309,12 +309,14 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		tIncomeDetail.setCreateTime(new Date());
 		tIncomeDetail.setDataCreateMonth(DateUtil.addMonth(0));
 		tIncomeDetailService.save(tIncomeDetail);
+		synchronized (this) {
 			// 不存在，直接新增
 			if (incomeList == null || incomeList.isEmpty()) {
-			return this.savePaymentIncome(tIncomeDetail,paymentId);
+				return this.savePaymentIncome(tIncomeDetail, paymentId);
 			} else {
 				// 核心判断
-			return this.copyCore(tIncomeDetail, incomeList, detailList,paymentId,true);
+				return this.copyCore(tIncomeDetail, incomeList, detailList, paymentId, true);
+			}
 		}
 	}
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -3208,7 +3208,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
 			for (int j = 0; j < i; j++) {
 				sumList = baseMapper.getTPaymentSocialIncomeInfo(searchVo, user.getId());
-				synchronized (this) {
 				if (Common.isNotNull(sumList)) {
 					//生成收入
 					createIncomeInfo(sumList, CommonConstants.ONE_STRING, mapSelectVo, redisKey);
@@ -3216,7 +3215,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			}
 		}
 	}
-	}
 
 	public void createPaymentFundIncomeReal(YifuUser user, TPaymentInfoSearchVo searchVo,
 											Map<String, TSettleDomainSelectVo> mapSelectVo, String redisKey) {
@@ -3227,7 +3225,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			int i = (int) Math.ceil((double) count / CommonConstants.TEN_THOUSAND_INT);
 			for (int j = 0; j < i; j++) {
 				sumList = baseMapper.getTPaymentFundIncomeInfo(searchVo, user.getId());
-				synchronized (this) {
 				if (Common.isNotNull(sumList)) {
 					//生成公积金收入
 					createIncomeInfo(sumList, CommonConstants.TWO_STRING, mapSelectVo, redisKey);
@@ -3235,7 +3232,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			}
 		}
 	}
-	}
 
 	@Override
 	public TPaymentVo getPaymentSocialAndFound(TPaymentInfo info) {

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java

@@ -284,7 +284,7 @@ public class DoJointSocialTask {
 			if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
 				sendBack = info.getData();
 			}
-		} else {
+		} else if(CommonConstants.TWO_STRING.equals(income.getFeeType())) {
 			EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk();
 			this.copyToEkpRisk(income, sendParam);
 			R<String> info = ekpDaprUtil.pushRiskInfoToEkp(sendParam);