|
|
@@ -589,6 +589,11 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
String enterpriseName = sysDept.getName();
|
|
|
return this.settleByLangchao(note, wmScorePackage, sysUser, taxCode, enterpriseName);
|
|
|
}
|
|
|
+ // 汇企云
|
|
|
+ else if (SubjectTypeEnum.TYPE_HUI_QI_YUN.getCode().equals(subType)) {
|
|
|
+ String taxCode = sysDept.getTaxCode();
|
|
|
+ return this.settleByHuiQiYun(note, wmScorePackage, sysUser, taxCode, sysDeptSub.getPathNo());
|
|
|
+ }
|
|
|
// 税邦云
|
|
|
else {
|
|
|
String taxCode = sysDept.getTaxCode();
|
|
|
@@ -704,7 +709,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
|
|
|
}
|
|
|
// 自由职家
|
|
|
- else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(subType) || SubjectTypeEnum.TYPE_ZHENG_QI_ZHI_XING.getCode().equals(subType)) {
|
|
|
+ else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(subType) || SubjectTypeEnum.TYPE_ZHENG_QI_ZHI_XING.getCode().equals(subType)
|
|
|
+ || SubjectTypeEnum.TYPE_HUI_QI_YUN.getCode().equals(subType)) {
|
|
|
oladingNoteList.add(note);
|
|
|
}
|
|
|
// 浪潮
|
|
|
@@ -761,6 +767,17 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
return this.batchSettleByLangchao(langchaoNoteList, taxCode, enterpriseName);
|
|
|
}
|
|
|
|
|
|
+ // 汇企云结算
|
|
|
+ if (CollectionUtils.isNotEmpty(oladingNoteList)) {
|
|
|
+ if (StringUtils.isNotEmpty(taxCode)) {
|
|
|
+ log.info("汇企云结算开始-获取会员所属企业的统一社会信用代码：{} ", taxCode);
|
|
|
+ } else {
|
|
|
+ return R.failed("未配置企业的统一社会信用代码");
|
|
|
+ }
|
|
|
+ SysDeptSub sysDeptSub = subMap.get(SubjectLocation.HUI_QI_YUN.name());
|
|
|
+ return this.batchSettleByHuiQiYun(oladingNoteList, taxCode, sysDeptSub.getPathNo());
|
|
|
+ }
|
|
|
+
|
|
|
return R.ok();
|
|
|
}
|
|
|
|
|
|
@@ -769,6 +786,214 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
return R.failed("因系统维护，暂时不能提起支付，有问题请联系客服");
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 汇企云结算
|
|
|
+ *
|
|
|
+ * @param noteList 结算记录
|
|
|
+ * @param taxCode 企业三合一码
|
|
|
+ * @param pathNo 批次付款渠道编号
|
|
|
+ * @return 结果
|
|
|
+ */
|
|
|
+ private R batchSettleByHuiQiYun(List<WmScorePackageSettleNote> noteList, String taxCode, String[] pathNo) {
|
|
|
+
|
|
|
+ // 加锁
|
|
|
+ List<Integer> noteIdList = noteList.stream().filter(note ->
|
|
|
+ redisTemplate.opsForValue().setIfAbsent(
|
|
|
+ CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId(),
|
|
|
+ noteList, CacheConstants.SETTLE_TIME, TimeUnit.DAYS))
|
|
|
+ .mapToInt(WmScorePackageSettleNote::getId).boxed().collect(Collectors.toList());
|
|
|
+
|
|
|
+ // 加锁记录数不等于提交记录数，说明存在在途交易
|
|
|
+ if (CollectionUtils.isEmpty(noteIdList)) {
|
|
|
+ log.error("当前用户存在其他结算请求");
|
|
|
+ return R.failed("当前用户存在其他结算请求");
|
|
|
+ } else {
|
|
|
+ if (!Objects.equals(noteList.size(), noteIdList.size())) {
|
|
|
+ // 删除锁
|
|
|
+ noteIdList.forEach(id -> redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + id));
|
|
|
+ log.error("当前用户存在其他结算请求");
|
|
|
+ return R.failed("当前用户存在其他结算请求");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ HnqzUser operator = SecurityUtils.getUser();
|
|
|
+ String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
|
|
|
+ String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
|
|
|
+
|
|
|
+ List<Map<String, Object>> settleParamsMapper = new ArrayList<>();
|
|
|
+ Map<String, Map<String, Object>> detailMap = new HashMap<>();
|
|
|
+ noteList.forEach(note -> {
|
|
|
+ WmScorePackage wmScorePackage = wmScorePackageMapper.selectById(note.getPackageId());
|
|
|
+ // 封装结算参数
|
|
|
+ Map<String, Object> params;
|
|
|
+ if (detailMap.containsKey(note.getIdCardNumber())) {
|
|
|
+ params = detailMap.get(note.getIdCardNumber());
|
|
|
+ params.put("amount", String.valueOf(new BigDecimal((String) params.get("amount")).add(note.getSettleAmount()).doubleValue()));
|
|
|
+
|
|
|
+
|
|
|
+ LocalDate startTime = (LocalDate) params.get("taskStartTime");
|
|
|
+ LocalDate endTime = (LocalDate) params.get("taskEndTime");
|
|
|
+ LocalDate noteCreateTime = wmScorePackage.getCreateTime().toLocalDate();
|
|
|
+ LocalDate noteUpdateTime = wmScorePackage.getUpdateTime().toLocalDate();
|
|
|
+
|
|
|
+ if (noteCreateTime.isBefore(startTime)) {
|
|
|
+ params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
|
|
|
+ }
|
|
|
+ if (noteUpdateTime.isAfter(endTime)) {
|
|
|
+ params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
|
|
|
+ }
|
|
|
+
|
|
|
+ Set<Integer> ids = (Set<Integer>) params.get("noteIds");
|
|
|
+ ids.add(note.getId());
|
|
|
+ params.put("noteIds", ids);
|
|
|
+ } else {
|
|
|
+ SysUser sysUser = sysUserService.getById(note.getUserId());
|
|
|
+ params = new HashMap<>(19);
|
|
|
+ params.put("tenantId", operator.getDeptId());
|
|
|
+ params.put("operatorId", operator.getId());
|
|
|
+ params.put("requestId", RandomStringUtils.randomAlphabetic(12));
|
|
|
+ params.put("taskName", String.format("%s(%s)_%s", sysUser.getRealname(), sysUser.getUsername(), System.currentTimeMillis()));
|
|
|
+ params.put("amount", String.valueOf(note.getSettleAmount().doubleValue()));
|
|
|
+ params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
|
|
|
+ params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
|
|
|
+ params.put("taskLocation", "要易云");
|
|
|
+ params.put("username", sysUser.getUsername());
|
|
|
+ params.put("idCard", note.getIdCardNumber());
|
|
|
+ params.put("idCardType","ID_CARD");
|
|
|
+ params.put("realName", sysUser.getRealname());
|
|
|
+ params.put("bankCard", sysUser.getBankCardNumber());
|
|
|
+ params.put("tagId", upmsConfig.getTagId());
|
|
|
+ params.put("taskInvoiceContent", note.getCategoryName());
|
|
|
+ params.put("endType", "JY");
|
|
|
+ params.put("enterpriseCode", taxCode);
|
|
|
+ params.put("subjectType", "HUI_QI_YUN");
|
|
|
+ params.put("channel", "DEFAULT");
|
|
|
+ params.put("subjectLocation", note.getSubjectLocation());
|
|
|
+ params.put("notes", pathNo[0]);
|
|
|
+ params.put("pathNo", pathNo[0]);
|
|
|
+
|
|
|
+ if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
|
|
|
+ params.put("taxMode", "GENERAL");
|
|
|
+ params.put("transactionModel", "SUPERVISE");
|
|
|
+ }
|
|
|
+ // 海南飞亿 和 河南薪泰梓
|
|
|
+ else {
|
|
|
+ params.put("taxMode", "SPECIAL");
|
|
|
+ params.put("transactionModel", "CHANNEL");
|
|
|
+ }
|
|
|
+
|
|
|
+ Set<Integer> noteIds = new HashSet<>();
|
|
|
+ noteIds.add(note.getId());
|
|
|
+ params.put("noteIds", noteIds);
|
|
|
+ detailMap.put(note.getIdCardNumber(), params);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ detailMap.forEach((key, value) -> settleParamsMapper.add(value));
|
|
|
+
|
|
|
+
|
|
|
+ // 开始结算
|
|
|
+ for (Map<String, Object> params : settleParamsMapper) {
|
|
|
+
|
|
|
+ Set<Integer> noteIds = (Set<Integer>) params.get("noteIds");
|
|
|
+ try {
|
|
|
+ // 获取请求token
|
|
|
+ ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
|
|
|
+ String.valueOf(operator.getDeptId()), "settle", String.valueOf(operator.getId()));
|
|
|
+ log.warn("获取结算token：{}", tokenResult.getBody());
|
|
|
+ if (!JSONUtil.isJson(tokenResult.getBody())) {
|
|
|
+ return R.failed("获取结算token失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
|
|
|
+
|
|
|
+ if (jsonObject.getInt("code") != 0 || StrUtil.isBlank(jsonObject.getStr("data"))) {
|
|
|
+ return R.failed("获取结算token失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ String token = jsonObject.getStr("data");
|
|
|
+
|
|
|
+ // 间隔100毫秒
|
|
|
+ Thread.sleep(100);
|
|
|
+
|
|
|
+ params.put("token", token);
|
|
|
+
|
|
|
+ // 发起结算
|
|
|
+ HttpHeaders headers = new HttpHeaders();
|
|
|
+ headers.setContentType(MediaType.APPLICATION_JSON);
|
|
|
+ log.info("汇企云结算req： {}", params);
|
|
|
+ HttpEntity<String> result = new RestTemplate().exchange(gigSettleUrl, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
|
|
|
+ log.info("汇企云结算resp： {}", result.getBody());
|
|
|
+ if (!JSONUtil.isJson(result.getBody())) {
|
|
|
+ return R.failed("结算失败");
|
|
|
+ }
|
|
|
+ JSONObject settelObj = JSONUtil.parseObj(result.getBody());
|
|
|
+
|
|
|
+ if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
|
|
|
+ JSONObject dataJsonObj = settelObj.getJSONObject("data");
|
|
|
+
|
|
|
+ noteIds.forEach(id -> {
|
|
|
+ log.info("汇企云结算结算提交成功");
|
|
|
+ // data获取不到
|
|
|
+ if (dataJsonObj == null) {
|
|
|
+ log.info("汇企云提交成功 data 获取不到");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ String requestId = dataJsonObj.getStr("requestId");
|
|
|
+ if (StrUtil.isNotBlank(requestId)) {
|
|
|
+ WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ note.setId(id);
|
|
|
+ note.setUpdateTime(LocalDateTime.now());
|
|
|
+ note.setSubToGigTime(now);
|
|
|
+ note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
|
|
|
+ // 新增字段streamId
|
|
|
+ note.setStreamId(requestId);
|
|
|
+ this.baseMapper.updateById(note);
|
|
|
+ } else {
|
|
|
+ log.info("汇企云提交成功 message：{}", dataJsonObj.getStr("message"));
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ } else {
|
|
|
+ noteIds.forEach(id -> {
|
|
|
+ WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
|
+ note.setId(id);
|
|
|
+ log.info("汇企云结算提交失败： {}", note.getSettleNo());
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ note.setUpdateTime(LocalDateTime.now());
|
|
|
+ note.setSubToGigTime(now);
|
|
|
+ note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
|
+ this.baseMapper.updateById(note);
|
|
|
+ log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
|
|
|
+ redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
|
|
|
+ });
|
|
|
+
|
|
|
+ return R.ok("结算失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("", e);
|
|
|
+ noteIds.forEach(id -> {
|
|
|
+ WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
|
+ note.setId(id);
|
|
|
+ log.info("汇企云结算提交失败： {}", note.getSettleNo());
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ note.setUpdateTime(LocalDateTime.now());
|
|
|
+ note.setSubToGigTime(now);
|
|
|
+ note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
|
+ this.baseMapper.updateById(note);
|
|
|
+ log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
|
|
|
+ redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + ":note_id_" + note.getId());
|
|
|
+ });
|
|
|
+ return R.ok("结算失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return R.ok("提交结算成功");
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 浪潮结算
|
|
|
*
|
|
|
@@ -1431,6 +1656,144 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 汇企云结算
|
|
|
+ *
|
|
|
+ * @param note
|
|
|
+ * @param wmScorePackage
|
|
|
+ * @param sysUser
|
|
|
+ * @param taxCode
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private R settleByHuiQiYun(WmScorePackageSettleNote note,
|
|
|
+ WmScorePackage wmScorePackage,
|
|
|
+ SysUser sysUser,
|
|
|
+ String taxCode,
|
|
|
+ String[] pathNo) {
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 加锁
|
|
|
+ */
|
|
|
+ redisTemplate.opsForValue().set(CacheConstants.SETTLE_PACKAGE_KEY + note.getId(),
|
|
|
+ note.getId(), CacheConstants.SETTLE_TIME, TimeUnit.DAYS);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 开始结算
|
|
|
+ */
|
|
|
+
|
|
|
+ HnqzUser operator = SecurityUtils.getUser();
|
|
|
+ String gigTokenUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/token?tenantId={tenantId}&action={action}&userId={userId}";
|
|
|
+ String gigSettleUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement";
|
|
|
+
|
|
|
+ try {
|
|
|
+ // 获取请求token
|
|
|
+ ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
|
|
|
+ String.valueOf(operator.getDeptId()), "settle", String.valueOf(operator.getId()));
|
|
|
+ log.warn("获取结算token：{}", tokenResult.getBody());
|
|
|
+ if (!JSONUtil.isJson(tokenResult.getBody())) {
|
|
|
+ return R.failed("获取结算token失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
|
|
|
+
|
|
|
+ if (jsonObject.getInt("code") != 0 || StrUtil.isBlank(jsonObject.getStr("data"))) {
|
|
|
+ return R.failed("获取结算token失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ String token = jsonObject.getStr("data");
|
|
|
+
|
|
|
+ // 间隔100毫秒
|
|
|
+ Thread.sleep(100);
|
|
|
+
|
|
|
+ // 封装结算参数
|
|
|
+ Map<String, Object> params = new HashMap<>();
|
|
|
+ params.put("token", token);
|
|
|
+ params.put("tenantId", operator.getDeptId());
|
|
|
+ params.put("operatorId", operator.getId());
|
|
|
+ params.put("requestId", RandomStringUtils.randomAlphabetic(12));
|
|
|
+ params.put("taskName", wmScorePackage.getScorePackageName() + "_" + System.currentTimeMillis());
|
|
|
+ params.put("amount", String.valueOf(note.getSettleAmount().doubleValue()));
|
|
|
+ params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
|
|
|
+ params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
|
|
|
+ params.put("taskLocation", "要易云");
|
|
|
+ params.put("username", sysUser.getUsername());
|
|
|
+ params.put("idCard", sysUser.getIdCardNumber());
|
|
|
+ params.put("idCardType","ID_CARD");
|
|
|
+ params.put("realName", sysUser.getRealname());
|
|
|
+ params.put("bankCard", sysUser.getBankCardNumber());
|
|
|
+ // 市场推广
|
|
|
+ params.put("tagId", upmsConfig.getTagId());
|
|
|
+ params.put("taskInvoiceContent", note.getCategoryName());
|
|
|
+ params.put("endType", "JY");
|
|
|
+ params.put("enterpriseCode", taxCode);
|
|
|
+ params.put("subjectType", "HUI_QI_YUN");
|
|
|
+ params.put("channel", "DEFAULT");
|
|
|
+ params.put("subjectLocation", note.getSubjectLocation().getType());
|
|
|
+ params.put("notes", pathNo[0]);
|
|
|
+ params.put("pathNo", pathNo[0]);
|
|
|
+
|
|
|
+
|
|
|
+ if (SubjectLocation.JIN_YUAN.equals(note.getSubjectLocation())) {
|
|
|
+ params.put("taxMode", "GENERAL");
|
|
|
+ params.put("transactionModel", "SUPERVISE");
|
|
|
+ }
|
|
|
+ // 海南飞亿 和 河南薪泰梓
|
|
|
+ else {
|
|
|
+ params.put("taxMode", "SPECIAL");
|
|
|
+ params.put("transactionModel", "CHANNEL");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 发起结算
|
|
|
+ HttpHeaders headers = new HttpHeaders();
|
|
|
+ headers.setContentType(MediaType.APPLICATION_JSON);
|
|
|
+ log.info("汇企云结算req： {}", params);
|
|
|
+ HttpEntity<String> result = new RestTemplate().exchange(gigSettleUrl, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
|
|
|
+ log.info("汇企云结算resp： {}", result.getBody());
|
|
|
+ if (!JSONUtil.isJson(result.getBody())) {
|
|
|
+ return R.failed("结算失败");
|
|
|
+ }
|
|
|
+ JSONObject settelObj = JSONUtil.parseObj(result.getBody());
|
|
|
+
|
|
|
+
|
|
|
+ if (Objects.equals(settelObj.getInt("code"), CommonConstants.SUCCESS)) {
|
|
|
+ JSONObject dataJsonObj = settelObj.getJSONObject("data");
|
|
|
+
|
|
|
+ log.info("汇企云结算提交成功： {}", note.getSettleNo());
|
|
|
+ note.setUpdateTime(LocalDateTime.now());
|
|
|
+ //data 获取不到
|
|
|
+ if (dataJsonObj != null) {
|
|
|
+ String requestId = dataJsonObj.getStr("requestId");
|
|
|
+ note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
|
|
|
+ // 新增字段streamId
|
|
|
+ note.setStreamId(requestId);
|
|
|
+ } else {
|
|
|
+ log.warn("汇企云结算提交成功 data 获取不到： {}", note.getSettleNo());
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ log.warn("汇企云结算提交失败： {}", note.getSettleNo());
|
|
|
+ note.setUpdateTime(LocalDateTime.now());
|
|
|
+ note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
|
+
|
|
|
+ log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
|
|
|
+ redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
|
|
|
+
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("", e);
|
|
|
+ log.warn("汇企云结算提交失败： {}", note.getSettleNo());
|
|
|
+ note.setUpdateTime(LocalDateTime.now());
|
|
|
+ note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
|
+
|
|
|
+ log.info("认证状态异常，结算解锁settleNoteId：{}", note.getId());
|
|
|
+ redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
|
|
|
+ }
|
|
|
+
|
|
|
+ this.baseMapper.updateById(note);
|
|
|
+
|
|
|
+ return R.ok();
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 浪潮结算
|
|
|
*
|
