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

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

@@ -1589,7 +1589,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TIncomeDetail::getEmpIdcard, library.getEmpIdcard())
 				.eq(TIncomeDetail::getDeptId, library.getSettleDomainId())
 				.eq(TIncomeDetail::getSourceType, CommonConstants.ONE_STRING)
-				.eq(TIncomeDetail::getPayMonth, library.getSocialPayMonth()));
+				.eq(TIncomeDetail::getPayMonth, library.getSocialPayMonth())
+				.eq(TIncomeDetail::getMrSettleType, CommonConstants.ONE_STRING));
 		if (Common.isNotNull(updateList)) {
 			for (TIncomeDetail upd : updateList) {
 				TIncomeDetail detail = new TIncomeDetail();
@@ -1627,7 +1628,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 				.eq(TIncomeDetail::getEmpIdcard,library.getEmpIdcard())
 				.eq(TIncomeDetail::getDeptId,library.getSettleDomainId())
 				.eq(TIncomeDetail::getSourceType,CommonConstants.TWO_STRING)
-				.eq(TIncomeDetail::getPayMonth,library.getProvidentPayMonth()));
+				.eq(TIncomeDetail::getPayMonth,library.getProvidentPayMonth())
+				.eq(TIncomeDetail::getMrSettleType, CommonConstants.ONE_STRING));
 		if (Common.isNotNull(updateList)) {
 			for (TIncomeDetail upd : updateList) {
 				TIncomeDetail detail = new TIncomeDetail();

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

@@ -296,6 +296,9 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 			detail.setEmpIdcard(tIncomeDetail.getEmpIdcard());
 			detail.setDeptId(tIncomeDetail.getDeptId());
 			List<TIncomeDetail> detailList = tIncomeDetailService.getTIncomeDetailList(detail);
+			tIncomeDetail.setCreateTime(new Date());
+			tIncomeDetail.setDataCreateMonth(DateUtil.addMonth(0));
+			tIncomeDetailService.save(tIncomeDetail);
 			// 不存在，直接新增
 			if (incomeList == null || incomeList.isEmpty()) {
 				BeanUtil.copyProperties(tIncomeDetail, income);
@@ -307,8 +310,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 					income.setSendStatus(CommonConstants.ONE_STRING);
 					income.setSendMonth(DateUtil.addMonth(0));
 					income.setEkpId(sendBack);
-					income.setId(CommonConstants.NULL);
-					tIncomeDetailService.save(tIncomeDetail);
 				} else {
 					if (map.get(sendBack) > 0) {
 						int i = map.get(sendBack) + 1;
@@ -333,6 +334,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 						idMap.put(sendBack,income.getId());
 					}
 				}
+				this.updateById(income);
 			} else {
 				// 判断，比例，直接加
 				if (CommonConstants.ONE_STRING.equals(tIncomeDetail.getFeeMode())) {
@@ -345,7 +347,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 						income.setSendStatus(CommonConstants.ONE_STRING);
 						income.setSendMonth(DateUtil.addMonth(0));
 						income.setEkpId(sendBack);
-						tIncomeDetailService.save(tIncomeDetail);
 					} else {
 						if (map.get(sendBack) > 0) {
 							int i = map.get(sendBack) + 1;
@@ -370,6 +371,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 							idMap.put(sendBack,income.getId());
 						}
 					}
+					this.updateById(income);
 				} else {
 					Map<String, Integer> numMap = new HashMap<>();
 					Map<String, Integer> incomeMap = new HashMap<>();
@@ -421,7 +423,40 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 						if (CommonConstants.ZERO_STRING.equals(tIncomeDetail.getRedData())) {
 							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) {
-								this.saveIncome(tIncomeDetail);
+								BeanUtil.copyProperties(tIncomeDetail, income);
+								income.setSendStatus(CommonConstants.ZERO_STRING);
+								this.save(income);
+								String sendBack = this.getSendBack(income);
+								income.setSendTime(new Date());
+								if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
+									income.setSendStatus(CommonConstants.ONE_STRING);
+									income.setSendMonth(DateUtil.addMonth(0));
+									income.setEkpId(sendBack);
+								} else {
+									if (map.get(sendBack) > 0) {
+										int i = map.get(sendBack) + 1;
+										map.put(sendBack,i);
+										idMap.put(sendBack,income.getId());
+										//单个异常超过十次，保存异常内容
+										if (i >= 10) {
+											for (String key: map.keySet()) {
+												TSendEkpError error = new TSendEkpError();
+												error.setCreateTime(new Date());
+												error.setCreateDay(DateUtil.getThisDay());
+												error.setType(CommonConstants.FIVE_STRING);
+												error.setLinkId(income.getId());
+												error.setTitle(key);
+												error.setNums(map.get(key));
+												tSendEkpErrorService.save(error);
+											}
+											break;
+										}
+									} else {
+										map.put(sendBack,1);
+										idMap.put(sendBack,income.getId());
+									}
+								}
+								this.updateById(income);
 							}
 						} else {
 							// 红冲判断：当本类型是最大值，才可以红冲
@@ -435,7 +470,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 									income.setSendStatus(CommonConstants.ONE_STRING);
 									income.setSendMonth(DateUtil.addMonth(0));
 									income.setEkpId(sendBack);
-									tIncomeDetailService.save(tIncomeDetail);
 								} else {
 									if (map.get(sendBack) > 0) {
 										int i = map.get(sendBack) + 1;
@@ -460,6 +494,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 										idMap.put(sendBack,income.getId());
 									}
 								}
+								this.updateById(income);
 							}
 						}
 					} else if (CommonConstants.THREE_STRING.equals(tIncomeDetail.getSourceType())) {
@@ -477,7 +512,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 										income.setSendStatus(CommonConstants.ONE_STRING);
 										income.setSendMonth(DateUtil.addMonth(0));
 										income.setEkpId(sendBack);
-										tIncomeDetailService.save(tIncomeDetail);
 									} else {
 										if (map.get(sendBack) > 0) {
 											int i = map.get(sendBack) + 1;
@@ -502,6 +536,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 											idMap.put(sendBack,income.getId());
 										}
 									}
+									this.updateById(income);
 								}
 							} else {
 								if (this.redDateJudge(tIncomeDetail, numMap)) {
@@ -514,7 +549,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 										income.setSendStatus(CommonConstants.ONE_STRING);
 										income.setSendMonth(DateUtil.addMonth(0));
 										income.setEkpId(sendBack);
-										tIncomeDetailService.save(tIncomeDetail);
 									} else {
 										if (map.get(sendBack) > 0) {
 											int i = map.get(sendBack) + 1;
@@ -539,6 +573,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 											idMap.put(sendBack,income.getId());
 										}
 									}
+									this.updateById(income);
 								}
 							}
 						} else {
@@ -559,7 +594,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 									income.setSendStatus(CommonConstants.ONE_STRING);
 									income.setSendMonth(DateUtil.addMonth(0));
 									income.setEkpId(sendBack);
-									tIncomeDetailService.save(tIncomeDetail);
 								} else {
 									if (map.get(sendBack) > 0) {
 										int i = map.get(sendBack) + 1;
@@ -584,6 +618,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 										idMap.put(sendBack,income.getId());
 									}
 								}
+								this.updateById(income);
 							}
 						} else {
 							// 3金额-人次

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

@@ -2791,6 +2791,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				BigDecimal sumMoney = BigDecimal.ZERO;
 				for (TIncomeDetail income : exitIncome) {
 					sumMoney = BigDecimalUtils.safeAdd(income.getMoney(), sumMoney);
+					if (paymentInfo.getId().equals(income.getSourceId())) {
+						exitFlag = true;
+					}
+				}
+				if (exitFlag) {
+					continue;
 				}
 				if (sumMoney.compareTo(BigDecimal.ZERO) == CommonConstants.ONE_INT) {
 					exitFlag = true;