|
|
@ -158,6 +158,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe |
|
|
|
activity.setUsedAmount(finalAmt); |
|
|
|
if(finalAmt.compareTo(activity.getTotalAmount())==0) { |
|
|
|
activity.setActivityState(TbsActivityState.STATE_1_Finished); |
|
|
|
activity.setFinishedFlag(1); |
|
|
|
activity.setFinishedTime(LocalDateTime.now()); |
|
|
|
} |
|
|
|
activityService.updateById(activity); |
|
|
|
|
|
|
@ -413,10 +415,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void release(Long activityId) { |
|
|
|
public void release(Long activityId,Boolean throwEx) { |
|
|
|
SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); |
|
|
|
TbsActivity activity = activityService.getById(activityId); |
|
|
|
if(!activity.getActivityState().equals(TbsActivityState.STATE_0_Todo)){ |
|
|
|
if(!throwEx){ |
|
|
|
return; |
|
|
|
} |
|
|
|
Assert.throwEx("活动状态非待核销状态,操作失败"); |
|
|
|
} |
|
|
|
if(activity.getCancelFlag().equals(1)){ |
|
|
|