From feb38f18c341614611a43b4c3b34ffcc8171fe33 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Sun, 29 May 2022 19:22:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E8=B0=83=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/core/adapay/PayCallback.java | 2 +- ghy-admin/src/main/resources/application.yaml | 2 +- .../callback/AdapayCallbackController.java | 10 ++----- .../com/ghy/common/enums/OrderStatus.java | 16 ++++++---- .../java/com/ghy/common/enums/PayStatus.java | 29 +++++++++++++++++++ .../financial/FinancialMasterMapper.xml | 10 ++++++- 6 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 ghy-common/src/main/java/com/ghy/common/enums/PayStatus.java diff --git a/ghy-admin/src/main/java/com/ghy/web/core/adapay/PayCallback.java b/ghy-admin/src/main/java/com/ghy/web/core/adapay/PayCallback.java index ae348465..6207a591 100644 --- a/ghy-admin/src/main/java/com/ghy/web/core/adapay/PayCallback.java +++ b/ghy-admin/src/main/java/com/ghy/web/core/adapay/PayCallback.java @@ -52,7 +52,7 @@ public class PayCallback implements IPayCallback { if (AdapayStatusEnum.succeeded.code.equals(response.getString("status"))) { FinancialMaster update = new FinancialMaster(); - update.setId(response.getLong("order_no")); + update.setOrderMasterCode(response.getString("order_no")); update.setPaymentId(response.getString("id")); financialMasterService.updateFinancialMaster(update); } else { diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml index c12c6a64..ef988ea6 100644 --- a/ghy-admin/src/main/resources/application.yaml +++ b/ghy-admin/src/main/resources/application.yaml @@ -158,7 +158,7 @@ qiniu: adapay: debug: true prod-mode: true - notifyUrl: 'http://www.opsoul.com/adapay/callback' + notifyUrl: 'https://www.opsoul.com/adapay/callback' jim: appKey: '' diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java b/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java index ade3190c..0670396f 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java @@ -3,14 +3,12 @@ package com.ghy.common.adapay.callback; import com.ghy.common.adapay.callback.mapping.DrawCashReplyMapping; import com.ghy.common.adapay.callback.mapping.PayReplyMapping; import com.ghy.common.adapay.callback.mapping.RefundReplyMapping; +import com.ghy.common.core.controller.BaseController; import com.huifu.adapay.core.AdapayCore; import com.huifu.adapay.core.util.AdapaySign; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; /** @@ -19,12 +17,10 @@ import org.springframework.web.bind.annotation.RestController; * @author HH 2022/3/25 */ @RestController -public class AdapayCallbackController { - - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); +public class AdapayCallbackController extends BaseController { @PostMapping("/adapay/callback") - public String callback(@RequestBody Event event) { + public String callback(Event event) { logger.info(" 收单返回消息event" + event); //验签请参data String data = event.getData(); diff --git a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java index 01a902f3..82800ab8 100644 --- a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java +++ b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java @@ -7,23 +7,27 @@ package com.ghy.common.enums; */ public enum OrderStatus { - WAIT_PAY("0", "待支付"), - PAID("1", "已支付"), - CANCEL("2", "已取消"); + RECEIVE(0, "待接单"), + PLAIN(1, "待排期"), + GOING(2, "待上门"), + SERVER(3, "服务中"), + FINISH(4, "已完成"), + CANCEL(5, "已取消"); - private final String code; + private final Integer code; private final String desc; - OrderStatus(String code, String desc) { + OrderStatus(Integer code, String desc) { this.code = code; this.desc = desc; } - public String getCode() { + public Integer getCode() { return code; } public String getDesc() { return desc; } + } diff --git a/ghy-common/src/main/java/com/ghy/common/enums/PayStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/PayStatus.java new file mode 100644 index 00000000..978fb023 --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/enums/PayStatus.java @@ -0,0 +1,29 @@ +package com.ghy.common.enums; + +/** + * @author clunt + * 付款状态 + */ +public enum PayStatus { + + WAIT_PAY(0, "待支付"), + PAID(1, "已支付"), + CANCEL(2, "已取消"); + + private final Integer code; + private final String desc; + + PayStatus(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } + +} diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml index 50ddb9cd..e03d9252 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml @@ -80,7 +80,15 @@ update_by = #{updateBy}, update_time = SYSDATE() - WHERE id = #{id} + + + AND id = #{id} + + + AND order_master_code = #{orderMasterCode} + + +