Merge branch 'feat-20221205-zhengqizhixingjiangxi'

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

@@ -34,6 +34,7 @@ import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
 import com.qunzhixinxi.hnqz.admin.entity.MedicalEquipment;
 import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
+import com.qunzhixinxi.hnqz.admin.entity.SysUserExtRecord;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
@@ -777,6 +778,15 @@ public class ApiController {
 
 			// 查询是否已认证过E证通
 			mapOne.put("existEidResult", sysUserExtRecordService.existUserExtRecord());
+			SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
+					.eq(SysUserExtRecord::getUserId, sysU.getUserId())
+					.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val()));
+			if (userExtRecord != null) {
+				Map<String, Object> eidResultMap = new HashMap<>();
+				eidResultMap.put("idCardFrontUrl", userExtRecord.getIdCardFrontUrl());
+				eidResultMap.put("idCardBackUrl", userExtRecord.getIdCardBackUrl());
+				mapOne.put("eidResult", eidResultMap);
+			}
 
 			// 获取发起认证的令牌
 			String randomStr;

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

@@ -160,13 +160,13 @@ public class SysUserSignCertController {
 	}
 
 	/**
-	 * 人身验证
+	 * 身份证图片保存
 	 *
 	 * @param userSignCertDTO
 	 * @return
 	 */
 	@Deprecated
-	@SysLog("人身验证")
+	@SysLog("身份证图片保存")
 	@PostMapping("/personal-identity-verification")
 	public R<?> personalIdentityVerification(@RequestBody UserSignCertDTO userSignCertDTO) {
 		if (userSignCertDTO.getUserId() == null) {
@@ -175,9 +175,8 @@ public class SysUserSignCertController {
 		if (userSignCertDTO.getSubjectLocation() == null) {
 			return R.failed("税源地不能为空");
 		}
-		if (!StrUtil.isAllNotBlank(userSignCertDTO.getIdCardFrontUrl(), userSignCertDTO.getIdCardBackUrl(),
-				userSignCertDTO.getCertVideo1Url(), userSignCertDTO.getCertVideo2Url())) {
-			return R.failed("身份证或视频信息不能为空");
+		if (!StrUtil.isAllNotBlank(userSignCertDTO.getIdCardFrontUrl(), userSignCertDTO.getIdCardBackUrl())) {
+			return R.failed("身份证图片信息不能为空");
 		}
 
 		sysUserSignCertService.personalIdentityVerification(userSignCertDTO);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/GigTypeEnum.java

@@ -21,8 +21,7 @@ public enum GigTypeEnum {
 	OLADING(2, "钉灵工", "钉灵工-海南飞亿", OladingCertStatus.class),
 	YEE(3, "易联数科", "易联数科", YeeCertStatus.class),
 	ZHENG_QI_ZHI_XING(4, "正启之星", "正启之星", ZhengQiZhiXingCertStatus.class),
-
-	LANG_CHAO(5, "浪潮", "浪潮", null);// TODO
+	LANG_CHAO(5, "浪潮", "浪潮", LangChaoCertStatus.class);
 
 	@EnumValue
 	private int code;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java

@@ -33,7 +33,10 @@ public enum SubjectLocation {
 	ZHENG_QI_ZHI_XING("ZHENG_QI_ZHI_XING",  GigTypeEnum.ZHENG_QI_ZHI_XING, "正启之星", 7),
 
 	// 浪潮
-	LANG_CHAO("LANG_CHAO", GigTypeEnum.LANG_CHAO, "浪潮", 8);
+	LANG_CHAO("LANG_CHAO", GigTypeEnum.LANG_CHAO, "浪潮", 8),
+
+	// 正启之星-江西
+	JIANG_XI("JIANG_XI",  GigTypeEnum.ZHENG_QI_ZHI_XING, "正启之星-江西", 9);
 
 	@EnumValue
 	private final String type;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mq/GigSignCertReceiver.java

@@ -210,11 +210,22 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		LocalDateTime now = LocalDateTime.now();
 		ZhengQiZhiXingCertStatus zhengQiZhiXingCertStatus = Enum.valueOf(ZhengQiZhiXingCertStatus.class, certStatus);
 
+		// 查询当前认证状态
+		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
+				.eq(SysUserSub::getDeptId, dept.getDeptId())
+				.eq(SysUserSub::getUserId, user.getUserId())
+				.eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
+				.eq(SysUserSub::getGigType, GigTypeEnum.ZHENG_QI_ZHI_XING));
+		if (CollUtil.isEmpty(userSubList)) {
+			return;
+		}
+
 		// 拼接更新条件
 		LambdaUpdateWrapper<SysUserSub> updateWrapper = Wrappers.<SysUserSub>lambdaUpdate()
 				.eq(SysUserSub::getUserId, user.getUserId())
 				.eq(SysUserSub::getDeptId, dept.getDeptId())
-				.eq(SysUserSub::getSubjectLocation, SubjectLocation.ZHENG_QI_ZHI_XING)
+//				.eq(SysUserSub::getSubjectLocation, SubjectLocation.ZHENG_QI_ZHI_XING)
+				.eq(SysUserSub::getCallbackStatus, GigCallBackStatus.IN_PROGRESS)
 				.eq(SysUserSub::getGigType, GigTypeEnum.ZHENG_QI_ZHI_XING)
 				.set(SysUserSub::getCallbackStatus, GigCallBackStatus.RETURNED)
 				.set(SysUserSub::getUpdateTime, now)
@@ -231,7 +242,7 @@ public class GigSignCertReceiver extends BaseRabbiMqHandler<String> {
 		Map<String, Map<String, String>> resultMap = new HashMap<>(1);
 		Map<String, String> subMap = new HashMap<>(1);
 		subMap.put("certStatus", certStatus);
-		resultMap.put("ZHENG_QI_ZHI_XING", subMap);
+		resultMap.put(userSubList.get(0).getSubjectLocation().name(), subMap);
 		String key = CacheConstants.USER_SIGN_CERT_RESPONSE_KEY + user.getUserId();
 		log.info("缓存认证结果到redis：{}", JSONUtil.toJsonStr(resultMap));
 		redisTemplate.opsForValue().set(key, JSONUtil.toJsonStr(resultMap), 1, TimeUnit.MINUTES);

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

@@ -494,13 +494,12 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		if (userSignCertDTO.getSubjectLocation() != null) {
 			updateWrapper.eq(SysUserSub::getSubjectLocation, userSignCertDTO.getSubjectLocation());
 		}
-		if (StrUtil.isNotBlank(userSignCertDTO.getAgreementUrl())) {
-			updateWrapper.set(SysUserSub::getAgreementUrl, userSignCertDTO.getAgreementUrl());
-		}
 		updateWrapper.set(SysUserSub::getIdCardFrontUrl, userSignCertDTO.getIdCardFrontUrl());
 		updateWrapper.set(SysUserSub::getIdCardBackUrl, userSignCertDTO.getIdCardBackUrl());
-		updateWrapper.set(SysUserSub::getCertVideo1Url, userSignCertDTO.getCertVideo1Url());
-		updateWrapper.set(SysUserSub::getCertVideo2Url, userSignCertDTO.getCertVideo2Url());
+		if (StrUtil.isNotBlank(userSignCertDTO.getCertVideo1Url()) && StrUtil.isNotBlank(userSignCertDTO.getCertVideo2Url())) {
+			updateWrapper.set(SysUserSub::getCertVideo1Url, userSignCertDTO.getCertVideo1Url());
+			updateWrapper.set(SysUserSub::getCertVideo2Url, userSignCertDTO.getCertVideo2Url());
+		}
 		updateWrapper.set(SysUserSub::getUpdateUser, SecurityUtils.getUser().getId());
 		updateWrapper.set(SysUserSub::getUpdateTime, LocalDateTime.now());
 
@@ -526,7 +525,10 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
 				.eq(SysUserExtRecord::getUserId, userId)
 				.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val()));
-		if (userExtRecord == null && !SubjectLocation.REN_LI_JIA.equals(userSignCertDTO.getSubjectLocation())) {
+		if (userExtRecord == null
+				&& !SubjectLocation.REN_LI_JIA.equals(userSignCertDTO.getSubjectLocation())
+				&& !SubjectLocation.JIANG_XI.equals(userSignCertDTO.getSubjectLocation())) {
+			// 人力家、正启之星-江西 不校验userExtRecord
 			return false;
 		}
 		// 查询dept
@@ -775,9 +777,11 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
 		userInfoModel.setSignImageUrl(StrUtil.isBlank(userSub.getAgreementUrl())
 				? null : userSub.getAgreementUrl().startsWith("https")
 				? userSub.getAgreementUrl() : upmsConfig.getClientUrl() + userSub.getAgreementUrl());
-		userInfoModel.setIdCardBackBase64(userExtRecord.getIdCardBackBase64());
-		userInfoModel.setIdCardFrontBase64(userExtRecord.getIdCardFrontBase64());
-		userInfoModel.setBestFrameBase64(userExtRecord.getBestFrameBase64());
+		if (userExtRecord != null) {
+			userInfoModel.setIdCardBackBase64(userExtRecord.getIdCardBackBase64());
+			userInfoModel.setIdCardFrontBase64(userExtRecord.getIdCardFrontBase64());
+			userInfoModel.setBestFrameBase64(userExtRecord.getBestFrameBase64());
+		}
 
 		GigInfoModel infoModel = new GigInfoModel();
 		infoModel.setBaseInfo(baseInfoModel);

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

@@ -765,16 +765,22 @@ 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"));
+					note.setUpdateTime(LocalDateTime.now());
 					//streamId 获取不到
-					if (dataJsonObj == null) {
+					if (dataJsonObj != null) {
+						String requestId = dataJsonObj.getStr("requestId");
+						if (StrUtil.isNotBlank(requestId)) {
+							note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+							// 新增字段streamId
+							note.setStreamId(requestId);
+							noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
+						} else {
+							noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
+						}
+					} else {
 						log.warn("政企之星结算提交成功 data 获取不到： {}", note.getSettleNo());
 						noticeInfo.append(sysUser.getRealname()).append("：提交结算成功，业务流水号获取不到，请联系管理员；");
 					}
-					note.setUpdateTime(LocalDateTime.now());
-					note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-					// 新增字段streamId
-					note.setStreamId(dataJsonObj.getStr("requestId"));
-					noticeInfo.append(sysUser.getRealname()).append("：提交结算成功；");
 				} else {
 					log.warn("政企之星结算失败： {}", note.getSettleNo());
 					note.setUpdateTime(LocalDateTime.now());

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

@@ -1083,8 +1083,15 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						// data获取不到
 						if (dataJsonObj == null) {
 							log.info("政企之星提交成功 data 获取不到");
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id);
 							return;
 						}
+						String requestId = dataJsonObj.getStr("requestId");
+						if (StrUtil.isBlank(requestId)) {
+							redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id);
+							return;
+						}
+
 						WmScorePackageSettleNote note = new WmScorePackageSettleNote();
 						LocalDateTime now = LocalDateTime.now();
 						note.setId(id);
@@ -1092,7 +1099,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 						note.setSubToGigTime(now);
 						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
 						// 新增字段streamId
-						note.setStreamId(dataJsonObj.getStr("requestId"));
+						note.setStreamId(requestId);
 						this.baseMapper.updateById(note);
 					});
 
@@ -1643,13 +1650,19 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 				log.info("政企之星结算提交成功： {}", note.getSettleNo());
 				//data 获取不到
-				if (dataJsonObj == null) {
+				if (dataJsonObj != null) {
+					String requestId = dataJsonObj.getStr("requestId");
+					if (StrUtil.isNotBlank(requestId)) {
+						note.setUpdateTime(LocalDateTime.now());
+						note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
+						// 新增字段streamId
+						note.setStreamId(requestId);
+					} else {
+						log.warn("政企之星结算提交成功 requestId 获取不到： {}", note.getSettleNo());
+					}
+				} else {
 					log.warn("政企之星结算提交成功 data 获取不到： {}", note.getSettleNo());
 				}
-				note.setUpdateTime(LocalDateTime.now());
-				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
-				// 新增字段streamId
-				note.setStreamId(dataJsonObj.getStr("requestId"));
 			} else {
 				log.warn("政企之星结算提交失败： {}", note.getSettleNo());
 				note.setUpdateTime(LocalDateTime.now());