取消认领BUG修护

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -118,15 +118,17 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
     public void delete(Long id) {
         //通过流水ID查找出到账认领的数据
         List<Claim> claimList = this.list(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId, id));
-        if (CollectionUtils.isNotEmpty(claimList)) {
-            List<Long> claimIds = claimList.stream().map(Claim::getId).collect(Collectors.toList());
-            this.removeBatchByIds(claimIds);
-            claimContractService.remove(Wrappers.<ClaimContract>query().lambda().in(ClaimContract::getClaimId, claimIds));
+        if (CollectionUtils.isEmpty(claimList)) {
+            throw new ServiceException("当前流水暂无认领合同,不能取消认领");
         }
-        //更新流水数据为认领状态
+        List<Long> claimIds = claimList.stream().map(Claim::getId).collect(Collectors.toList());
+        this.removeBatchByIds(claimIds);
+        claimContractService.remove(Wrappers.<ClaimContract>query().lambda().in(ClaimContract::getClaimId, claimIds));
+        //更新流水数据为认领状态---已认领金额还原
         AccountRunningWater water = new AccountRunningWater();
         water.setId(id);
         water.setIsClaim(0);//未认领状态
+        water.setClaimAmount(BigDecimal.ZERO);
         accountRunningWaterService.updateById(water);
     }