fix: 积分包记录加结算状态和回调时间2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -1824,18 +1824,26 @@ public class ApiController {
 
 			scorePackageList = scorePage.getRecords();
 			if (CollectionUtils.isNotEmpty(scorePackageList)) {
-				Set<String> scorePackageIds = scorePackageList.stream().map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
+				Set<String> scorePackageIds = scorePackageList.stream()
+						.filter(output -> PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(output.getPackageType1()))
+						.map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
 				List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
 						.in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
-				Map<String, LocalDateTime> settelMap = new HashMap<>();
+				Map<String, WmScorePackageSettleNote> settelMap = new HashMap<>();
 				if (CollUtil.isNotEmpty(settleNotes)) {
 					settelMap = settleNotes.stream()
-							.filter(note -> StrUtil.isNotBlank(note.getPackageId()) && note.getNotifyTime() != null)
-							.collect(Collectors.toMap(WmScorePackageSettleNote::getPackageId, WmScorePackageSettleNote::getNotifyTime));
+							.collect(Collectors.toMap(WmScorePackageSettleNote::getPackageId, Function.identity()));
 				}
 //				Map<String, Object> map = new HashMap<>();
 				for (WmScorePackageApiOutput item : scorePackageList) {
-					item.setNotifyTime(settelMap.get(item.getId()));
+					if (PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(item.getPackageType1())) {
+						// 只处理积分包的情况
+						WmScorePackageSettleNote settleNote = settelMap.get(item.getId());
+						if (settleNote != null) {
+							item.setNotifyTime(settleNote.getNotifyTime());
+							item.setSettleNoteStatus(String.valueOf(settleNote.getSettleNoteStatus()));
+						}
+					}
 //					WmScorePackage item = wmScorePackageService.getById(status1.getPackageId());
 //					map.put("id", item.getId());
 //					map.put("packageName", item.getScorePackageName());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageApiOutput.java

@@ -57,9 +57,9 @@ public class WmScorePackageApiOutput {
 	private Integer waitApprovalTaskNum;
 
 	/**
-	 * 积分包状态
+	 * 结算状态
 	 */
-	private String scorePackageStatus;
+	private String settleNoteStatus;
 
 	/**
 	 * 回调时间

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageStatusMapper.xml

@@ -101,7 +101,7 @@
 	<select id="getReceivedPackageList" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageApiOutput">
 		SELECT s.enable_flag, s.id statusId, p.id, p.score_package_name, p.send_package_dept_id, s.task_add_flag,
 		p.create_time, p.package_type1, p.user_num, p.task_num, p.description, p.belong_date,
-		p.score, p.score_package_status, s.enable_type, s.status, s.task_num taskNum2 , s.create_time receiveTime, d.name packageEntName
+		p.score, s.enable_type, s.status, s.task_num taskNum2 , s.create_time receiveTime, d.name packageEntName
 		FROM
 		wm_score_package_status s, wm_score_package p , sys_dept d
 		WHERE s.package_id = p.id AND p.send_package_dept_id = d.dept_id