交易

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BaseAnimalController.java

@@ -35,4 +35,9 @@ public class BaseAnimalController {
         return baseAnimalService.listNumByUser(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/noSaleAnimal")
+    public Result noSaleAnimal(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return baseAnimalService.noSaleAnimal(httpServletRequest,paramsMap);
+    }
+
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBaseAnimalService.java

@@ -20,4 +20,6 @@ public interface IBaseAnimalService extends IService<BaseAnimal> {
     Result noSubsidyAnimal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listNumByUser(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result noSaleAnimal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

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

@@ -50,4 +50,18 @@ public class BaseAnimalServiceImpl extends ServiceImpl<BaseAnimalMapper, BaseAni
         List<BaseAnimal> landingInspectionNums = baseAnimalMapper.selectList(new QueryWrapper<BaseAnimal>().eq("belong_to_user",userId).groupBy("inspection_num"));
         return new Result(ResultCode.SUCCESS,landingInspectionNums);
     }
+
+    @Override
+    public Result noSaleAnimal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String inspectionNum = paramsMap.get("inspectionNum");
+        String[] inspectionNums = inspectionNum.split(",");
+        List<BaseAnimal> baseAnimals = this.list(new QueryWrapper<BaseAnimal>()
+                .in("inspection_num", inspectionNums).eq("is_die",0)
+                .in("animal_status",1).eq("is_loated",0));
+        if (ObjectUtil.isEmpty(baseAnimals)) {
+            return new Result(10001,"该检疫批次中无符合要求的畜种！",false);
+        }else {
+            return new Result(ResultCode.SUCCESS,baseAnimals);
+        }
+    }
 }

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

@@ -54,7 +54,6 @@ 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)){
@@ -62,203 +61,31 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 return new Result(10001,"买家手机号和姓名不匹配",false);
             }
         }
-        if (eartags.contains(",")){
-            eartags = eartags.replace("，",",");
-            eartags = eartags.replace(", ",",");
-            eartags = eartags.replace("， ",",");
-            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,"耳标号"+input+"格式错误需输入15位数字",false);
-                    }
-                    String end = input.substring(input.indexOf("-") + 1);
-                    if (end.length() != 3){
-                        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());
-                    if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
-                        return new Result(10001,"耳标号"+input+"格式错误,包含-号耳标号需递增",false);
-                    }
-                    List<String> eartagNos = new ArrayList<>();
-                    for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                        eartagNos.add(substring+i);
-                    }
-                    for (String number : eartagNos) {
-                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number).eq("inspection_num",inspectionNum));
-                        if (ObjectUtil.isEmpty(baseAnimal)){
-                            return new Result(10001,"耳标号"+number+"不存在",false);
-                        }
-                        if (baseAnimal.getIsDie() == 1){
-                            return new Result(10001,"耳标号"+number+"畜种已死亡",false);
-                        }
-                        if (!baseAnimal.getBelongToUser().equals(billLandingInspection.getCreateUser())){
-                            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.setAccoutType(1);
-                            newUser.setCreateTime(DateTime.now());
-                            newUser.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                            newUser.setIsRealName(0);
-                            sysUserMapper.insert(newUser);
-                            baseAnimal.setBelongToUser(newUser.getId());
-                        }else {
-                            baseAnimal.setBelongToUser(sysUser.getId());
-                        }
-                        baseAnimal.setBuyerName(buyer);
-                        baseAnimal.setSellerName(seller);
-                        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));
-                    if (ObjectUtil.isEmpty(baseAnimal)){
-                        return new Result(10001,"耳标号"+input+"不存在",false);
-                    }
-                    if (input.length() != 15){
-                        return new Result(10001,"耳标号"+input+"格式错误",false);
-                    }
-                    Integer num2 = baseAnimalMapper.selectCount(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
-                    if (num2 != 0){
-                        return new Result(10001,"耳标号"+input+"重复",false);
-                    }
-                    if (baseAnimal.getIsDie() == 1){
-                        return new Result(10001,"耳标号"+input+"畜种已死亡",false);
-                    }
-                    if (!baseAnimal.getBelongToUser().equals(billLandingInspection.getCreateUser())){
-                        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.setAccoutType(1);
-                        newUser.setCreateTime(DateTime.now());
-                        newUser.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                        newUser.setIsRealName(0);
-                        sysUserMapper.insert(newUser);
-                        baseAnimal.setBelongToUser(newUser.getId());
-                    }else {
-                        baseAnimal.setBelongToUser(sysUser.getId());
-                    }
-                    baseAnimal.setBuyerName(buyer);
-                    baseAnimal.setSellerName(seller);
-                    baseAnimal.setAnimalStatus(2);
-                    baseAnimal.setBuyTime(DateTime.now());
-                    baseAnimalMapper.updateById(baseAnimal);
-                    sum++;
-                }
-            }
-        }else {
-            if (eartags.contains("-")){
-                String start = eartags.substring(0, eartags.indexOf("-"));
-                if (start.length() != 15){
-                    return new Result(10001,"耳标号"+eartags+"格式错误",false);
-                }
-                String end = eartags.substring(eartags.indexOf("-") + 1);
-                if (end.length() != 3){
-                    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);
-                if (Integer.parseInt(substring1) >Integer.parseInt(end)){
-                    return new Result(10001,"耳标号"+eartags+"格式错误,包含-号耳标号需递增",false);
-                }
-                List<String> eartagNos = new ArrayList<>();
-                for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
-                    eartagNos.add(substring+i);
-                }
-                for (String number : eartagNos) {
-                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", number).eq("inspection_num",inspectionNum));
-                    if (ObjectUtil.isEmpty(baseAnimal)){
-                        return new Result(10001,"耳标号"+number+"不存在",false);
-                    }
-                    if (baseAnimal.getIsDie() == 1){
-                        return new Result(10001,"耳标号"+number+"畜种已死亡",false);
-                    }
-                    if (!baseAnimal.getBelongToUser().equals(billLandingInspection.getCreateUser())){
-                        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.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                        newUser.setAccoutType(1);
-                        newUser.setCreateTime(DateTime.now());
-                        newUser.setIsRealName(0);
-                        sysUserMapper.insert(newUser);
-                        baseAnimal.setBelongToUser(newUser.getId());
-                    }else {
-                        baseAnimal.setBelongToUser(sysUser.getId());
-                    }
-                    baseAnimal.setBuyerName(buyer);
-                    baseAnimal.setSellerName(seller);
-                    baseAnimal.setAnimalStatus(2);
-                    baseAnimal.setBuyTime(DateTime.now());
-                    baseAnimalMapper.updateById(baseAnimal);
-                    sum++;
-                }
+        String[] eartag = eartags.split(",");
+       if (eartag.length != total){
+           return new Result(10001,"交易数量与实际耳标号数量不符!",false);
+       }
+        for (String eartagNo : eartag) {
+            BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartagNo));
+            if (ObjectUtil.isEmpty(sysUser)){
+                SysUser newUser = new SysUser();
+                newUser.setUserName(buyer);
+                newUser.setPhone(buyerPhone);
+                newUser.setUserType(3);
+                newUser.setAccoutType(1);
+                newUser.setCreateTime(DateTime.now());
+                newUser.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                newUser.setIsRealName(0);
+                sysUserMapper.insert(newUser);
+                baseAnimal.setBelongToUser(newUser.getId());
             }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.getIsDie() == 1){
-                    return new Result(10001,"耳标号"+eartags+"畜种已死亡",false);
-                }
-                if (!baseAnimal.getBelongToUser().equals(billLandingInspection.getCreateUser())){
-                    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.setAccoutType(1);
-                    newUser.setPhone(buyerPhone);
-                    newUser.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
-                    newUser.setCreateTime(DateTime.now());
-                    newUser.setIsRealName(0);
-                    sysUserMapper.insert(newUser);
-                    baseAnimal.setBelongToUser(newUser.getId());
-                }else {
-                    baseAnimal.setBelongToUser(sysUser.getId());
-                }
-                baseAnimal.setBuyerName(buyer);
-                baseAnimal.setSellerName(seller);
-                baseAnimal.setAnimalStatus(2);
-                baseAnimal.setBuyTime(DateTime.now());
-                baseAnimalMapper.updateById(baseAnimal);
-                sum++;
+                baseAnimal.setBelongToUser(sysUser.getId());
             }
-        }
-
-        if (total != sum){
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new Result(10001,"实际耳标数量和填写数量不符!",false);
+            baseAnimal.setBuyerName(buyer);
+            baseAnimal.setSellerName(seller);
+            baseAnimal.setAnimalStatus(2);
+            baseAnimal.setBuyTime(DateTime.now());
+            baseAnimalMapper.updateById(baseAnimal);
         }
         String content = UploadImage.getImageCom(image1);
         String content2 = UploadImage.getImageCom(image2);