问题处理

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -193,6 +193,9 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     @Override
     public AccountRunningWaterVo detail(Long id) {
         AccountRunningWaterVo result = baseMapper.getDetail(id);
+        if (ObjectUtil.isEmpty(result)) {
+            return result;
+        }
         //赋值归属公司名称
         Corporation corporation = corporationService.getById(result.getCorporationId());
         if (ObjectUtil.isNotEmpty(corporation)) {
@@ -313,6 +316,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         AccountRunningWater accountRunningWater = getById(id);
         Assert.notEmpty(accountRunningWater, "获取不到该流水信息");
 
+        if (!Objects.equals(accountRunningWater.getIsClaim(), 0)) {
+            throw new ServiceException("该流水已被认领，请取消认领后再操作！！！");
+        }
+
         //回滚余额 修改操作类型 收入变支出 支出变收入
         String status = "10".equals(accountRunningWater.getStatus()) ? "20" : "10";
         accountRunningWater.setStatus(status);

hx-admin/src/main/resources/application-test.yml

@@ -104,7 +104,7 @@ server:
 
 mail:
     # 调用邮箱服务url前缀
-    urlPrefix:
+    urlPrefix: http://localhost:8089/mailService/
     abroadUrlPrefix:
 
 hx:

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

@@ -175,9 +175,6 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
     @Override
     public Map<String,Object> claimDetail(Long id) {
         AccountRunningWater accountRunningWater = accountRunningWaterService.detail(id);
-        if(ObjectUtils.isEmpty(accountRunningWater)){
-            throw new ServiceException("数据异常");
-        }
         Map<String,Object> map = new HashMap<>();
         map.put("water",accountRunningWater);
         map.put("claimRecord",this.claimRecord(id));