From 98710c3223bf3cf7c0d263d5693fb7bed7068cc3 Mon Sep 17 00:00:00 2001 From: wuxicheng <1441859745@qq.com> Date: Wed, 17 May 2023 09:52:46 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bnyer/common/core/enums/ResponseEnum.java | 2 +- .../java/com/bnyer/pay/design/strategy/DYPayStrategy.java | 3 ++- .../com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/ResponseEnum.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/ResponseEnum.java index 5e6633d..cd9cc83 100644 --- a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/ResponseEnum.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/ResponseEnum.java @@ -24,13 +24,13 @@ public enum ResponseEnum { ORDER_CANCEL(110004, "该订单已取消，请重新下单！"), ORDER_REPEAT_PAY(110005, "该订单已支付，请勿重复支付！"), REFUND_SING_ERROR(110006, "签名错误！"), + REFUND_FAILS(110008, "退款失败！"), //======================第三方接口调用异常======================== PAY_FAILS(220001,"支付失败,请稍后重试"), ORDER_QUERY_FAILS(220002,"订单查询失败,请稍后重试"), - REFUND_FAILS(220003,"退款失败,请稍后重试"), ; diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/DYPayStrategy.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/DYPayStrategy.java index 7139e3d..ce0488f 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/DYPayStrategy.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/DYPayStrategy.java @@ -16,6 +16,7 @@ import com.bnyer.pay.bean.bo.UnifiedOrderBo; import com.bnyer.pay.constant.DYPayConstants; import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto; import com.bnyer.pay.bean.dto.PayNotifyCheckDto; +import com.bnyer.pay.enums.EnumDyPayStatus; import com.bnyer.pay.enums.EnumPayChannel; import com.bnyer.pay.enums.EnumPayConfigStatus; import com.bnyer.pay.mapper.DypayConfigMapper; @@ -213,7 +214,7 @@ public class DYPayStrategy extends AbstractPayStrategy{ //抖音侧订单号 String dyOrderId = msgJsonObj.getString("order_id"); //这里无论回调失败还是成功,都需要都各个业务层去处理相关逻辑 - if(!"success".equals(status)){ + if(EnumDyPayStatus.SUCCESS.getStatus().equals(status)){ log.info("抖音支付回调不是支付成功不做处理:支付状态:{},payId:{}",status,outOrderNo); return super.buildNotifyCheckResultMsg(EnumPayType.DY_PAY,false,"trade fail"); } diff --git a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java index 7ec9609..f8ce54b 100644 --- a/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java +++ b/bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java @@ -290,10 +290,11 @@ public class UnifiedPayServiceImpl implements UnifiedPayService { refundOrder.setThirdCode(thirdRefundVo.getThirdCode()); refundOrder.setThirdMsg(thirdRefundVo.getThirdMsg()); refundOrder.setThirdNo(thirdRefundVo.getThirdNo()); - refundOrder.setRefundStatus(ObjectUtil.equal(thirdRefundVo.getThirdCode(),"0")?1002:1000); + refundOrder.setRefundStatus(ObjectUtil.equal(thirdRefundVo.getThirdCode(),"0")?EnumRefundStatus.SUCCESS.getStatus(): + EnumRefundStatus.NO_REFUND.getStatus()); payInfoMapper.insert(refundOrder); if (!"0".equals(thirdRefundVo.getThirdCode())){ - throw new ServiceException(thirdRefundVo.getThirdMsg()); + throw new ServiceException(thirdRefundVo.getThirdMsg(),ResponseEnum.REFUND_FAILS.getCode()); } }