feat: 修改积分包没人承接的回收的逻辑

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -770,9 +770,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		for (WmScorePackage wmScorePackage1 : records) {
 
-			List<WmScorePackageSettleNote> list =settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
+			List<WmScorePackageSettleNote> list = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
 					.eq(WmScorePackageSettleNote::getPackageId, wmScorePackage1.getId()));
-			if (CollectionUtil.isNotEmpty(list)){
+			if (CollectionUtil.isNotEmpty(list)) {
 				wmScorePackage1.setNotifyDate(list.get(0).getNotifyTime());
 			}
 
@@ -799,7 +799,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 			if (wmScorePackage1.getYshtt() != null && wmScorePackage1.getYshtt() > 100) {
 				// if (wmScorePackage.getScore().equals(wmScorePackage.getShtg()) && !wmScorePackage.getScore().equals(wmScorePackage.getYsh()) ) {
-					wmScorePackage1.setYsh(wmScorePackage1.getScore());
+				wmScorePackage1.setYsh(wmScorePackage1.getScore());
 				// }
 				wmScorePackage1.setYshtt(100);
 			}
@@ -832,7 +832,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			// 设置中止状态
 			WmScorePackage.PackageStopStatus stopStatus;
 
-			if (wmScorePackage1.getRelationScoreId() == null){
+			if (wmScorePackage1.getRelationScoreId() == null) {
 				stopStatus = WmScorePackage.PackageStopStatus.ALL_IN;
 			} else {
 				List<WmTask> tasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
@@ -848,9 +848,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 						("3".equals(t.getTaskStatus()) && reportWaitingCheckStatus.contains(t.getReportOneApprovalStatus()))).count();
 
 				// 如果有发包方未审核的不能中止
-				if (drugNeedToCheckCount != 0L){
+				if (drugNeedToCheckCount != 0L) {
 					stopStatus = WmScorePackage.PackageStopStatus.NOTHING;
-				} else if (csoNeedToCheckCount != 0L){
+				} else if (csoNeedToCheckCount != 0L) {
 					// 如果有cso未审核的提示信息
 					stopStatus = WmScorePackage.PackageStopStatus.REMAIN_MSG;
 				} else {
@@ -940,7 +940,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					List<WmTask> taskList1 = wmTaskMapper.selectByTask(wmTask1);
 					Integer res = 0;
 					boolean all = false;
-					if ( CollUtil.isEmpty(taskList1)) {
+					if (CollUtil.isEmpty(taskList1)) {
 						if (wmScorePackage.getPackageType1().equals("1") || wmScorePackage.getPackageType1().equals("5")) {//定额
 							//这个用户还没有做任务时，积分值设为0
 							wmScorePackageStatus.setUserScore("0");
@@ -957,7 +957,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					} else {
 						if (wmScorePackage.getPackageType1().equals("1") || wmScorePackage.getPackageType1().equals("5")) {//定额
 							int sum;
-							if (wmScorePackage.getRelationScoreId() == null){
+							if (wmScorePackage.getRelationScoreId() == null) {
 								sum = taskList1.stream().mapToInt(WmTask::getScore).sum();
 								res = Integer.parseInt(wmScorePackageStatus.getUserScore()) - sum;
 								if (res > 0) {//个人积分包值大于任务积分值
@@ -970,11 +970,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 												.equals(task.getReportDrugApprovalOpinion()))
 										.mapToInt(WmTask::getScore)
 										.sum();
-								if (passed == 0){
+								if (passed == 0) {
 									wmScorePackage.setScorePackageStatus("6");//已终止
 									wmScorePackage.setEnableFlag("1");
-									taskList1.forEach(task -> {task.setEnableFlag("1");
-										if(StringUtils.equalsAny(task.getReportOneApprovalStatus(),"0","1")){
+									taskList1.forEach(task -> {
+										task.setEnableFlag("1");
+										if (StringUtils.equalsAny(task.getReportOneApprovalStatus(), "0", "1")) {
 											task.setTaskStatus("4");
 										}
 										task.setReportDrugApprovalStatus(REPORT_STATUS_END.getType());
@@ -984,9 +985,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 									all = true;
 								}
 
-								if (!all){
+								if (!all) {
 									taskList1.forEach(task -> {
-										if(StringUtils.equalsAny(task.getReportOneApprovalStatus(),"0","1")){
+										if (StringUtils.equalsAny(task.getReportOneApprovalStatus(), "0", "1")) {
 											task.setTaskStatus("4");
 										}
 										wmTaskMapper.updateById(task);
@@ -996,7 +997,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 								res = sum = passed;
 								if (res > 0) {//个人积分包值大于任务积分值
 									wmScorePackageStatus.setUserScore(sum + "");
-									resSum += (wmScorePackage.getScore() -  res);
+									resSum += (wmScorePackage.getScore() - res);
 								} else {
 									resSum = wmScorePackage.getScore();
 								}
@@ -1018,7 +1019,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					}
 
 					wmScorePackageStatus.setTaskAddFlag("0");
-					if (all){
+					if (all) {
 						wmScorePackageStatus.setEnableType("1");
 						wmScorePackageStatus.setEnableType("1");
 					} else {
@@ -1042,6 +1043,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				wmScorePackage.setTaskNum(0);
 				wmScorePackage.setPackageFinishStatus("1");//已完成
 				wmScorePackage.setScorePackageStatus("4");//已完成待结算
+				//积分包承接对象为0的时候，返回积分包积分且积分包状态改为已终止
+				if (StringUtil.isNotEmpty(wmScorePackage.getRelationScoreId())) {
+					resSum = wmScorePackage.getScore();
+					wmScorePackage.setScorePackageStatus("6");//积分包已终止
+				}
 			}
 			wmScorePackage.setIsReceive("1");//不允许接单
 			wmScorePackage.setTaskAddFlag("0");//不允许新增任务
@@ -1374,8 +1380,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 				if (ouPut.getSettleAmount() == null) {
 					BigDecimal tmp = new BigDecimal("0");
-					for (WmScorePackageSettleNote note : packageSettleNoteList){
-						if (null != note.getSettleAmount()){
+					for (WmScorePackageSettleNote note : packageSettleNoteList) {
+						if (null != note.getSettleAmount()) {
 							tmp = tmp.add(note.getSettleAmount());
 						}
 					}
@@ -1426,8 +1432,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				}
 				if (ouPut.getSettleAmount() == null) {
 					BigDecimal tmp = new BigDecimal("0");
-					for (WmScorePackageSettleNote note : packageSettleNoteList){
-						if (null != note.getSettleAmount()){
+					for (WmScorePackageSettleNote note : packageSettleNoteList) {
+						if (null != note.getSettleAmount()) {
 							tmp = tmp.add(note.getSettleAmount());
 						}
 					}