Merge remote-tracking branch 'origin/fxj-dev' into fxj-dev

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java

@@ -342,30 +342,35 @@ public class DoJointInsuranceTask {
 		List<EkpSocialViewVo> viewVo;
 		try {
 			//薪资结算状态同步暂时解决方案为定时任务去更新
-			TUpdateStatusError error = new TUpdateStatusError();
+			/*TUpdateStatusError error = new TUpdateStatusError();
 			error.setSettleNo(vo.getSettleNo());
 			error.setStatus(CommonConstants.ZERO_INT);
-			error.setTitle("薪资结算状态同步失败");
+			error.setTitle("薪资结算状态同步成功");
 			error.setTypeFlag(CommonConstants.FIVE_STRING);
 			error.setCreateTime(DateUtil.getCurrentDateTime());
 			error.setSettleType(vo.getPayFlag());
+			updateStatusErrorMapper.insert(error);*/
+			TUpdateStatusError error = new TUpdateStatusError();
+			error.setSettleNo(vo.getSettleNo());
+			error.setCreateTime(DateUtil.getCurrentDateTime());
+			error.setSettleType(vo.getPayFlag());
+			error.setTypeFlag(CommonConstants.FIVE_STRING);
+			//根据结算单号获取明细id和结算状态
+			viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
+			if (!viewVo.isEmpty()) {
+				viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
+				R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
+				if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
+
+					error.setStatus(CommonConstants.ZERO_INT);
+					error.setTitle("薪资结算状态同步失败");
 					updateStatusErrorMapper.insert(error);
-//			//根据结算单号获取明细id和结算状态
-//			viewVo = ekpSettleService.selectSalarylViewBySettleNo(vo.getSettleNo(), vo.getPayFlag());
-//			if (!viewVo.isEmpty()) {
-//				viewVo.forEach(e -> e.setPayFlag(vo.getPayFlag()));
-//				R<Boolean> flag = salaryDaprUtil.updateSalarySettleStatus(viewVo);
-//				if (Common.isEmpty(flag) || Boolean.TRUE.equals(!flag.getData())) {
-//					TUpdateStatusError error = new TUpdateStatusError();
-//					error.setSettleNo(vo.getSettleNo());
-//					error.setStatus(CommonConstants.ZERO_INT);
-//					error.setTitle("薪资结算状态同步失败");
-//					error.setTypeFlag(CommonConstants.FIVE_STRING);
-//					error.setCreateTime(DateUtil.getCurrentDateTime());
-//					error.setSettleType(vo.getPayFlag());
-//					updateStatusErrorMapper.insert(error);
-//				}
-//			}
+				}else {
+					error.setStatus(CommonConstants.ZERO_INT);
+					error.setTitle("薪资结算状态同步成功");
+					updateStatusErrorMapper.insert(error);
+				}
+			}
 		} catch (Exception e) {
 			TUpdateStatusError error = new TUpdateStatusError();
 			error.setSettleNo(vo.getSettleNo());

yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml

@@ -6,8 +6,8 @@ spring:
     activate:
       on-profile: test
   redis:
-    host: 127.0.0.1
-    port: 6379
+    host: 192.168.1.65
+    port: 22379
     password: '@yf_2017'
   datasource:
     insurances: