|
|
@@ -472,7 +472,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
SysUser sysUser = sysUserService.getById(note.getUserId());
|
|
|
|
|
|
// 获取结算零工
|
|
|
- GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(input.getSubType()));
|
|
|
+ GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
|
|
|
|
|
|
if (gigTypeEnum == null){
|
|
|
return R.failed(sysUser.getRealname() + "人员结算渠道不存在，不能结算");
|
|
|
@@ -521,9 +521,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
|
|
|
|
}
|
|
|
// 自由职家
|
|
|
- else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(input.getSubType())) {
|
|
|
+ else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType())) {
|
|
|
String taxCode = sysDept.getTaxCode();
|
|
|
- return settleByOlading(input, wmScorePackage, sysUser, taxCode);
|
|
|
+ return settleByOlading(note, wmScorePackage, sysUser, taxCode);
|
|
|
}
|
|
|
// 税邦云
|
|
|
else {
|
