修改交易逻辑，生成产地检

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/EartagUtil.java

@@ -0,0 +1,91 @@
+package com.huimv.farm.damsubsidy.common.utils;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.farm.damsubsidy.entity.EartagResult;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class EartagUtil {
+
+    //获取耳标集合
+    public static EartagResult getEartagCollection(String eartagStr){
+        //12+3,
+        //12+3-3
+        //12+3-3,3,3,3,
+        //12+3-3,3,3,3,12+3,3
+        //12+3-3,3,3,3,12+3-3
+        EartagResult eartagResult = new EartagResult();
+        if ( StringUtils.isBlank(eartagStr)){
+            eartagResult.setMsg("耳标号为空");
+            eartagResult.setSuccess(false);
+            return eartagResult;
+        }
+        List<String> endList  = new ArrayList();
+        Set<String> endSet  = new HashSet<>();
+        eartagStr = eartagStr.replaceAll("，",",").replaceAll(" ","");
+        String[] split = eartagStr.split(",");
+        String firstEartag = split[0];
+
+        if (firstEartag.length() != 15 && firstEartag.length() != 19){
+            eartagResult.setMsg("耳标"+firstEartag+"格式不正确");
+            eartagResult.setSuccess(false);
+            return eartagResult;
+        }
+        String eartagPrefix = "";
+        for (String eartag : split) {
+            String newEartag ;
+            int eartagLength = eartag.length();
+            if (eartagLength ==3 ){
+                newEartag =  eartagPrefix +eartag;
+                endList.add(newEartag);
+                endSet.add(newEartag);
+            }    else if (eartagLength ==15 ){
+                eartagPrefix =  eartag.substring(0,12);
+                newEartag =  eartagPrefix +eartag;
+                endList.add(newEartag);
+                endSet.add(newEartag);
+            }  else   if (eartagLength ==19){
+                eartagPrefix =  eartag.substring(0,12);
+                Integer eartagStart = Integer.parseInt(eartag.substring(12, 15));
+                Integer eartagEnd = Integer.parseInt(eartag.substring(16));
+                if (eartagEnd <= eartagStart){
+                    eartagResult.setMsg("耳标"+firstEartag+"格式不正确");
+                    eartagResult.setSuccess(false);
+                    return eartagResult;
+                }
+
+                for (Integer integer = eartagStart; integer <= eartagEnd; integer++) {
+                    newEartag =  eartagPrefix +getStr(eartagStart,3);
+                    endList.add(newEartag);
+                    endSet.add(newEartag);
+                }
+
+            }else {
+                eartagResult.setMsg("耳标"+firstEartag+"格式不正确");
+                eartagResult.setSuccess(false);
+                return eartagResult;
+            }
+
+        }
+        eartagResult.setSuccess(true);
+        eartagResult.setMsg("解析成功");
+        eartagResult.setEartagList(endList);
+        eartagResult.setEartagSet(endSet);
+
+        return eartagResult;
+    }
+
+    //补零
+    private static String getStr(Integer eartagStart,Integer num) {
+        StringBuilder eartagStr = new StringBuilder(eartagStart.toString());
+        for (int integer = 0; integer < num; integer++) {
+            if (eartagStr.length() < num){
+                eartagStr.insert(0, "0");
+            }
+        }
+        return eartagStr.toString();
+    }
+}

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

@@ -66,12 +66,22 @@ public class BillBuyInfoController {
                                  @RequestParam("image1") MultipartFile image1,
                                  @RequestParam("image2") MultipartFile image2,
                                  @RequestParam("inspectionNum") String inspectionNum,
+                                 @RequestParam("cargoOwner") String cargoOwner,
+                                 @RequestParam("ownerPhone") String ownerPhone,
+                                 @RequestParam("animalType") String animalType,
+                                 @RequestParam("animalNumberUp") String animalNumberUp,
+                                 @RequestParam("useTo") String useTo,
+                                 @RequestParam("startTran") String startTran,
+                                 @RequestParam("reachTran") String reachTran,
+                                 @RequestParam("veterId") String veter,
+                                 @RequestParam("eartags") String eartags,
                                  @RequestParam("seller") String seller,
+                                 @RequestParam("sellerId") String sellerId,
                                  @RequestParam("buyer") String buyer,
-                                 @RequestParam("num") String num,
-                                 @RequestParam("eartags") String eartags,
+                                 @RequestParam("buyerId") String buyerId,
+                                 @RequestParam("sellerPhone") String sellerPhone,
                                  @RequestParam("buyerPhone")String buyerPhone) throws IOException {
-        return billBuyInfoService.addTransaction(httpServletRequest,buyImage1,buyImage2,buyImage3,buyImage4,buyImage5,image1,image2,inspectionNum,seller,buyer,num,eartags,buyerPhone);
+        return billBuyInfoService.addTransaction(httpServletRequest,buyImage1,buyImage2,buyImage3,buyImage4,buyImage5,image1,image2,inspectionNum,cargoOwner,ownerPhone,animalType,animalNumberUp,useTo,startTran,reachTran,veter,seller,sellerId,buyer,buyerId,eartags,buyerPhone,sellerPhone);
     }
 
     @PostMapping("/saveTransaction")

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

@@ -411,4 +411,14 @@ public class SysUserController {
     public Result listCompany(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
         return iSysUserService.listCompany(httpServletRequest,paramsMap);
     }
+
+    @PostMapping("/listSeller")
+    public Result listSeller(){
+        return iSysUserService.listSeller();
+    }
+
+    @PostMapping("/listBuyer")
+    public Result listBuyer(){
+        return iSysUserService.listBuyer();
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillBuyInfo.java

@@ -89,6 +89,8 @@ public class BillBuyInfo  extends BaseEntity implements Serializable {
 
     private String buyerPhone;
 
+    private String sellerPhone;
+
     private Long buyerId;
 
     private Long sellerId;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/EartagResult.java

@@ -0,0 +1,15 @@
+package com.huimv.farm.damsubsidy.entity;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
+
+@Data
+public class EartagResult {
+    private Boolean success;
+    private String msg;
+    private List<String> eartagList;
+    private Set<String> eartagSet;
+
+}

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

@@ -68,4 +68,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     Result listCompany(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    Result listSeller();
+
+    Result listBuyer();
 }

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

@@ -631,4 +631,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return new Result(ResultCode.SUCCESS,userMapper.selectPage(page,queryWrapper));
     }
 
+    @Override
+    public Result listSeller() {
+        List<SysUser> seller = this.list(new QueryWrapper<SysUser>().in("user_type", 2, 3).eq("is_real_name", 1));
+        return new Result(ResultCode.SUCCESS,seller);
+    }
+
+    @Override
+    public Result listBuyer() {
+        List<SysUser> buyer = this.list(new QueryWrapper<SysUser>().in("user_type", 3).eq("is_real_name", 1));
+        return new Result(ResultCode.SUCCESS,buyer);
+    }
+
 }