修改交易接口

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

@@ -35,7 +35,7 @@ public class BillBuyInfoController {
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         Page<BillBuyInfo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS,billBuyInfoService.page(page,new QueryWrapper<BillBuyInfo>().orderByDesc("create_time")));
+        return new Result(ResultCode.SUCCESS,billBuyInfoService.page(page,new QueryWrapper<BillBuyInfo>().orderByDesc("create_time").eq("bill_buy_status",2)));
     }
 
     @PostMapping("/addTransaction")

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

@@ -15,6 +15,7 @@ import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jdk.nashorn.internal.parser.Token;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -117,22 +118,39 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         }
         String content3 = "http://139.9.167.178/images/"+path3 +"/"+imgname3;
 
-        BillBuyInfo billBuyInfo = new BillBuyInfo();
-        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);
+        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.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.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);
+        }
 
-        if (eartags.contains(";")){
-            String[] eartag = eartags.split(";");
+
+        if (eartags.contains(",")){
+            String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
                     String start = input.substring(0, input.indexOf("-"));
@@ -145,7 +163,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     }
                     for (Integer number : numbers) {
                         String earatgNo = number.toString();
-                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                        BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo).eq("inspection_num",inspectionNum));
                         if (ObjectUtil.isEmpty(baseAnimal)){
                             return new Result(10001,"耳标号不存在",false);
                         }
@@ -157,7 +175,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                         baseAnimalMapper.updateById(baseAnimal);
                     }
                 }else {
-                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input));
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", input).eq("inspection_num",inspectionNum));
                     if (ObjectUtil.isEmpty(baseAnimal)){
                         return new Result(10001,"耳标号不存在",false);
                     }
@@ -181,7 +199,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                 }
                 for (Integer number : numbers) {
                     String earatgNo = number.toString();
-                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo));
+                    BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", earatgNo).eq("inspection_num",inspectionNum));
                     if (ObjectUtil.isEmpty(baseAnimal)){
                         return new Result(10001,"耳标号不存在",false);
                     }
@@ -193,7 +211,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
                     baseAnimalMapper.updateById(baseAnimal);
                 }
             }else {
-                BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags));
+                BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartags).eq("inspection_num",inspectionNum));
                 if (ObjectUtil.isEmpty(baseAnimal)){
                     return new Result(10001,"耳标号不存在",false);
                 }
@@ -279,28 +297,47 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
         }
         String content3 = "http://139.9.167.178/images/"+path3 +"/"+imgname3;
 
-        BillBuyInfo billBuyInfo = new BillBuyInfo();
-        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(1);
-        this.save(billBuyInfo);
+        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.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(1);
+            this.save(billBuyInfo);
+        }else {
+            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(1);
+            this.updateById(billBuyInfo1);
+        }
         return Result.SUCCESS();
     }
 
     @Override
     public Result getLast(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        return new Result(ResultCode.SUCCESS, billBuyInfoMapper.selectList(new QueryWrapper<BillBuyInfo>()
-                .eq("bill_buy_status",1)
-                .eq("create_user",TokenSign.getUserName(httpServletRequest))
-                .orderByDesc("create_time")
-                .last("limit 1")));
+        BillBuyInfo billBuyInfo = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>()
+                .eq("bill_buy_status", 1)
+                .eq("create_user", TokenSign.getUserName(httpServletRequest)));
+        if (ObjectUtil.isEmpty(billBuyInfo)){
+            return new Result(ResultCode.SUCCESS,null);
+        }else {
+            return new Result(ResultCode.SUCCESS,billBuyInfo);
+        }
     }
 }

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

@@ -83,8 +83,8 @@ 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();
 
-        if (eartags.contains(";")){
-            String[] eartag = eartags.split(";");
+        if (eartags.contains(",")){
+            String[] eartag = eartags.split(",");
             for (String input : eartag) {
                 if (input.contains("-")){
                     String start = input.substring(0, input.indexOf("-"));
@@ -246,8 +246,8 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
             }
             isolation.setIsDead(1);
             isolation.setDeaths(deaths);
-            if (deaths.contains(";")){
-                String[] eartag = deaths.split(";");
+            if (deaths.contains(",")){
+                String[] eartag = deaths.split(",");
                 for (String s : eartag) {
                     if (!s.contains("-")){
                         BaseAnimal baseAnimal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", s));

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

@@ -177,7 +177,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     @Transactional
     public Result addApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
         String eartagNo = billSubsidy.getEartagNo();
-        String[] eartags = eartagNo.split(";");
+        String[] eartags = eartagNo.split(",");
         for (String eartag : eartags) {
             if (!eartag.contains("-")){
                 BaseAnimal animal = baseAnimalMapper.selectOne(new QueryWrapper<BaseAnimal>().eq("earatg_no", eartag));