|
|
@@ -422,7 +422,6 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
updateEntity.setSettleAmount(total);
|
|
|
updateEntity.setId(input.getId());
|
|
|
updateEntity.setSettleStatus(DingEnum.SETTLE_STATUS_WAIT.getType());
|
|
|
- updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
|
|
|
updateEntity.setDescription(input.getDescription());
|
|
|
updateEntity.setSubType(String.valueOf(input.getSubjectLocation().getGigType().getCode()));
|
|
|
updateEntity.setLocation(location);
|
|
|
@@ -440,7 +439,10 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
|
|
|
updateEntity.setMahSettleStep(UpmsType.MahSettleStep.BUSINESS);
|
|
|
// 这里是MAH业务提交到上级业务的情况,设为不可结算
|
|
|
updateEntity.setSettleFlag("0");
|
|
|
+ // 设为待结算
|
|
|
+ updateEntity.setScorePackageStatus(ScorePackageStatusEnum.TO_BE_SETTLED.getVal());
|
|
|
} else {
|
|
|
+ updateEntity.setScorePackageStatus(ScorePackageStatusEnum.SETTLEMENT_SUBMITTED.val());
|
|
|
if (StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage.getPackageType1())) {
|
|
|
// 多人承接积分包可以一直结算
|
|
|
updateEntity.setSettleFlag("0");
|
