优化修改

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

@@ -40,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSendEkpError;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
@@ -84,6 +85,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 	@Autowired
 	private DoJointSocialTask doJointSocialTask;
 
+	@Autowired
+	private TPaymentInfoMapper tPaymentInfoMapper;
+
 	/**
 	 * 收入明细表简单分页查询
 	 *
@@ -668,21 +672,13 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 					if (CommonConstants.ZERO_STRING.equals(tIncomeDetail.getRedData())) {
 						if (insureMap.get(tIncomeDetail.getDataCreateMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) == null
 								|| insureMap.get(tIncomeDetail.getDataCreateMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) <= CommonConstants.ZERO_INT) {
-							if (Common.isNotNull(paymentInfo)) {
-								return this.savePaymentIncome(tIncomeDetail,paymentInfo);
-							} else {
 							return this.saveIncome(tIncomeDetail,synFlag);
 						}
-						}
 					} else {
 						if (this.redDateJudge(tIncomeDetail, numMap)) {
-							if (Common.isNotNull(paymentInfo)) {
-								return this.savePaymentIncome(tIncomeDetail,paymentInfo);
-							} else {
 							return this.saveIncome(tIncomeDetail,synFlag);
 						}
 					}
-					}
 				} else {
 					// 各个模式累加逻辑：
 					return this.judgeMixModel(tIncomeDetail, numMap, incomeMap,synFlag);
@@ -692,12 +688,8 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				if (CommonConstants.TWO_STRING.equals(tIncomeDetail.getFeeMode())) {
 					if (incomeMap.get(tIncomeDetail.getPayMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) == null
 							|| incomeMap.get(tIncomeDetail.getPayMonth() + CommonConstants.DOWN_LINE_STRING + tIncomeDetail.getFeeType()) <= CommonConstants.ZERO_INT) {
-						if (Common.isNotNull(paymentInfo)) {
-							return this.savePaymentIncome(tIncomeDetail,paymentInfo);
-						} else {
 						return this.saveIncome(tIncomeDetail,synFlag);
 					}
-					}
 				} else {
 					// 3金额-人次
 					// 各个模式累加逻辑：
@@ -705,6 +697,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 				}
 			}
 		}
+		if (Common.isNotNull(paymentInfo)) {
+			tPaymentInfoMapper.updateBySocialIncomeFlag(paymentInfo.getId());
+		}
 		return true;
 	}
 

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

@@ -45,8 +45,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
-import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
-import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushFundParam;
 import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
@@ -60,7 +58,6 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
 import com.yifu.cloud.plus.v1.yifu.social.service.TEkpChangeDeptLogService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
-import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
 import com.yifu.cloud.plus.v1.yifu.social.util.DoJointSocialTask;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.extern.log4j.Log4j2;
@@ -113,12 +110,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private SysHouseHoldInfoMapper sysHouseHoldInfoMapper;
 
-	@Autowired
-	private EkpFundUtil ekpFundUtil;
-
-	@Autowired
-	private EkpSocialUtil ekpSocialUtil;
-
 	@Autowired
 	private TIncomeDetailMapper detailMapper;
 
@@ -128,9 +119,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private ArchivesDaprUtil archivesDaprUtil;
 
-	@Autowired
-	private TSendEkpErrorService tSendEkpErrorService;
-
 	@Autowired
 	private TForecastLibraryMapper tForecastLibraryMapper;
 
@@ -3192,6 +3180,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					}
 				}
 				if (exitFlag) {
+					baseMapper.updateBySocialIncomeFlag(paymentInfo.getId());
 					continue;
 				}
 				if (sumMoney.compareTo(BigDecimal.ZERO) > 0) {