From c1b7658f27cc7e1db6f9058fb5b296b8371dc06f Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Fri, 20 Mar 2020 15:44:40 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=20=E5=A2=9E=E5=8A=A0=E8=B4=A6?= =?utf8?q?=E6=88=B7=E7=9B=B8=E5=85=B3=E4=BA=A4=E6=98=93=E6=8E=A5=E5=8F=A3?= =?utf8?q?=20=E5=A2=9E=E5=8A=A0=E4=B8=93=E6=AC=BE=E8=B4=A6=E6=88=B7?= =?utf8?q?=E8=AE=BE=E8=AE=A1=20=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF?= =?utf8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + payapi-sdk/build.gradle | 1 + .../dlpay/paysdk/utils/ApiUtils.java | 23 +++ .../paysdktest/CitizenCardPayProxyTest.java | 96 ++++++------ payapi-spec/accountapi.yaml | 40 +++-- payapi-spec/build.gradle | 4 + payapi-spec/consumeapi.yaml | 39 ++--- payapi-spec/definitions.yaml | 41 +++++ payapi-spec/payapi-spec.yaml | 8 + .../dlpay/api/domain/TPersondtl.java | 23 +++ .../dlpay/api/domain/TSubAccount.java | 144 ++++++++++++++++++ .../kotlin/com/supwisdom/dlpay/api/advices.kt | 11 +- 12 files changed, 341 insertions(+), 90 deletions(-) create mode 100644 payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/utils/ApiUtils.java create mode 100644 payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSubAccount.java diff --git a/build.gradle b/build.gradle index 7187f274..ac28593a 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,7 @@ subprojects { hamcrestVersion = '2.1' mockkVersion = '1.9.3' commonNetVersion = '3.6' + fasterXMLVersion = '2.9.8' kaptchaVersion = '2.3.2' jerseyClientVersion = '1.19' javaxWSRSVersion = '2.1.1' diff --git a/payapi-sdk/build.gradle b/payapi-sdk/build.gradle index 53c76f1b..ca5c2f13 100644 --- a/payapi-sdk/build.gradle +++ b/payapi-sdk/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation project(":payapi-common") implementation "com.supwisdom:multi-tenant-core:${multiTenantLibVersion}" compile "com.supwisdom:multi-tenant-jwt-client:${multiTenantLibVersion}" + implementation "com.fasterxml.jackson.core:jackson-databind:${fasterXMLVersion}" implementation "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" implementation "org.springframework.cloud:spring-cloud-starter-openfeign" diff --git a/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/utils/ApiUtils.java b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/utils/ApiUtils.java new file mode 100644 index 00000000..a1e59f81 --- /dev/null +++ b/payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/utils/ApiUtils.java @@ -0,0 +1,23 @@ +package com.supwisdom.dlpay.paysdk.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.supwisdom.dlpay.payapi.model.ErrorResponse; +import feign.FeignException; + +import java.io.IOException; + +public class ApiUtils { + + public static ErrorResponse getErrorResponse(FeignException ex) { + if (ex.status() > 0) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + return objectMapper.readValue(ex.content(), ErrorResponse.class); + } catch (IOException e) { + } + } + ErrorResponse errorResponse = new ErrorResponse(); + errorResponse.setMessage(ex.contentUTF8()); + return errorResponse; + } +} diff --git a/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java b/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java index 542a31de..7f1cf750 100644 --- a/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java +++ b/payapi-sdk/src/test/java/com/supwisdom/dlpay/paysdktest/CitizenCardPayProxyTest.java @@ -3,23 +3,28 @@ package com.supwisdom.dlpay.paysdktest; import com.supwisdom.dlpay.api.bean.*; import com.supwisdom.dlpay.api.util.DateUtil; +import com.supwisdom.dlpay.payapi.model.ErrorResponse; +import com.supwisdom.dlpay.payapi.model.QrcodeFormat; +import com.supwisdom.dlpay.payapi.model.QrcodePayInitRequest; +import com.supwisdom.dlpay.payapi.model.QrcodePayInitResponse; import com.supwisdom.dlpay.paysdk.ApiLoginHelper; +import com.supwisdom.dlpay.paysdk.PayAPISDKConfigure; import com.supwisdom.dlpay.paysdk.proxy.*; +import com.supwisdom.dlpay.paysdk.utils.ApiUtils; import com.supwisdom.mutlitenant.client.annotations.EnableTenantJwtClient; import com.supwisdom.mutlitenant.client.config.JwtTenantAuthentication; +import feign.FeignException; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.test.context.junit4.SpringRunner; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,22 +32,21 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -@RunWith(SpringRunner.class) @SpringBootTest(properties = { "payapi.url=http://localhost:8080/payapi"}, classes = CitizenCardPayProxyTest.class) @ImportAutoConfiguration({RibbonAutoConfiguration.class, FeignRibbonClientAutoConfiguration.class, FeignAutoConfiguration.class, - HttpMessageConvertersAutoConfiguration.class, APITestConfig.class}) -@EnableFeignClients(basePackages = "com.supwisdom.dlpay.paysdk") + HttpMessageConvertersAutoConfiguration.class, PayAPISDKConfigure.class, APITestConfig.class}) @EnableTenantJwtClient -@ComponentScan(basePackages = {"com.supwisdom.dlpay.paysdk"}) public class CitizenCardPayProxyTest { private final static String appid = "700001"; private final static String secret = "d6dd7f0d4551419d8d11736d0f28df0d"; private final static String operid = "1001"; + private final static String tenantid = "10010"; + public final static JwtTenantAuthentication authentication = new JwtTenantAuthentication(appid, secret, "{tenantid}"); @@ -64,23 +68,27 @@ public class CitizenCardPayProxyTest { @Test public void citizencardPayinit() { - ApiVersionResponse version = apiCommonProxy.apiVersion(); - - assertThat("get version error " + version.getException(), - version.getVersion(), notNullValue()); - - System.out.println(version.getVersion()); - - CitizenCardPayinitParam initParam = new CitizenCardPayinitParam(); - initParam.setBillno("20190708172756000001"); - initParam.setCardNo("20190619001"); - initParam.setAmount(0); - initParam.setTransdate("20190708"); - initParam.setTranstime("172713"); - initParam.setShopaccno("2000000038"); - CitizenPayResponse payInit = citizenCardPayProxy.citizencardPayinit(initParam); - assertThat("pay initialized " + payInit.getRetmsg() + payInit.getException(), - payInit.getRetcode(), equalTo(0)); + try { + ApiVersionResponse version = apiCommonProxy.apiVersion(); + + assertThat("get version error " + version.getException(), + version.getVersion(), notNullValue()); + + System.out.println(version.getVersion()); + + CitizenCardPayinitParam initParam = new CitizenCardPayinitParam(); + initParam.setBillno("20190708172756000001"); + initParam.setCardNo("20190619001"); + initParam.setAmount(0); + initParam.setTransdate("20190708"); + initParam.setTranstime("172713"); + initParam.setShopaccno("2000000038"); + CitizenPayResponse payInit = citizenCardPayProxy.citizencardPayinit(initParam); + assertThat("pay initialized " + payInit.getRetmsg() + payInit.getException(), + payInit.getRetcode(), equalTo(0)); + } catch (FeignException ex) { + System.out.println("error : " + ex.status()); + } } @Test @@ -122,27 +130,29 @@ public class CitizenCardPayProxyTest { response.getRetcode(), equalTo(0)); } + private String getBillno() { + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + return sdf.format(new Date()); // + "00001"; + } + @Test public void qrcodeInit() { -// ApiVersionResponse version = apiCommonProxy.apiVersion(); -// -// assertThat("get version error " + version.getException(), -// version.getVersion(), notNullValue()); -// -// QrcodePayParam param = new QrcodePayParam(); -// param.setAmount(1); -// param.setAnonymous(true); -// param.setBillno(DateUtil.getNow()); -// param.setQrcodeFormat("origin"); -// param.setTransdate(DateUtil.getNow("yyyyMMdd")); -// param.setTranstime(DateUtil.getNow("HHmmss")); -// param.setTenantid("default"); -// param.setShopaccno("2000000012"); -// param.setQrcode("286972142340737770"); -// QrcodePayResponse response = consumePropxy.qrcodePayInit("111", param); -// assertThat("qrcodeInit " + response.getRetmsg() + response.getException(), -// response.getRetcode(), equalTo(0)); + QrcodePayInitRequest request = new QrcodePayInitRequest(); + request.setBillno(getBillno()); + request.setQrcode("186972142340737770"); + request.setShopaccno("2000000012"); + request.setQrcodeFormat(QrcodeFormat.PLAIN); + request.setTransDate(DateUtil.getNow("yyyyMMdd")); + request.setTransTime(DateUtil.getNow("HHmmss")); + + try { + QrcodePayInitResponse response = consumePropxy.qrcodePayInit(tenantid, request); + assertThat("userid must not be empty", response.getUserid(), notNullValue()); + } catch (FeignException ex) { + ErrorResponse err = ApiUtils.getErrorResponse(ex); + assertThat("error message must not be empty", err.getMessage(), notNullValue()); + } } @Test diff --git a/payapi-spec/accountapi.yaml b/payapi-spec/accountapi.yaml index 93b7ad60..08c83a0b 100644 --- a/payapi-spec/accountapi.yaml +++ b/payapi-spec/accountapi.yaml @@ -13,6 +13,8 @@ components: title: 子账户列表 type: array items: + description: | + 需要查询的子账户名，如果查询所有子账户可以用 ['*'] 来查询 type: string title: 子账户ID AccountQueryResponse: @@ -45,7 +47,6 @@ components: title: 预授权交易请求 required: - userid - - accountType - preAuthorizedAmount - shopaccno - transDate @@ -56,8 +57,8 @@ components: userid: title: 用户ID type: string - accountType: - title: 账户类型 + accountName: + title: 账户名 type: string preAuthorizedAmount: title: 预授权金额(分) @@ -114,7 +115,7 @@ components: type: integer AccountPayRequest: type: object - title: 账户余额扣款交易 + title: 主账户余额扣款交易 required: - billno - shopaccno @@ -139,6 +140,9 @@ components: amount: title: 扣款金额(分) type: integer + accountName: + title: 账户名 + type: string description: title: 交易描述 type: string @@ -149,6 +153,8 @@ components: AccountPayResponse: type: object title: 账户余额扣款交易应答 + required: + - refno properties: refno: title: 系统交易参考号 @@ -159,7 +165,9 @@ components: aftbal: title: 账户余额(分) type: integer - + realAmount: + title: 实际扣款金额（分） + type: integer paths: accountQuery: @@ -188,11 +196,7 @@ components: schema: $ref: 'definitions.yaml#/components/schemas/ErrorResponse' default: - description: 查询错误 - content: - application/json: - schema: - $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + $ref: 'definitions.yaml#/components/responses/CommonError' accountPay: parameters: - $ref: definitions.yaml#/components/headers/TenantId @@ -200,7 +204,7 @@ components: tags: - pos requestBody: - description: 账户余额消费 + description: 主账户余额消费 content: application/json: schema: @@ -212,12 +216,17 @@ components: application/json: schema: $ref: '#/components/schemas/AccountPayResponse' - default: - description: 消费失败 + '400': + description: | + 消费失败, code 用于定义错误信息 + * short_of_balance 余额不足 + * account_status_error 账户状态异常 content: application/json: schema: $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + default: + $ref: 'definitions.yaml#/components/responses/CommonError' accountPreAuthorizedDebit: parameters: - $ref: definitions.yaml#/components/headers/TenantId @@ -237,6 +246,8 @@ components: application/json: schema: $ref: '#/components/schemas/PreAuthorizedDebitResponse' + default: + $ref: 'definitions.yaml#/components/responses/CommonError' accountPreAuthorizedSettle: parameters: - $ref: definitions.yaml#/components/headers/TenantId @@ -249,7 +260,6 @@ components: application/json: schema: $ref: '#/components/schemas/PreAuthorizedSettleRequest' - responses: '200': description: 预授权交易清算成功 @@ -257,4 +267,6 @@ components: application/json: schema: $ref: '#/components/schemas/PreAuthorizedSettleResponse' + default: + $ref: 'definitions.yaml#/components/responses/CommonError' diff --git a/payapi-spec/build.gradle b/payapi-spec/build.gradle index c4bc7c96..57f22e8b 100644 --- a/payapi-spec/build.gradle +++ b/payapi-spec/build.gradle @@ -34,6 +34,10 @@ openApiGenerate { interfaceOnly : "true", generateAliasAsModel : "false" ] + + systemProperties = [ + "hideGenerationTimestamp": true + ] } task copyApiSrc(type: Copy) { diff --git a/payapi-spec/consumeapi.yaml b/payapi-spec/consumeapi.yaml index 1df2d8c0..a9b91b94 100644 --- a/payapi-spec/consumeapi.yaml +++ b/payapi-spec/consumeapi.yaml @@ -149,12 +149,8 @@ components: application/json: schema: $ref: '#/components/schemas/QrcodePayInitResponse' - 'default': - description: 请求错误 - content: - application/json: - schema: - $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + default: + $ref: 'definitions.yaml#/components/responses/CommonError' qrcodePayConfirm: parameters: - $ref: definitions.yaml#/components/headers/TenantId @@ -181,12 +177,8 @@ components: application/json: schema: $ref: 'definitions.yaml#/components/schemas/ErrorResponse' - 'default': - description: 交易失败 - content: - application/json: - schema: - $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + default: + $ref: 'definitions.yaml#/components/responses/CommonError' qrcodePayQuery: parameters: - $ref: 'definitions.yaml#/components/headers/TenantId' @@ -209,12 +201,8 @@ components: application/json: schema: $ref: '#/components/schemas/QrcodePayConfirmResponse' - 'default': - description: 查询失败 - content: - application/json: - schema: - $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + default: + $ref: 'definitions.yaml#/components/responses/CommonError' refund: parameters: - $ref: 'definitions.yaml#/components/headers/TenantId' @@ -236,17 +224,14 @@ components: schema: $ref: '#/components/schemas/RefundResponse' '409': - description: 退款申请失败，订单号已存在或正在退款中 + description: | + 退款申请失败，订单号已存在或正在退款中 content: application/json: schema: $ref: 'definitions.yaml#/components/schemas/ErrorResponse' default: - description: 退款申请失败 - content: - application/json: - schema: - $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + $ref: 'definitions.yaml#/components/responses/CommonError' refundQuery: parameters: - $ref: 'definitions.yaml#/components/headers/TenantId' @@ -276,8 +261,4 @@ components: schema: $ref: 'definitions.yaml#/components/schemas/ErrorResponse' default: - description: 退款申请失败 - content: - application/json: - schema: - $ref: 'definitions.yaml#/components/schemas/ErrorResponse' + $ref: 'definitions.yaml#/components/responses/CommonError' diff --git a/payapi-spec/definitions.yaml b/payapi-spec/definitions.yaml index 4ca28482..ed1adb4b 100644 --- a/payapi-spec/definitions.yaml +++ b/payapi-spec/definitions.yaml @@ -8,6 +8,14 @@ components: schema: type: string + responses: + CommonError: + description: 请求失败 + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + schemas: ErrorResponse: @@ -60,3 +68,36 @@ components: - failed - already_success - require_query + UserStatus: + type: string + description: | + * normal 正常 + * frozen 冻结 + * canceled 注销 + * closed 关闭 + * notexists 不存在 + enum: + - normal + - fronzen + - canceled + - closed + - notexists + SubAccountMetadata: + type: object + required: + - name + - status + properties: + name: + type: string + title: 子账户名 + status: + title: 子账户状态 + $ref: '#/components/schemas/UserStatus' + balance: + type: integer + title: 子账户余额 + expire: + type: string + title: 余额有效期 + format: date-time diff --git a/payapi-spec/payapi-spec.yaml b/payapi-spec/payapi-spec.yaml index 0c8efe90..b00d7ed9 100644 --- a/payapi-spec/payapi-spec.yaml +++ b/payapi-spec/payapi-spec.yaml @@ -15,3 +15,11 @@ paths: $ref: consumeapi.yaml#/components/paths/refund /consume/refund/query/{billno}: $ref: consumeapi.yaml#/components/paths/refundQuery + /account/query: + $ref: accountapi.yaml#/components/paths/accountQuery + /account/apy: + $ref: accountapi.yaml#/components/paths/accountPay + /account/preAuthorizedDebit: + $ref: accountapi.yaml#/components/paths/accountPreAuthorizedDebit + /account/preAuthorizedSettle: + $ref: accountapi.yaml#/components/paths/accountPreAuthorizedSettle diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java index c1030850..1c7f5d1f 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TPersondtl.java @@ -28,6 +28,9 @@ public class TPersondtl { @Column(name = "ACCNO", length = 32) private String accountNo; + @Column(name = "accname", length = 32) + private String accountName; // 账户名 + @Column(name = "USERNAME", length = 200) private String userName; @@ -43,9 +46,15 @@ public class TPersondtl { @NotNull private String status = TradeDict.DTL_STATUS_NONE; + /** + * @deprecated + */ @Column(name = "BEFBAL", precision = 9, scale = 2) private Double befbal; + /** + * @since 1.1 + */ @Column(name = "AFTBAL", precision = 9, scale = 2) private Double aftbal; @@ -158,10 +167,16 @@ public class TPersondtl { this.status = status; } + /** + * @deprecated + */ public Double getBefbal() { return befbal; } + /** + * @deprecated + */ public void setBefbal(Double befbal) { this.befbal = befbal; } @@ -309,4 +324,12 @@ public class TPersondtl { public void setAftbal(Double aftbal) { this.aftbal = aftbal; } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSubAccount.java b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSubAccount.java new file mode 100644 index 00000000..5bc9f177 --- /dev/null +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/domain/TSubAccount.java @@ -0,0 +1,144 @@ +package com.supwisdom.dlpay.api.domain; + +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.sql.Timestamp; + + +/** + * 子账户表 + */ +@Entity +@Table(name = "TB_SUBACCOUNT", + indexes = {@Index(name = "subacc_idx1", columnList = "userid, name", unique = true), + @Index(name = "subacc_idx2", columnList = "name, status")}) +@GenericGenerator(name = "subaccount_seq", strategy = "org.hibernate.id.UUIDGenerator") +public class TSubAccount { + @Id + @Column(name = "id", length = 32) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "subaccount_seq") + private String id; + + @Column(name = "userid", length = 32) + @NotNull + private String userid; + + @Column(name = "subjno", length = 16) + private String subjno; + /** + * 子账户名 + */ + @Column(name = "name", length = 30) + @NotNull + private String accountName; + + @Column(name = "status", length = 12) + @NotNull + private String status; + + @Column(name = "creditlimit", precision = 10, scale = 2) + @NotNull + private Double creditLimit; + + @Column(name = "limitcycle", length = 30) + @NotNull + private String limitCycle; + + @Column(name = "expired", length = 8) + @NotNull + private String expired; + + @Version + @Column(name = "lastupdate") + private Timestamp lastUpdate; + + @Column(name = "cyclepolicy", length = 30) + @NotNull + private String cyclePolicy; + + @Column(name = "tenantid", length = 32) + @NotNull + private String tenantid; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserid() { + return userid; + } + + public void setUserid(String userid) { + this.userid = userid; + } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Double getCreditLimit() { + return creditLimit; + } + + public void setCreditLimit(Double creditLimit) { + this.creditLimit = creditLimit; + } + + public String getLimitCycle() { + return limitCycle; + } + + public void setLimitCycle(String limitCycle) { + this.limitCycle = limitCycle; + } + + public String getExpired() { + return expired; + } + + public void setExpired(String expired) { + this.expired = expired; + } + + public Timestamp getLastUpdate() { + return lastUpdate; + } + + public void setLastUpdate(Timestamp lastUpdate) { + this.lastUpdate = lastUpdate; + } + + public String getCyclePolicy() { + return cyclePolicy; + } + + public void setCyclePolicy(String cyclePolicy) { + this.cyclePolicy = cyclePolicy; + } + + public String getTenantid() { + return tenantid; + } + + public void setTenantid(String tenantid) { + this.tenantid = tenantid; + } +} diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt index 6faa51b5..25678f03 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/advices.kt @@ -6,6 +6,7 @@ import com.supwisdom.dlpay.exception.BaseRequestError import com.supwisdom.dlpay.exception.TransactionException import com.supwisdom.dlpay.framework.ResponseBodyBuilder import com.supwisdom.dlpay.framework.service.CommonService +import com.supwisdom.dlpay.payapi.model.ErrorResponse import mu.KotlinLogging import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation.Around @@ -103,9 +104,11 @@ class CustomGlobalExceptionHandler : ResponseEntityExceptionHandler() { val msg = ex.bindingResult.fieldErrors.joinToString(",") { it?.defaultMessage ?: "" } - return ResponseEntity.ok(ResponseBodyBuilder.create() - .fail(300001, msg)) - + val response = ErrorResponse().apply { + code = "300001" + message = msg + } + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response) } @ExceptionHandler(TransactionSystemException::class) @@ -121,7 +124,7 @@ class CustomGlobalExceptionHandler : ResponseEntityExceptionHandler() { } cause = cause.cause } - return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(e) + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e) } } -- 2.17.1