明细接口改造

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpFundInfoServiceImpl.java

@@ -31,6 +31,8 @@ import java.util.stream.Collectors;
 @Service
 public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFundInfo> implements EkpFundInfoService {
 
+	private static final Random rand = new Random();
+
 	/**
 	 //@Description: 公积金明细推送至ekp
 	 //@Author: huyc
@@ -268,7 +270,7 @@ public class EkpFundInfoServiceImpl extends ServiceImpl<EkpFundInfoMapper, EkpFu
 		socialInfo.setFd_3add9edfbc6f7e("未结算");
 		//单号
 		socialInfo.setFd_3adfe95c169c48("GJJ" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATE_PATTERN)
-				+ socialParam.getFd_3b0afbaf10df2c().substring(socialParam.getFd_3b0afbaf10df2c().length() -4 ));
+				+ rand.nextInt(999999));
 	}
 
 	/**

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpManagerInfoServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.Optional;
+import java.util.Random;
 
 /**
  * @author huyc
@@ -24,6 +25,8 @@ import java.util.Optional;
 @Service
 public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper, EkpManagerInfo> implements EkpManagerInfoService {
 
+	private static final Random rand = new Random();
+
 	/**
 	 * //@Description: 工资明细推送至ekp
 	 * //@Author: huyc
@@ -110,6 +113,6 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper,
 		managerInfo.setFd_3adfefaaef583e("未收");
 		//单号
 		managerInfo.setFd_3adfef7f5d2b52("GLF" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATE_PATTERN)
-				+ incomeParam.getFd_3b13dae9bd70f8().substring(incomeParam.getFd_3b13dae9bd70f8().length() -4 ));
+				+ rand.nextInt(999999));
 	}
 }

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java

@@ -30,6 +30,8 @@ import java.util.stream.Collectors;
 @Service
 public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, EkpSalaryInfo> implements EkpSalaryInfoService {
 
+	private static final Random rand = new Random();
+
 	/**
 	//@Description: 工资明细推送至ekp
 	//@Author: huyc
@@ -245,7 +247,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
 		salaryInfo.setFd_3adfeec7ccdd1c(CommonConstants.EMPTY_STRING.equals(salaryParam.getFd_3adfee203f86b2()) ? null : Double.parseDouble(salaryParam.getFd_3adfee203f86b2()));
 		//单号
 		salaryInfo.setFd_3adfedfa4410aa("GZ" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATE_PATTERN)
-				+ salaryParam.getFd_3b10af838eab5c().substring(salaryParam.getFd_3b10af838eab5c().length() -4 ));
+				+ rand.nextInt(999999));
 	}
 
 	/**

yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java

@@ -33,6 +33,7 @@ import java.util.stream.Collectors;
 @Service
 public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, EkpSocialInfo> implements EkpSocialInfoService {
 
+	private static final Random rand = new Random();
 	/**
 	//@Description: 社保明细推送至ekp
 	//@Author: huyc
@@ -346,7 +347,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
 		socialInfo.setFd_3add9eed23894a("未付");
 		//单号
 		socialInfo.setFd_3adfe95c169c48("SB" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATE_PATTERN)
-				+ socialParam.getFd_3b0afbe1f94a08().substring(socialParam.getFd_3b0afbe1f94a08().length() -4 ));
+				+ rand.nextInt(999999));
 	}
 
 

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

@@ -675,12 +675,13 @@ public class DoJointSocialTask {
 				socialParam.setYgFlag(CommonConstants.ZERO_STRING);
 				insertList.add(socialParam);
 			}
+			if (!insertList.isEmpty()) {
 				R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList);
 				if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
 					EkpSocialPushInfoVo vo = info.getData();
 					String idList = vo.getPaymentIdSum();
 					if (Common.isNotNull(idList)) {
-					paymentInfoMapper.updateBySocialPaymentList(idList.substring(0,idList.length()-1));
+						paymentInfoMapper.updateBySocialPaymentList(idList.substring(0, idList.length() - 1));
 					}
 					List<TPaymentSocialPush> list = vo.getUnPushInfo();
 					if (!list.isEmpty()) {
@@ -697,6 +698,7 @@ public class DoJointSocialTask {
 					error.setNums(CommonConstants.ONE_INT);
 					tSendEkpErrorService.save(error);
 				}
+			}
 		} catch (Exception e) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());
@@ -845,6 +847,7 @@ public class DoJointSocialTask {
 				}
 				paramList.add(fundParam);
 			}
+			if (!paramList.isEmpty()) {
 				R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushFundInfoToEkp(paramList);
 				if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
 					EkpSocialPushInfoVo vo = info.getData();
@@ -862,6 +865,7 @@ public class DoJointSocialTask {
 					error.setNums(CommonConstants.ONE_INT);
 					tSendEkpErrorService.save(error);
 				}
+			}
 		} catch (Exception e) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());
@@ -1139,6 +1143,7 @@ public class DoJointSocialTask {
 				socialParam.setFd_3b5cc58d1a70fe(adress.toString());
 				insertList.add(socialParam);
 			}
+			if (!insertList.isEmpty()) {
 				R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList);
 				if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
 					EkpSocialPushInfoVo vo = info.getData();
@@ -1155,6 +1160,7 @@ public class DoJointSocialTask {
 					error.setNums(CommonConstants.ONE_INT);
 					tSendEkpErrorService.save(error);
 				}
+			}
 		} catch (Exception e) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());
@@ -1323,6 +1329,7 @@ public class DoJointSocialTask {
 				fundParam.setFd_3b5cc487bb46fa(adress.toString());
 				insertList.add(fundParam);
 			}
+			if (!insertList.isEmpty()) {
 				R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushFundInfoToEkp(insertList);
 				if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
 					EkpSocialPushInfoVo vo = info.getData();
@@ -1339,6 +1346,7 @@ public class DoJointSocialTask {
 					error.setNums(CommonConstants.ONE_INT);
 					tSendEkpErrorService.save(error);
 				}
+			}
 		} catch (Exception e) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());