修改属于人

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

@@ -47,8 +47,9 @@ public class BillBuyInfoController {
                                  @RequestParam("seller") String seller,
                                  @RequestParam("buyer") String buyer,
                                  @RequestParam("num") String num,
-                                 @RequestParam("eartags") String eartags){
-        return billBuyInfoService.addTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags);
+                                 @RequestParam("eartags") String eartags,
+                                 @RequestParam("buyerPhone")String buyerPhone){
+        return billBuyInfoService.addTransaction(httpServletRequest,image1,image2,image3,inspectionNum,seller,buyer,num,eartags,buyerPhone);
     }
 
     @PostMapping("/saveTransaction")

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

@@ -37,7 +37,7 @@ public class BaseAnimal extends BaseEntity implements Serializable {
     /**
      * 所属人
      */
-    private String belongToUser;
+    private Long belongToUser;
 
     /**
      * 0肉牛，1羊，2猪

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

@@ -54,7 +54,7 @@ public class BaseEntity implements Serializable {
      * 创建人
      */
     @TableField(fill = FieldFill.INSERT)
-    private String createUser;
+    private Long createUser;
 
     /**
      * 更新时间

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

@@ -80,6 +80,8 @@ public class BillBuyInfo  extends BaseEntity implements Serializable {
      */
     private Integer billBuyStatus;
 
+    private String buyerPhone;
+
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -17,5 +17,5 @@ public interface BillBuyInfoMapper extends BaseMapper<BillBuyInfo> {
 
     BillBuyInfoVo listDetail(@Param("id") String id);
 
-    BillBuyInfoVo getLast(@Param("userName") String userName);
+    BillBuyInfoVo getLast(@Param("userName") Long userName);
 }

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

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface IBillBuyInfoService extends IService<BillBuyInfo> {
 
-    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags);
+    Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone);
 
     Result saveTransaction(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 

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

@@ -31,7 +31,7 @@ public class BaseAnimalServiceImpl extends ServiceImpl<BaseAnimalMapper, BaseAni
         String inspectionNum = paramsMap.get("inspectionNum");
         List<BaseAnimal> baseAnimals = this.list(new QueryWrapper<BaseAnimal>()
                 .eq("inspection_num", inspectionNum).eq("is_die",0)
-                .eq("animal_status",2).eq("is_loated",0).eq("belong_to_user", TokenSign.getUserName(httpServletRequest)));
+                .in("animal_status",1,2).eq("is_loated",0).eq("belong_to_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)));
         if (ObjectUtil.isEmpty(baseAnimals)) {
             return new Result(10001,"该检疫批次中无符合要求的畜种！",false);
         }else {

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

@@ -12,8 +12,10 @@ import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.huimv.farm.damsubsidy.entity.BillBuyInfoVo;
+import com.huimv.farm.damsubsidy.entity.SysUser;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
+import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jdk.nashorn.internal.parser.Token;
@@ -46,10 +48,12 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
     private BaseAnimalMapper baseAnimalMapper;
     @Resource
     private BillBuyInfoMapper billBuyInfoMapper;
+    @Resource
+    private SysUserMapper sysUserMapper;
 
     @Override
     @Transactional
-    public Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags) {
+    public Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) {
         String imgname = "成功";
         String originalFilename = image1.getOriginalFilename();
         String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
@@ -119,37 +123,8 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         }
         String content3 = "https://img.ifarmcloud.com/images/"+path3 +"/"+imgname3;
 
-        BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getUserName(httpServletRequest)).eq("bill_buy_status",1));
-        if (ObjectUtil.isEmpty(billBuyInfo1)){
-            BillBuyInfo billBuyInfo = new BillBuyInfo();
-            billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");
-            billBuyInfo.setInspectionNum(inspectionNum);
-            billBuyInfo.setBuyerName(buyer);
-            billBuyInfo.setSellerName(seller);
-            billBuyInfo.setCreateUser(TokenSign.getUserName(httpServletRequest));
-            billBuyInfo.setCreateTime(DateTime.now());
-            billBuyInfo.setRealNumUp(num);
-            billBuyInfo.setBuyPicUrl(content);
-            billBuyInfo.setPayPicUrl(content2);
-            billBuyInfo.setBuyPayGoodsPicUrl(content3);
-            billBuyInfo.setRealEartag(eartags);
-            billBuyInfo.setBillBuyStatus(2);
-            this.save(billBuyInfo);
-        }else {
-            billBuyInfo1.setBuyName(seller+"和"+buyer+"的交易信息");
-            billBuyInfo1.setInspectionNum(inspectionNum);
-            billBuyInfo1.setBuyerName(buyer);
-            billBuyInfo1.setSellerName(seller);
-            billBuyInfo1.setCreateUser(TokenSign.getUserName(httpServletRequest));
-            billBuyInfo1.setCreateTime(DateTime.now());
-            billBuyInfo1.setRealNumUp(num);
-            billBuyInfo1.setBuyPicUrl(content);
-            billBuyInfo1.setPayPicUrl(content2);
-            billBuyInfo1.setBuyPayGoodsPicUrl(content3);
-            billBuyInfo1.setRealEartag(eartags);
-            billBuyInfo1.setBillBuyStatus(2);
-            this.updateById(billBuyInfo1);
-        }
+        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 (eartags.contains(",")){
             String[] eartag = eartags.split(",");
@@ -174,7 +149,17 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                         if (ObjectUtil.isEmpty(baseAnimal)){
                             return new Result(10001,"耳标号不存在",false);
                         }
-                        baseAnimal.setBelongToUser(buyer);
+                        if (ObjectUtil.isEmpty(sysUser)){
+                            SysUser newUser = new SysUser();
+                            newUser.setUserName(buyer);
+                            newUser.setPhone(buyerPhone);
+                            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);
@@ -182,6 +167,10 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                         baseAnimalMapper.updateById(baseAnimal);
                     }
                 }else {
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input).eq("inspection_num",inspectionNum));
+                    if (ObjectUtil.isEmpty(baseAnimal)){
+                        return new Result(10001,"耳标号不存在",false);
+                    }
                     if (input.length() != 15){
                         return new Result(10001,"耳标号格式错误",false);
                     }
@@ -189,11 +178,17 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     if (num2 != 0){
                         return new Result(10001,"耳标号重复",false);
                     }
-                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input).eq("inspection_num",inspectionNum));
-                    if (ObjectUtil.isEmpty(baseAnimal)){
-                        return new Result(10001,"耳标号不存在",false);
+                    if (ObjectUtil.isEmpty(sysUser)){
+                        SysUser newUser = new SysUser();
+                        newUser.setUserName(buyer);
+                        newUser.setPhone(buyerPhone);
+                        newUser.setCreateTime(DateTime.now());
+                        newUser.setIsRealName(0);
+                        sysUserMapper.insert(newUser);
+                        baseAnimal.setBelongToUser(newUser.getId());
+                    }else {
+                        baseAnimal.setBelongToUser(sysUser.getId());
                     }
-                    baseAnimal.setBelongToUser(buyer);
                     baseAnimal.setBuyerName(buyer);
                     baseAnimal.setSellerName(seller);
                     baseAnimal.setAnimalStatus(2);
@@ -214,6 +209,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 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,"耳标号格式错误",false);
+                }
                 List<String> eartagNos = new ArrayList<>();
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                     eartagNos.add(substring+i);
@@ -223,7 +221,17 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     if (ObjectUtil.isEmpty(baseAnimal)){
                         return new Result(10001,"耳标号不存在",false);
                     }
-                    baseAnimal.setBelongToUser(buyer);
+                    if (ObjectUtil.isEmpty(sysUser)){
+                        SysUser newUser = new SysUser();
+                        newUser.setUserName(buyer);
+                        newUser.setPhone(buyerPhone);
+                        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);
@@ -235,7 +243,17 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 if (ObjectUtil.isEmpty(baseAnimal)){
                     return new Result(10001,"耳标号不存在",false);
                 }
-                baseAnimal.setBelongToUser(buyer);
+                if (ObjectUtil.isEmpty(sysUser)){
+                    SysUser newUser = new SysUser();
+                    newUser.setUserName(buyer);
+                    newUser.setPhone(buyerPhone);
+                    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);
@@ -243,6 +261,41 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 baseAnimalMapper.updateById(baseAnimal);
             }
         }
+
+        if (ObjectUtil.isEmpty(billBuyInfo1)){
+            BillBuyInfo billBuyInfo = new BillBuyInfo();
+            billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");
+            billBuyInfo.setInspectionNum(inspectionNum);
+            billBuyInfo.setBuyerName(buyer);
+            billBuyInfo.setSellerName(seller);
+            billBuyInfo.setBuyerPhone(buyerPhone);
+            billBuyInfo.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+            billBuyInfo.setCreateTime(DateTime.now());
+            billBuyInfo.setRealNumUp(num);
+            billBuyInfo.setBuyPicUrl(content);
+            billBuyInfo.setPayPicUrl(content2);
+            billBuyInfo.setBuyPayGoodsPicUrl(content3);
+            billBuyInfo.setRealEartag(eartags);
+            billBuyInfo.setBillBuyStatus(2);
+            this.save(billBuyInfo);
+        }else {
+            billBuyInfo1.setBuyName(seller+"和"+buyer+"的交易信息");
+            billBuyInfo1.setInspectionNum(inspectionNum);
+            billBuyInfo1.setBuyerName(buyer);
+            billBuyInfo1.setSellerName(seller);
+            billBuyInfo1.setBuyerPhone(buyerPhone);
+            billBuyInfo1.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+            billBuyInfo1.setCreateTime(DateTime.now());
+            billBuyInfo1.setRealNumUp(num);
+            billBuyInfo1.setBuyPicUrl(content);
+            billBuyInfo1.setPayPicUrl(content2);
+            billBuyInfo1.setBuyPayGoodsPicUrl(content3);
+            billBuyInfo1.setRealEartag(eartags);
+            billBuyInfo1.setBillBuyStatus(2);
+            this.updateById(billBuyInfo1);
+        }
+
+
         return Result.SUCCESS();
     }
 
@@ -254,6 +307,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         String buyer = paramsMap.get("buyer");
         String num = paramsMap.get("num");
         String eartags = paramsMap.get("eartags");
+        String buyerPhone = paramsMap.get("buyerPhone");
 //        String imgname = "成功";
 //        String originalFilename = image1.getOriginalFilename();
 //        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
@@ -329,8 +383,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             billBuyInfo.setBuyName(seller+"和"+buyer+"的交易信息");
             billBuyInfo.setInspectionNum(inspectionNum);
             billBuyInfo.setBuyerName(buyer);
+            billBuyInfo1.setBuyerPhone(buyerPhone);
             billBuyInfo.setSellerName(seller);
-            billBuyInfo.setCreateUser(TokenSign.getUserName(httpServletRequest));
+            billBuyInfo.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
             billBuyInfo.setCreateTime(DateTime.now());
             billBuyInfo.setRealNumUp(num);
 //            billBuyInfo.setBuyPicUrl(content);
@@ -343,8 +398,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             billBuyInfo1.setBuyName(seller+"和"+buyer+"的交易信息");
             billBuyInfo1.setInspectionNum(inspectionNum);
             billBuyInfo1.setBuyerName(buyer);
+            billBuyInfo1.setBuyerPhone(buyerPhone);
             billBuyInfo1.setSellerName(seller);
-            billBuyInfo1.setCreateUser(TokenSign.getUserName(httpServletRequest));
+            billBuyInfo1.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
             billBuyInfo1.setCreateTime(DateTime.now());
             billBuyInfo1.setRealNumUp(num);
 //            billBuyInfo1.setBuyPicUrl(content);
@@ -359,7 +415,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
 
     @Override
     public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        BillBuyInfoVo billBuyInfo = billBuyInfoMapper.getLast(TokenSign.getUserName(httpServletRequest));
+        BillBuyInfoVo billBuyInfo = billBuyInfoMapper.getLast(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         if (ObjectUtil.isEmpty(billBuyInfo)){
             return new Result(ResultCode.SUCCESS,null);
         }else {

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

@@ -79,7 +79,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         billIsolated.setDayIsolated(Integer.parseInt(dayIsolated));
         billIsolated.setEndIsolated(endTime);
         billIsolated.setCreateTime(DateTime.now());
-        billIsolated.setCreateUser(TokenSign.getUserName(httpServletRequest));
+        billIsolated.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
 
 
         BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
@@ -101,7 +101,6 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     String substring = start.substring(0, start.length() - end.length());
                     System.out.println(substring);
                     List<String> eartagNos = new ArrayList<>();
-                    //TODO
                     if (Integer.parseInt(substring1) >Integer.parseInt(end) ){
                         return new Result(10001,"耳标号格式错误",false);
                     }
@@ -117,8 +116,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                         baseAnimal.setEaratgNo(eartagNo);
                         baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                         baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                        baseAnimal.setBelongToUser(userName);
-                        baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                        baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                        baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                         baseAnimal.setCreateTime(new Date());
                         baseAnimalMapper.insert(baseAnimal);
                     }
@@ -134,8 +133,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimal.setEaratgNo(input);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                    baseAnimal.setBelongToUser(userName);
-                    baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     baseAnimal.setCreateTime(new Date());
                     baseAnimalMapper.insert(baseAnimal);
                 }
@@ -154,6 +153,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 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);
+                }
                 for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                     eartagNos.add(substring+i);
                 }
@@ -166,8 +168,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     baseAnimal.setEaratgNo(number);
                     baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                     baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                    baseAnimal.setBelongToUser(userName);
-                    baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                    baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                    baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                     baseAnimal.setCreateTime(new Date());
                     baseAnimalMapper.insert(baseAnimal);
                 }
@@ -183,13 +185,12 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                 baseAnimal.setEaratgNo(eartags);
                 baseAnimal.setAnimalType(billLandingInspection.getAnimalType());
                 baseAnimal.setInspectionNum(billLandingInspection.getInspectionNum());
-                baseAnimal.setBelongToUser(userName);
-                baseAnimal.setCreateUser(TokenSign.getUserName(httpServletRequest));
+                baseAnimal.setBelongToUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+                baseAnimal.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
                 baseAnimal.setCreateTime(new Date());
                 baseAnimalMapper.insert(baseAnimal);
             }
         }
-
         billLandingInspection.setInspectionSch(3);
         billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
         billLandingInspection.setReviewedTime(DateTime.now());
@@ -323,6 +324,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
                     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);
+                    }
                     List<String> eartagNos = new ArrayList<>();
                     for (int i = Integer.valueOf(substring1) ; i <=  Integer.valueOf(end); i++){
                         eartagNos.add(substring+i);

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

@@ -155,9 +155,11 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (this.count(landingInspectionQueryWrapper) != 0) {
             return new Result(10001, "存在相同检疫证号！", false);
         }
-        billLandingInspection.setInspectionName(TokenSign.getUserName(httpServletRequest) + "的落地检疫申请");
+        billLandingInspection.setCargoOwner(TokenSign.getUserName(httpServletRequest));
+        billLandingInspection.setOwnerPhone(TokenSign.getPhone(httpServletRequest));
+        billLandingInspection.setInspectionName(billLandingInspection.getCargoOwner() + "的落地检疫申请");
         billLandingInspection.setCreateTime(DateTime.now());
-        billLandingInspection.setCreateUser(TokenSign.getUserName(httpServletRequest));
+        billLandingInspection.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billLandingInspection.setInspectionType(0);
         if (this.save(billLandingInspection)) {
             return Result.SUCCESS();
@@ -168,13 +170,6 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
 
     @Override
     public Result cancelApplication(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        BillLandingInspection landingInspection = this.getById(billLandingInspection);
-//        landingInspection.setInspectionSch(5);
-//        if (this.updateById(landingInspection)) {
-//            return Result.SUCCESS();
-//        }else {
-//            return Result.FAIL();
-//        }
         String id = paramsMap.get("id");
         if (this.removeById(id)) {
             return Result.SUCCESS();
@@ -188,7 +183,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         String pageSize = paramsMap.get("pageSize");
         String pageNum = paramsMap.get("pageNum");
         String inspectionSch = paramsMap.get("inspectionSch");
-        String userName = TokenSign.getUserName(httpServletRequest);
+        Long userName = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         SysUser user = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("user_name", userName));
         Integer userType = user.getUserType();
 

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

@@ -221,7 +221,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         billSubsidy.setBankName(BankUtil.getname(bankCardId));
         billSubsidy.setSubsidyName(billSubsidy.getFarmerName()+"的补贴申请");
         billSubsidy.setCreateTime(DateTime.now());
-        billSubsidy.setCreateUser(TokenSign.getUserName(httpServletRequest));
+        billSubsidy.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         billSubsidy.setSubsidySch(0);
         String userName = TokenSign.getUserName(httpServletRequest);
         BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
@@ -235,7 +235,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
     @Override
     public Result saveApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
-        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));
         billSubsidy.setSubsidySch(7);
         billSubsidy.setCreateUser(userName);
@@ -330,7 +330,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         String subsidySch = paramsMap.get("subsidySch");
 //        String startTime = paramsMap.get("startTime");
 //        String endTime = paramsMap.get("endTime");
-        String userName = TokenSign.getUserName(httpServletRequest);
+        Long userName = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         Integer userType = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("user_name", userName)).getUserType();
 
         QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
@@ -381,7 +381,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
 
     @Override
     public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> parasMap) {
-        BillSubsidy billSubsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("creat_user", TokenSign.getUserName(httpServletRequest)).eq("subsidy_sch", 7));
+        BillSubsidy billSubsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("creat_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("subsidy_sch", 7));
         if (ObjectUtil.isEmpty(billSubsidy)){
             return new Result(ResultCode.SUCCESS,null);
         }else {

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

@@ -109,8 +109,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         Date date = new Date();
         sysUser.setCreateTime(date);
         sysUser.setUpdateTime(date);
-        sysUser.setCreateUser(userId + "");
-        sysUser.setUpdateUser(userId + "");
+        sysUser.setCreateUser(userId);
+        sysUser.setUpdateUser(userId+"");
         sysUser.setUserType(4);
         sysUser.setIsRealName(0);
         sysUser.setPid(Math.toIntExact(userId));
@@ -152,7 +152,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
         user.setCreateTime(new Date());
-        user.setCreateUser(paramsMap.get("userName"));
+//        user.setCreateUser(paramsMap.get("userName"));
         if (ObjectUtil.isNotEmpty(paramsMap.get("address"))) {
             user.setAddress(paramsMap.get("address"));
         }