|
|
@@ -134,7 +134,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
public R<?> settleById(String pkgId) {
|
|
|
|
|
|
WmScorePackage wmScorePackage = wmScorePackageService.getById(pkgId);
|
|
|
- wmScorePackage.setSubjectLocation(wmScorePackage.getLocation().name());
|
|
|
|
|
|
if (!"1".equals(wmScorePackage.getPackageFinishStatus())) {
|
|
|
return R.failed("积分包状态异常");
|
|
|
@@ -187,8 +186,15 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
SysUser user = sysUserMapper.selectById(item.getUserId());
|
|
|
item.setRealName(user.getRealname());
|
|
|
item.setIdCardNumber(user.getIdCardNumber());
|
|
|
+ if (item.getSubjectLocation() != null){
|
|
|
+ wmScorePackage.setSubjectLocation(item.getSubjectLocation().name());
|
|
|
+ }
|
|
|
});
|
|
|
|
|
|
+ if (StrUtil.isBlank(wmScorePackage.getSubjectLocation())){
|
|
|
+ return R.failed("结算积分包未勾选税源地");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
Map<String, Object> resultMap = new HashMap<>(3);
|
|
|
@@ -535,6 +541,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
params.put("endType", "CSO");
|
|
|
params.put("enterpriseCode", taxCode);
|
|
|
params.put("subjectType", "OLADING");
|
|
|
+ params.put("subjectLocation", input.getSubjectLocation().getType());
|
|
|
params.put("taskDescription", "根据要求，执行、并完成学术推广活动，并以在线平台工具采集、记录活动内容");
|
|
|
params.put("acceptanceStandard", "完成不同任务获得不同任务积分，根据不同任务给与0~30000积分，每个积分兑换0.8~1.2元，按次数结算");
|
|
|
|
