|
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
|
|
import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.OladingCommonRequest;
|
|
import com.qunzhixinxi.hnqz.admin.api.dto.OladingCommonRequest;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
import com.qunzhixinxi.hnqz.admin.config.TaxNotifyConfig;
|
|
import com.qunzhixinxi.hnqz.admin.config.TaxNotifyConfig;
|
|
import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
|
|
import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
@@ -23,6 +24,7 @@ import com.qunzhixinxi.hnqz.admin.enums.OladingCertStatus;
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
|
|
import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
|
|
import com.qunzhixinxi.hnqz.admin.event.OladingFinishTaskEvent;
|
|
import com.qunzhixinxi.hnqz.admin.event.OladingFinishTaskEvent;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.service.SysUserService;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
|
|
import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
|
|
@@ -70,6 +72,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
private final WmScorePackageSettleNoteService scorePackageSettleNoteService;
|
|
private final WmScorePackageSettleNoteService scorePackageSettleNoteService;
|
|
private final WmScorePackageService scorePackageService;
|
|
private final WmScorePackageService scorePackageService;
|
|
private final SysDeptService sysDeptService;
|
|
private final SysDeptService sysDeptService;
|
|
|
|
+ private final SysUserService sysUserService;
|
|
private final UpmsConfig upmsConfig;
|
|
private final UpmsConfig upmsConfig;
|
|
private final TaxNotifyConfig taxNotifyConfig;
|
|
private final TaxNotifyConfig taxNotifyConfig;
|
|
|
|
|
|
@@ -587,6 +590,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
WmScorePackageSettleNote note = notes.get(0);
|
|
WmScorePackageSettleNote note = notes.get(0);
|
|
WmScorePackage wmScorePackage = scorePackageService.getById(note.getPackageId());
|
|
WmScorePackage wmScorePackage = scorePackageService.getById(note.getPackageId());
|
|
SysDept dept = sysDeptService.getById(wmScorePackage.getDeptId());
|
|
SysDept dept = sysDeptService.getById(wmScorePackage.getDeptId());
|
|
|
|
+ SysUser sysUser = sysUserService.getById(note.getUserId());
|
|
|
|
|
|
String gigFinishTaskUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement/finish-task";
|
|
String gigFinishTaskUrl = upmsConfig.getGigServiceUrl() + "/gig/operation/settlement/finish-task";
|
|
// 封装结算参数
|
|
// 封装结算参数
|
|
@@ -598,6 +602,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
params.put("channel", "DEFAULT");
|
|
params.put("channel", "DEFAULT");
|
|
params.put("subjectLocation", note.getSubjectLocation());
|
|
params.put("subjectLocation", note.getSubjectLocation());
|
|
params.put("taskId", note.getThirdTaskId());
|
|
params.put("taskId", note.getThirdTaskId());
|
|
|
|
+ params.put("username", sysUser.getUsername());
|
|
String packageIds = notes.stream().map(WmScorePackageSettleNote::getPackageId).collect(Collectors.joining(StrUtil.COMMA));
|
|
String packageIds = notes.stream().map(WmScorePackageSettleNote::getPackageId).collect(Collectors.joining(StrUtil.COMMA));
|
|
params.put("credentialLink", taxNotifyConfig.getTaskUrl() + "/#/h5/indexTask?id=" + packageIds + "&userId=" + note.getUserId());
|
|
params.put("credentialLink", taxNotifyConfig.getTaskUrl() + "/#/h5/indexTask?id=" + packageIds + "&userId=" + note.getUserId());
|
|
|
|
|