fix：“优化分销申请接口”

src/main/java/com/szwl/controller/TProportionCheckController.java

@@ -137,9 +137,6 @@ public class TProportionCheckController {
                 tProportion.setMerchantName(tProportionCheck.getMerchantName());
                 tProportion.setPersonageName(tProportionCheck.getPersonageName());
                 tProportionService.updateById(tProportion);
-                tProportionCheck.setCheckType("1");
-                tProportionCheck.setModifyDate(new Date());
-                tProportionCheckService.updateById(tProportionCheck);
                 //发短信 todo
             }else{
                 TProportion tProportion = new TProportion();
@@ -162,6 +159,9 @@ public class TProportionCheckController {
                 tProportion.setPersonageName(tProportionCheck.getPersonageName());
                 tProportionService.save(tProportion);
             }
+            tProportionCheck.setCheckType("1");
+            tProportionCheck.setModifyDate(new Date());
+            tProportionCheckService.updateById(tProportionCheck);
         }else {
             //拒绝
             TProportionCheck tShandeMchCheck = tProportionCheckService.getById(id);

src/main/java/com/szwl/controller/TProportionController.java

@@ -279,10 +279,11 @@ public class TProportionController {
         query1.eq(TEquipment::getAdminId,tProportion.getAdminId());
         query1.eq(TEquipment::getClientId,tProportion.getClientId());
         List<TEquipment> equipmentList = tEquipmentService.list(query1);
-        if(equipmentList.size()<=0){
+        TEquipment equipment = tEquipmentService.getOne(query1);
+        if(equipment == null){
             return R.fail("找不到该机器！");
         }
-        TEquipment equipment = equipmentList.get(0);
+//        TEquipment equipment = equipmentList.get(0);
         //查看是否有审核中的
         LambdaQueryWrapper<TProportionCheck> queryCheck = Wrappers.lambdaQuery();
         queryCheck.eq(TProportionCheck::getAdminId,tProportion.getAdminId());
@@ -300,10 +301,11 @@ public class TProportionController {
             //1个
             LambdaQueryWrapper<TAdmin> queryTAdmin = Wrappers.lambdaQuery();
             queryTAdmin.eq(TAdmin::getUsername,tProportion.getAgencyName());
-            List<TAdmin> admins = adminService.list(queryTAdmin);
-            if(admins.size()>0){
-                TAdmin tAdmin = admins.get(0);
-                agencyId = tAdmin.getId();
+//            List<TAdmin> admins = adminService.list(queryTAdmin);
+            TAdmin admins = adminService.getOne(queryTAdmin);
+            if(admins != null){
+//                TAdmin tAdmin = admins.get(0);
+                agencyId = admins.getId();
             }else {
                 return R.fail("找不到第一个分账人！");
             }
@@ -312,10 +314,11 @@ public class TProportionController {
             //2个
             LambdaQueryWrapper<TAdmin> queryTAdmin1 = Wrappers.lambdaQuery();
             queryTAdmin1.eq(TAdmin::getUsername,tProportion.getMerchantName());
-            List<TAdmin> admins1 = adminService.list(queryTAdmin1);
-            if(admins1.size()>0){
-                TAdmin tAdmin = admins1.get(0);
-                merchantId = tAdmin.getId();
+//            List<TAdmin> admins1 = adminService.list(queryTAdmin1);
+            TAdmin admins1 = adminService.getOne(queryTAdmin1);
+            if(admins1 != null){
+//                TAdmin tAdmin = admins1.get(0);
+                merchantId = admins1.getId();
             }else {
                 return R.fail("找不到第二个分账人！");
             }
@@ -324,10 +327,11 @@ public class TProportionController {
             //3个
             LambdaQueryWrapper<TAdmin> queryTAdmin2 = Wrappers.lambdaQuery();
             queryTAdmin2.eq(TAdmin::getUsername,tProportion.getPersonageName());
-            List<TAdmin> admins2 = adminService.list(queryTAdmin2);
-            if(admins2.size()>0){
-                TAdmin tAdmin = admins2.get(0);
-                personageId = tAdmin.getId();
+//            List<TAdmin> admins2 = adminService.list(queryTAdmin2);
+            TAdmin admins2 = adminService.getOne(queryTAdmin2);
+            if(admins2 != null){
+//                TAdmin tAdmin = admins2.get(0);
+                personageId = admins2.getId();
             }else {
                 return R.fail("找不到第三个分账人！");
             }
@@ -336,10 +340,11 @@ public class TProportionController {
         LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
         query.eq(TProportion::getAdminId,tProportion.getAdminId());
         query.eq(TProportion::getClientId,tProportion.getClientId());
-        List<TProportion> list = tProportionService.list(query);
-        if(list.size()>0){
+//        List<TProportion> list = tProportionService.list(query);
+        TProportion proportion = tProportionService.getOne(query);
+        if(proportion != null){
             //已有，属于第二次提交信息，需要审核
-            TProportion oldProportion = list.get(0);
+//            TProportion oldProportion = list.get(0);
             //已有，判断是否为99%和1%组合
 //            if(tProportion.getProportion().compareTo(new BigDecimal("99"))==0&&tProportion.getAdminProportion().compareTo(new BigDecimal("1"))==0){
 //                oldProportion.setAgencyId(agencyId);