licailing 4 лет назад
Родитель
Сommit
bdec229824

+ 2 - 0
src/main/java/com/izouma/wenlvju/repo/TrainingInstitutionRepo.java

@@ -21,4 +21,6 @@ public interface TrainingInstitutionRepo extends JpaRepository<TrainingInstituti
     List<TrainingInstitution> findAllByPhoneIsNull();
     List<TrainingInstitution> findAllByPhoneIsNull();
 
 
     List<TrainingInstitution> findAllByNameLike(String name);
     List<TrainingInstitution> findAllByNameLike(String name);
+
+    TrainingInstitution findByUscc(String uscc);
 }
 }

+ 11 - 0
src/main/java/com/izouma/wenlvju/service/TrainingInstitutionService.java

@@ -6,6 +6,7 @@ import com.izouma.wenlvju.domain.TrainingInstitution;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.ProgUploadDTO;
 import com.izouma.wenlvju.dto.ProgUploadDTO;
 import com.izouma.wenlvju.dto.TrainingInstitutionDTO;
 import com.izouma.wenlvju.dto.TrainingInstitutionDTO;
+import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.TrainingInstitutionRepo;
 import com.izouma.wenlvju.repo.TrainingInstitutionRepo;
 import com.izouma.wenlvju.service.sms.NjwlSmsService;
 import com.izouma.wenlvju.service.sms.NjwlSmsService;
 import com.izouma.wenlvju.utils.JpaUtils;
 import com.izouma.wenlvju.utils.JpaUtils;
@@ -77,4 +78,14 @@ public class TrainingInstitutionService {
         this.batchSend(dtos.stream().map(TrainingInstitutionDTO::getPhone).collect(Collectors.toList()));
         this.batchSend(dtos.stream().map(TrainingInstitutionDTO::getPhone).collect(Collectors.toList()));
 
 
     }
     }
+
+    public TrainingInstitution byUscc(String name, String uscc) {
+        TrainingInstitution byUscc = trainingInstitutionRepo.findByUscc(uscc);
+        if (ObjectUtil.isNotNull(byUscc)) {
+            if (byUscc.getName().equals(name)) {
+                return byUscc;
+            }
+        }
+        throw new BusinessException("企业名称或税号不正确");
+    }
 }
 }

+ 10 - 0
src/main/java/com/izouma/wenlvju/web/TrainingInstitutionController.java

@@ -82,5 +82,15 @@ public class TrainingInstitutionController extends BaseController {
     public void uploadFile(@RequestParam("file") MultipartFile file) throws Exception {
     public void uploadFile(@RequestParam("file") MultipartFile file) throws Exception {
         trainingInstitutionService.upload(file);
         trainingInstitutionService.upload(file);
     }
     }
+
+    @PostMapping("/name")
+    public Page<String> name(@RequestBody PageQuery pageQuery) {
+        return trainingInstitutionService.all(pageQuery).map(TrainingInstitution::getName);
+    }
+
+    @PostMapping("/byUscc")
+    public TrainingInstitution byUscc(@RequestParam String name, @RequestParam String uscc) {
+        return trainingInstitutionService.byUscc(name, uscc);
+    }
 }
 }
 
 

+ 1 - 3
src/test/java/com/izouma/wenlvju/service/sms/NjwlSmsServiceTest.java

@@ -11,10 +11,8 @@ public class NjwlSmsServiceTest extends ApplicationTests {
 
 
     @Test
     @Test
     public void test() {
     public void test() {
-        njwlSmsService.sendSms("19951988293", "test");
+        njwlSmsService.sendSms("15150689190", "http://wljtest.izouma.com/h5/trainingInstitution");
         // {"expiryDate":"1623808467934","tokenKey":"1fb4796840d8a7b8d43e022e5a1f693c","data":{"phone":"19951988293","message":"test"},"appId":"189610","operationType":"ADD"}
         // {"expiryDate":"1623808467934","tokenKey":"1fb4796840d8a7b8d43e022e5a1f693c","data":{"phone":"19951988293","message":"test"},"appId":"189610","operationType":"ADD"}
-
-
     }
     }
 
 
     @Test
     @Test