落地检耳标号判断格式

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

@@ -128,6 +128,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", buyerPhone));
         BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum));
 
+        int sum = 0;
+        int total = Integer.parseInt(num);
+
         if (ObjectUtil.isNotEmpty(sysUser)){
             if (!sysUser.getUserName().equals(buyer)){
                 return new Result(10001,"买家手机号和姓名不匹配",false);
@@ -162,10 +165,14 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                         if (ObjectUtil.isEmpty(baseAnimal)){
                             return new Result(10001,"耳标号"+number+"不存在",false);
                         }
+                        if (baseAnimal.getIsLoated() == 1){
+                            return new Result(10001,"耳标号"+number+"已申请补贴",false);
+                        }
                         if (ObjectUtil.isEmpty(sysUser)){
                             SysUser newUser = new SysUser();
                             newUser.setUserName(buyer);
                             newUser.setPhone(buyerPhone);
+                            newUser.setUserType(3);
                             newUser.setCreateTime(DateTime.now());
                             newUser.setIsRealName(0);
                             sysUserMapper.insert(newUser);
@@ -178,6 +185,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                         baseAnimal.setAnimalStatus(2);
                         baseAnimal.setBuyTime(DateTime.now());
                         baseAnimalMapper.updateById(baseAnimal);
+                        sum++;
                     }
                 }else {
                     BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input).eq("inspection_num",inspectionNum));
@@ -191,10 +199,14 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     if (num2 != 0){
                         return new Result(10001,"耳标号"+input+"重复",false);
                     }
+                    if (baseAnimal.getIsLoated() == 1){
+                        return new Result(10001,"耳标号"+input+"已申请补贴",false);
+                    }
                     if (ObjectUtil.isEmpty(sysUser)){
                         SysUser newUser = new SysUser();
                         newUser.setUserName(buyer);
                         newUser.setPhone(buyerPhone);
+                        newUser.setUserType(3);
                         newUser.setCreateTime(DateTime.now());
                         newUser.setIsRealName(0);
                         sysUserMapper.insert(newUser);
@@ -207,6 +219,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     baseAnimal.setAnimalStatus(2);
                     baseAnimal.setBuyTime(DateTime.now());
                     baseAnimalMapper.updateById(baseAnimal);
+                    sum++;
                 }
             }
         }else {
@@ -234,9 +247,13 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     if (ObjectUtil.isEmpty(baseAnimal)){
                         return new Result(10001,"耳标号"+number+"不存在",false);
                     }
+                    if (baseAnimal.getIsLoated() == 1){
+                        return new Result(10001,"耳标号"+number+"已申请补贴",false);
+                    }
                     if (ObjectUtil.isEmpty(sysUser)){
                         SysUser newUser = new SysUser();
                         newUser.setUserName(buyer);
+                        newUser.setUserType(3);
                         newUser.setPhone(buyerPhone);
                         newUser.setCreateTime(DateTime.now());
                         newUser.setIsRealName(0);
@@ -250,15 +267,20 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     baseAnimal.setAnimalStatus(2);
                     baseAnimal.setBuyTime(DateTime.now());
                     baseAnimalMapper.updateById(baseAnimal);
+                    sum++;
                 }
             }else {
                 BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags).eq("inspection_num",inspectionNum));
                 if (ObjectUtil.isEmpty(baseAnimal)){
                     return new Result(10001,"耳标号"+eartags+"不存在",false);
                 }
+                if (baseAnimal.getIsLoated() == 1){
+                    return new Result(10001,"耳标号"+eartags+"已申请补贴",false);
+                }
                 if (ObjectUtil.isEmpty(sysUser)){
                     SysUser newUser = new SysUser();
                     newUser.setUserName(buyer);
+                    newUser.setUserType(3);
                     newUser.setPhone(buyerPhone);
                     newUser.setCreateTime(DateTime.now());
                     newUser.setIsRealName(0);
@@ -272,9 +294,12 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 baseAnimal.setAnimalStatus(2);
                 baseAnimal.setBuyTime(DateTime.now());
                 baseAnimalMapper.updateById(baseAnimal);
+                sum++;
             }
         }
-
+        if (total != sum){
+            return new Result(10001,"实际耳标数量和填写数量不符!",false);
+        }
         if (ObjectUtil.isEmpty(billBuyInfo1)){
             BillBuyInfo billBuyInfo = new BillBuyInfo();
             billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");
@@ -310,7 +335,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             this.updateById(billBuyInfo1);
         }
         if(ObjectUtil.isEmpty(sysUser)){
-            return new Result(10001,"买家用户信息不存在,已新建账号",false);
+            return new Result(10003,"交易成功买家用户信息不存在,已新建账号",true);
         }
         return Result.SUCCESS();
     }

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

@@ -84,27 +84,27 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
 
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
         String eartags = billLandingInspection.getEartags();
-        eartags.replace("，",",");
-        eartags.replace(", ",",");
-        eartags.replace("， ",",");
+        eartags = eartags.replace("，",",");
+        eartags = eartags.replace(", ",",");
+        eartags = eartags.replace("， ",",");
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
                     String start = input.substring(0, input.indexOf("-"));
                     if (start.length() != 15){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
                     String end = input.substring(input.indexOf("-") + 1);
                     if (end.length() != 3){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+input+"格式错误,-后需输入3位数字",false);
                     }
                     String substring1 = input.substring(start.length() - end.length(), start.length());
                     String substring = start.substring(0, start.length() - end.length());
                     System.out.println(substring);
                     List<String> eartagNos = new ArrayList<>();
                     if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
                     }
                     for (int i = Integer.parseInt(substring1); i <=  Integer.valueOf(end); i++){
                         eartagNos.add(substring+i);
@@ -112,7 +112,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     for (String eartagNo : eartagNos) {
                         Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartagNo));
                         if (num != 0){
-                            return new Result(10001,"耳标号重复",false);
+                            return new Result(10001,"耳标号"+eartagNo+"重复",false);
                         }
                         BaseAnimal baseAnimal = new BaseAnimal();
                         baseAnimal.setEaratgNo(eartagNo);
@@ -125,11 +125,11 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     }
                 }else {
                     if (input.length() != 15){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
                     Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
                     if (num != 0){
-                        return new Result(10001,"耳标号重复",false);
+                        return new Result(10001,"耳标号"+input+"重复",false);
                     }
                     BaseAnimal baseAnimal = new BaseAnimal();
                     baseAnimal.setEaratgNo(input);
@@ -145,18 +145,18 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             if (eartags.contains("-")){
                 String start = eartags.substring(0, eartags.indexOf("-"));
                 if (start.length() != 15){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
                 }
                 String end = eartags.substring(eartags.indexOf("-") + 1);
                 if (end.length() != 3){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误,-后需输入3位数字",false);
                 }
                 String substring1 = eartags.substring(start.length() - end.length(), start.length());
                 String substring = start.substring(0, start.length() - end.length());
                 System.out.println(substring);
                 List<String> eartagNos = new ArrayList<>();
                 if (Integer.parseInt(substring1) >Integer.parseInt(end)){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
                 }
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                     eartagNos.add(substring+i);
@@ -164,7 +164,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 for (String number : eartagNos) {
                     Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                     if (num != 0){
-                        return new Result(10001,"耳标号重复",false);
+                        return new Result(10001,"耳标号"+number+"重复",false);
                     }
                     BaseAnimal baseAnimal = new BaseAnimal();
                     baseAnimal.setEaratgNo(number);
@@ -177,11 +177,11 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 }
             }else {
                 if (eartags.length() != 15){
-                    return new Result(10001,"耳标号格式错误",false);
+                    return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
                 }
                 Integer num = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags));
                 if (num != 0){
-                    return new Result(10001,"耳标号重复",false);
+                    return new Result(10001,"耳标号"+eartags+"重复",false);
                 }
                 BaseAnimal baseAnimal = new BaseAnimal();
                 baseAnimal.setEaratgNo(eartags);
@@ -267,9 +267,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);
 
-        deaths.replace("，",",");
-        deaths.replace(", ",",");
-        deaths.replace("，  ",",");
+        deaths = deaths.replace("，",",");
+        deaths = deaths.replace(", ",",");
+        deaths = deaths.replace("，  ",",");
         if ("1".equals(isDead)){
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);
@@ -279,19 +279,25 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     if (!s.contains("-")){
                         BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", s));
                         if (ObjectUtil.isEmpty(baseAnimal)){
-                            return new Result(10001,"耳标号不存在",false);
+                            return new Result(10001,"耳标号"+s+"不存在",false);
                         }
                         baseAnimal.setIsDie(1);
                         baseAnimalMapper.updateById(baseAnimal);
                     }else {
                         String start = s.substring(0, s.indexOf("-"));
+                        if (start.length() != 15){
+                            return new Result(10001,"耳标号"+s+"格式错误需输入15位数字",false);
+                        }
                         String end = s.substring(s.indexOf("-") + 1);
                         if (end.length() != 3){
-                            return new Result(10001,"耳标号格式错误",false);
+                            return new Result(10001,"耳标号"+s+"格式错误,-后需输入3位数字",false);
                         }
                         String substring1 = s.substring(start.length() - end.length(), start.length());
                         String substring = start.substring(0, start.length() - end.length());
                         System.out.println(substring);
+                        if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
+                            return new Result(10001,"耳标号"+s+"格式错误,包含-号耳标号需递增",false);
+                        }
                         List<String> eartagNos = new ArrayList<>();
                         for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                             eartagNos.add(substring+i);
@@ -299,7 +305,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         for (String number : eartagNos) {
                             BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                             if (ObjectUtil.isEmpty(animal)){
-                                return new Result(10001,"耳标号不存在",false);
+                                return new Result(10001,"耳标号"+number+"不存在",false);
                             }
                             animal.setIsDie(1);
                             baseAnimalMapper.updateById(animal);
@@ -310,21 +316,23 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 if (!deaths.contains("-")){
                     BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", deaths));
                     if (ObjectUtil.isEmpty(baseAnimal)){
-                        return new Result(10001,"耳标号不存在",false);
+                        return new Result(10001,"耳标号"+deaths+"不存在",false);
                     }
                     baseAnimal.setIsDie(1);
                     baseAnimalMapper.updateById(baseAnimal);
                 }else {
                     String start = deaths.substring(0, deaths.indexOf("-"));
+                    if (start.length() != 15){
+                        return new Result(10001,"耳标号"+deaths+"格式错误需输入15位数字",false);
+                    }
                     String end = deaths.substring(deaths.indexOf("-") + 1);
                     if (end.length() != 3){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+deaths+"格式错误,-后需输入3位数字",false);
                     }
                     String substring1 = deaths.substring(start.length() - end.length(), start.length());
                     String substring = start.substring(0, start.length() - end.length());
-                    System.out.println(substring);
                     if (Integer.parseInt(substring1) >Integer.parseInt(end)){
-                        return new Result(10001,"耳标号格式错误",false);
+                        return new Result(10001,"耳标号"+deaths+"格式错误,包含-号耳标号需递增",false);
                     }
                     List<String> eartagNos = new ArrayList<>();
                     for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
@@ -333,7 +341,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     for (String number : eartagNos) {
                         BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number));
                         if (ObjectUtil.isEmpty(animal)){
-                            return new Result(10001,"耳标号不存在",false);
+                            return new Result(10001,"耳标号"+number+"不存在",false);
                         }
                         animal.setIsDie(1);
                         baseAnimalMapper.updateById(animal);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
@@ -157,10 +158,12 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (this.count(landingInspectionQueryWrapper) != 0) {
             return new Result(10001, "存在相同检疫证号！", false);
         }
+        int total = Integer.parseInt(billLandingInspection.getAnimalNumberUp());
+        int sum = 0;
         String eartags = billLandingInspection.getEartags();
-        eartags.replace("，",",");
-        eartags.replace(", ",",");
-        eartags.replace("， ",",");
+        eartags = eartags.replace("，",",");
+        eartags = eartags.replace(", ",",");
+        eartags = eartags.replace("， ",",");
         if (eartags.contains(",")){
             String[] eartag = eartags.split(",");
             for (String input : eartag) {
@@ -178,10 +181,14 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                     if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
                         return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
                     }
+                    for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                        sum++;
+                    }
                 }else {
                     if (input.length() != 15){
                         return new Result(10001,"耳标号"+input+"格式错误需输入15位数字",false);
                     }
+                    sum++;
                 }
             }
         }else {
@@ -199,13 +206,20 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
                 if (Integer.parseInt(substring1) >Integer.parseInt(end)){
                     return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
                 }
+                for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
+                    sum++;
+                }
             }else {
                 System.out.println("落地检耳标号:"+eartags);
                 if (eartags.length() != 15){
                     return new Result(10001,"耳标号"+eartags+"格式错误需输入15位数字",false);
                 }
+                sum++;
             }
         }
+        if (sum != total){
+            return new Result(10001,"实际耳标数量和填写数量不符!",false);
+        }
         billLandingInspection.setCargoOwner(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setOwnerPhone(TokenSign.getPhone(httpServletRequest));
         billLandingInspection.setInspectionName(billLandingInspection.getCargoOwner() + "的落地检疫申请");

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

@@ -226,7 +226,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         billSubsidy.setCreateTime(DateTime.now());
         billSubsidy.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billSubsidy.setSubsidySch(0);
-        String userName = TokenSign.getUserName(httpServletRequest);
+        Long userName = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
         if (ObjectUtil.isEmpty(subsidy)){
             this.save(billSubsidy);