修改隔离畜种属于人

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
@@ -125,7 +126,11 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
 
         BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("bill_buy_status",1));
         SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", buyerPhone));
-
+        if (ObjectUtil.isNotEmpty(sysUser)){
+            if (!sysUser.getUserName().equals(buyer)){
+                return new Result(10001,"买家手机号和姓名不匹配",false);
+            }
+        }
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
@@ -295,7 +300,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             this.updateById(billBuyInfo1);
         }
 
-
+        if(ObjectUtil.isEmpty(sysUser)){
+            return new Result(10000,"买家用户信息不存在,已新建账号",true);
+        }
         return Result.SUCCESS();
     }
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -116,7 +116,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         baseAnimal.setEaratgNo(eartagNo);
                         baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                         baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                        baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                        baseAnimal.setBelongToUser(billLandingInspection.getCreateUser());
                         baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                         baseAnimal.setCreateTime(new Date());
                         baseAnimalMapper.insert(baseAnimal);
@@ -133,7 +133,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimal.setEaratgNo(input);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                    baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    baseAnimal.setBelongToUser(billLandingInspection.getCreateUser());
                     baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     baseAnimal.setCreateTime(new Date());
                     baseAnimalMapper.insert(baseAnimal);
@@ -168,7 +168,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimal.setEaratgNo(number);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                    baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    baseAnimal.setBelongToUser(billLandingInspection.getCreateUser());
                     baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     baseAnimal.setCreateTime(new Date());
                     baseAnimalMapper.insert(baseAnimal);
@@ -185,7 +185,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 baseAnimal.setEaratgNo(eartags);
                 baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                 baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                baseAnimal.setBelongToUser(billLandingInspection.getCreateUser());
                 baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                 baseAnimal.setCreateTime(new Date());
                 baseAnimalMapper.insert(baseAnimal);