Merge branch 'feat-20221009-finishtask' into temp-pre

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

@@ -569,16 +569,17 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 
 				if (Objects.equals(settleObj.getInt("code"), CommonConstants.SUCCESS)) {
+					JSONObject dataJsonObj = settleObj.getJSONObject("data");
 					log.info("政企之星结算提交成功： {}", settleObj.getStr("data"));
 					//streamId 获取不到
-					if (StringUtils.isEmpty(settleObj.getStr("data"))) {
-						log.warn("政企之星结算提交成功 orderNo 获取不到： {}", settleObj.getStr("data"));
+					if (dataJsonObj == null) {
+						log.warn("政企之星结算提交成功 data 获取不到： {}", note.getSettleNo());
 						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					}
 					note.setUpdateTime(LocalDateTime.now());
 					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 					// 新增字段streamId
-					note.setStreamId(settleObj.getStr("data"));
+					note.setStreamId(dataJsonObj.getStr("requestId"));
 					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 				} else {
 					log.warn("政企之星结算失败： {}", note.getSettleNo());

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

@@ -885,18 +885,21 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				JSONObject settelObj = JSONUtil.parseObj(result.getBody());
 
 				if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
+					JSONObject dataJsonObj = settelObj.getJSONObject("data");
+
 					noteIds.forEach(id -> {
 						log.info("政企之星结算结算提交成功");
-						//streamId 获取不到
-						if (StringUtils.isEmpty(settelObj.getStr("data"))) {
-							log.info("政企之星结算提交成功 streamId 获取不到");
+						// data获取不到
+						if (dataJsonObj == null) {
+							log.info("政企之星提交成功 data 获取不到");
+							return;
 						}
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						note.setId(id);
 						note.setUpdateTime(LocalDateTime.now());
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
-						note.setStreamId(settelObj.getStr("data"));
+						note.setStreamId(dataJsonObj.getStr("requestId"));
 						this.baseMapper.updateById(note);
 					});