From 60cfc56413c0e2c1805efec4a47cc3bc304204db Mon Sep 17 00:00:00 2001 From: 13009 Date: Wed, 26 Jun 2024 18:59:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20service=20=E5=BC=80=E6=88=B7=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonOpenAccountThreeElementRequest.java | 10 +-- .../v2/sms/model/SendVerifySignRequest.java | 21 ++++++ .../src/main/resources/application.properties | 2 +- .../api/test/service/AccountServiceTest.java | 67 +++++++++++++++++-- .../api/test/service/FaceServiceTest.java | 30 +++++++++ .../api/test/service/FileServiceTest.java | 1 - .../scfs/api/test/service/OcrServiceTest.java | 28 ++++++++ .../scfs/api/test/service/SmsServiceTest.java | 14 +++- 8 files changed, 161 insertions(+), 12 deletions(-) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonOpenAccountThreeElementRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonOpenAccountThreeElementRequest.java index f6bbb2c..8d2e1e8 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonOpenAccountThreeElementRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/PersonOpenAccountThreeElementRequest.java @@ -42,7 +42,7 @@ public class PersonOpenAccountThreeElementRequest implements ApiRequest { private String accountName; /** - * 证件类型 + * 证件类型 0：其他 1：身份证 2：户口本 3：学生证 4：军官证 5：武警证 6：士兵证 7：中国护照 8：香港通行证 9：澳门通行证 A：台湾通行证 B：外国护照 C：工商注册登记号 */ @SerializedName("id_type") private String idType; @@ -54,13 +54,13 @@ public class PersonOpenAccountThreeElementRequest implements ApiRequest { private String idNo; /** - * 证件有效起始日期 + * 证件有效起始日期 yyyy-MM-dd */ @SerializedName("id_startdate") private String idStartDate; /** - * 证件有效结束日期 + * 证件有效结束日期 yyyy-MM-dd */ @SerializedName("id_enddate") private String idEndDate; @@ -144,13 +144,13 @@ public class PersonOpenAccountThreeElementRequest implements ApiRequest { private String openIp; /** - * 开户日期 + * 开户日期 yyyy-MM-dd */ @SerializedName("open_date") private String openDate; /** - * 开户时间 + * 开户时间 yyyy-MM-dd HH:mm:ss */ @SerializedName("open_tradetime") private String openTradeTime; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/sms/model/SendVerifySignRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/sms/model/SendVerifySignRequest.java index 4af6f78..cb3083c 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/sms/model/SendVerifySignRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/sms/model/SendVerifySignRequest.java @@ -25,12 +25,21 @@ public class SendVerifySignRequest implements ApiRequest { @SerializedName("serial_no") private String serialNo; + /** + * 交易码=功能号 + */ @SerializedName("trade_no") private String tradeNo; + /** + * 模板编号 + */ @SerializedName("model_no") private String modelNo; + /** + * 交易类型 短信类型，0 开户 1购买 2充值 3提现 4换绑卡 5充值+购买 6购回 7签约+充值 8换绑手机号 9其他 + */ @SerializedName("trade_type") private String tradeType; @@ -40,15 +49,27 @@ public class SendVerifySignRequest implements ApiRequest { @SerializedName("amount") private String amount; + /** + * 银行卡卡号 + */ @SerializedName("card_no") private String cardNo; + /** + * 银行卡户名 + */ @SerializedName("card_name") private String cardName; + /** + * 证件号码 + */ @SerializedName("id_no") private String idNo; + /** + * 手机号 + */ @SerializedName("mobile") private String mobile; diff --git a/scfs-api-test/src/main/resources/application.properties b/scfs-api-test/src/main/resources/application.properties index 78d0af7..aa9ada9 100644 --- a/scfs-api-test/src/main/resources/application.properties +++ b/scfs-api-test/src/main/resources/application.properties @@ -1,5 +1,5 @@ scfs.api-gateway.online=false -scfs.api-gateway.host=http://10.131.98.80:8088/api-gateway +scfs.api-gateway.host=http://10.133.135.94:8088/api-gateway #scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway scfs.api-gateway.channel.channel-no=0000 scfs.api-gateway.channel.app-no=41 diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java index 72fa205..a227bf2 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java @@ -2,6 +2,8 @@ package com.czcb.scfs.api.test.service; import com.czcb.scfs.api.core.util.Nonce; import com.czcb.scfs.api.service.v2.account.AccountService; +import com.czcb.scfs.api.service.v2.account.model.PersonOpenAccountFourElementRequest; +import com.czcb.scfs.api.service.v2.account.model.PersonOpenAccountFourElementResponse; import com.czcb.scfs.api.service.v2.account.model.QueryBalanceRequest; import com.czcb.scfs.api.service.v2.account.model.QueryBalanceResponse; import com.czcb.scfs.api.test.FmtDate; @@ -10,6 +12,8 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @SpringBootTest class AccountServiceTest { @@ -17,12 +21,12 @@ class AccountServiceTest { private AccountService accountService; @Test - void testQuery() { + void QueryBalance() { QueryBalanceRequest queryBalanceRequest = new QueryBalanceRequest(); - queryBalanceRequest.setChannelNo("0000"); - queryBalanceRequest.setAppNo("10"); + queryBalanceRequest.setChannelNo("1038"); + queryBalanceRequest.setAppNo("41"); queryBalanceRequest.setSerialNo(Nonce.ofNonce()); - queryBalanceRequest.setAccountNo("1012230221000010"); + queryBalanceRequest.setAccountNo("1038240626000003"); queryBalanceRequest.setRelationAcct("1"); queryBalanceRequest.setTransDate(FmtDate.transDate()); @@ -35,6 +39,61 @@ class AccountServiceTest { @Test void personOpenAccountThreeElementTest() { + PersonOpenAccountFourElementRequest request = new PersonOpenAccountFourElementRequest(); + request.setChannelNo("1038"); + request.setAppNo("41"); + request.setSerialNo(Nonce.ofNonce()); + request.setAccountName("张三"); + request.setIdType("1"); + request.setIdNo("33010220000728911X"); + request.setIdStartDate("2013-06-15"); + request.setIdEndDate("2999-12-31"); + request.setSignNo(""); + request.setSignName("浙江省杭州市上城区"); + request.setIdAddress("浙江省杭州市上城区"); + request.setSex("0"); + request.setEthnic("汉"); + request.setJob("金融"); + request.setJobNote(""); + request.setPrimaryAccount("6222081102004112215"); + request.setMobile("13819135970"); + request.setVerifyCode("111111"); + List list = new ArrayList<>(); + PersonOpenAccountFourElementRequest.FileList face = new PersonOpenAccountFourElementRequest.FileList(); + face.setFileType("04"); + face.setFilePage(1); + face.setFileNo("202406261110040772625803"); + list.add(face); + + PersonOpenAccountFourElementRequest.FileList back = new PersonOpenAccountFourElementRequest.FileList(); + back.setFileType("02"); + back.setFilePage(2); + back.setFileNo("202406261118040731403217"); + list.add(back); + + PersonOpenAccountFourElementRequest.FileList back2 = new PersonOpenAccountFourElementRequest.FileList(); + back2.setFileType("01"); + back2.setFilePage(3); + back2.setFileNo("202406261013460435180735"); + list.add(back2); + + PersonOpenAccountFourElementRequest.FileList proto = new PersonOpenAccountFourElementRequest.FileList(); + proto.setFileType("13"); + proto.setFilePage(0); + proto.setFileNo("202406260909460238147539"); + list.add(proto); + request.setFileList(list); + request.setOpenLongitude(""); + request.setOpenDimensions(""); + request.setOpenIp(""); + request.setOpenDate(FmtDate.transDate()); + request.setOpenTradeTime(FmtDate.transTradeTime()); + request.setTransDate(FmtDate.transDate()); + request.setTransTradeTime(FmtDate.transTradeTime()); + + PersonOpenAccountFourElementResponse response = accountService.personOpenAccountFourElement(request); + System.out.println(response); + Assertions.assertEquals("000000", response.getRecode()); } } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java index ef43219..f604d67 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java @@ -1,8 +1,38 @@ package com.czcb.scfs.api.test.service; +import com.czcb.scfs.api.core.util.Compression; +import com.czcb.scfs.api.core.util.Nonce; +import com.czcb.scfs.api.service.v2.face.FaceService; +import com.czcb.scfs.api.service.v2.face.model.FaceFileRequest; +import com.czcb.scfs.api.service.v2.face.model.FaceFileResponse; +import com.czcb.scfs.api.test.FmtDate; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import javax.annotation.Resource; + @SpringBootTest class FaceServiceTest { + @Resource + private FaceService faceService; + + @Test + void testFace() { + FaceFileRequest request = new FaceFileRequest(); + request.setChannelNo("1038"); + request.setAppNo("41"); + request.setSerialNo(Nonce.ofNonce()); + request.setFileType("04"); + request.setFileData(Compression.zipAndEncodeFromFile("C:\\Users\\Administrator.CZCB-20230627EN\\Desktop\\face.jpg")); + request.setIdNo("333333198001019991"); + request.setName("张三"); + request.setTransDate(FmtDate.transDate()); + request.setTransTradeTime(FmtDate.transTradeTime()); + + FaceFileResponse response = faceService.face(request); + System.out.println(response); + Assertions.assertEquals("000000", response.getRecode()); + } } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java index 5180028..a948d07 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java @@ -31,7 +31,6 @@ class FileServiceTest { fileRequest.setTransDate("2024-03-20"); fileRequest.setTransTradeTime("2024-03-20 12:20:20"); - UploadFileResponse response = fileService.uploadFile(fileRequest); System.out.println(response); Assertions.assertEquals("000000", response.getRecode()); diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java index e487f1a..b0a6b7a 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java @@ -1,8 +1,36 @@ package com.czcb.scfs.api.test.service; +import com.czcb.scfs.api.core.util.Compression; +import com.czcb.scfs.api.core.util.Nonce; +import com.czcb.scfs.api.service.v2.ocr.OcrService; +import com.czcb.scfs.api.service.v2.ocr.model.OcrFileRequest; +import com.czcb.scfs.api.service.v2.ocr.model.OcrFileResponse; +import com.czcb.scfs.api.test.FmtDate; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import javax.annotation.Resource; + @SpringBootTest class OcrServiceTest { + @Resource + private OcrService ocrService; + + @Test + void back() { + OcrFileRequest request = new OcrFileRequest(); + request.setChannelNo("1038"); + request.setAppNo("41"); + request.setSerialNo(Nonce.ofNonce()); + request.setFileType("02"); + request.setFileData(Compression.zipAndEncodeFromFile("C:\\Users\\Administrator.CZCB-20230627EN\\Desktop\\back.jpg")); + request.setTransDate(FmtDate.transDate()); + request.setTransTradeTime(FmtDate.transTradeTime()); + + OcrFileResponse response = ocrService.imageRecognize(request); + System.out.println(response); + Assertions.assertEquals("000000", response.getRecode()); + } } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java index 6586d3c..3654e11 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java @@ -4,6 +4,7 @@ import com.czcb.scfs.api.core.util.Nonce; import com.czcb.scfs.api.service.v2.sms.SmsService; import com.czcb.scfs.api.service.v2.sms.model.SendVerifySignRequest; import com.czcb.scfs.api.service.v2.sms.model.SendVerifySignResponse; +import com.czcb.scfs.api.test.FmtDate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -15,14 +16,25 @@ class SmsServiceTest { @Resource private SmsService service; + /** + * 开户短信 + */ @Test - void testSms() { + void testOpenAccountSms() { SendVerifySignRequest request = new SendVerifySignRequest(); request.setAppNo("41"); request.setChannelNo("1038"); request.setMobile("13819135970"); + request.setTradeType("0"); + request.setTradeNo("221506"); + request.setCardNo("6222081102004112215"); request.setSerialNo(Nonce.ofNonce()); request.setCardNo("6222024709526474589"); + request.setCardName("张三"); + request.setIdNo("33010220000728911X"); + request.setTransDate(FmtDate.transDate()); + request.setTransTradeTime(FmtDate.transTradeTime()); + SendVerifySignResponse response = service.send(request); Assertions.assertEquals("000000", response.getRecode()); }