合并推送修改

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

@@ -3252,10 +3252,23 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			if ((changeDeptVo.getShebao() != null && !changeDeptVo.getShebao().isEmpty())
 					|| (changeDeptVo.getGongjijin() != null && !changeDeptVo.getGongjijin().isEmpty())) {
 				idSet = new HashSet<>();
+				TPaymentSocialPush socialPush;
 				if (changeDeptVo.getShebao() != null && !changeDeptVo.getShebao().isEmpty()) {
 					for (ChangeDeptDetailVo vo : changeDeptVo.getShebao()) {
-						idSet.add(vo.getId());
-						socialId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+						socialPush = pushMapper.selectById(vo.getId());
+						//根据明细id更新结算状态
+						if (null != socialPush) {
+							List<String> idStr = Common.initStrToList(socialPush.getPaymentIds().replaceAll("'",""),",");
+							if (null != idStr) {
+								idSet.addAll(idStr);
+								for (String s :idStr) {
+									socialId.append(s).append(CommonConstants.DUNHAO_STRING);
+								}
+							}
+						} else {
+							idSet.add(vo.getId());
+							socialId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+						}
 					}
 				}
 				if (changeDeptVo.getGongjijin() != null && !changeDeptVo.getGongjijin().isEmpty()) {