diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageDuplicateCheckerHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageDuplicateCheckerHandler.java index 8dae7d7ce..6e09a707b 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageDuplicateCheckerHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageDuplicateCheckerHandler.java @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + package com.pig4cloud.pigx.pay.handler; /** diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageRedisDuplicateCheckerHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageRedisDuplicateCheckerHandler.java deleted file mode 100644 index 89d2815f9..000000000 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/MessageRedisDuplicateCheckerHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.pig4cloud.pigx.pay.handler; - -import lombok.AllArgsConstructor; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.time.Duration; - -/** - * @author lengleng - * @date 2019-06-14 - *

- * 消息去重 - */ -@Service -@AllArgsConstructor -public class MessageRedisDuplicateCheckerHandler implements MessageDuplicateCheckerHandler { - private final RedisTemplate redisTemplate; - - /** - * 判断回调消息是否重复. - * - * @param messageId messageId需要根据上面讲的方式构造 - * @return 如果是重复消息，返回false，否则返回true - */ - @Override - public boolean isDuplicate(String messageId) { - return redisTemplate.opsForValue() - .setIfAbsent(messageId, messageId, Duration.ofSeconds(10L)); - } -} diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AbstractPayNotifyCallbakHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java similarity index 62% rename from pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AbstractPayNotifyCallbakHandler.java rename to pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java index 24d7ad07b..bc929d846 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AbstractPayNotifyCallbakHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java @@ -15,8 +15,14 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.pay.handler; +package com.pig4cloud.pigx.pay.handler.impl; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import com.pig4cloud.pigx.pay.entity.PayNotifyRecord; +import com.pig4cloud.pigx.pay.handler.PayNotifyCallbakHandler; +import com.pig4cloud.pigx.pay.service.PayNotifyRecordService; +import com.pig4cloud.pigx.pay.utils.PayConstants; import lombok.extern.slf4j.Slf4j; import java.util.Map; @@ -54,4 +60,22 @@ public abstract class AbstractPayNotifyCallbakHandler implements PayNotifyCallba saveNotifyRecord(params, result); return result; } + + /** + * 保存记录 + * @param params + * @param result + * @param record + * @param notifyId + * @param recordService + */ + public void saveRecord(Map params, String result, PayNotifyRecord record, String notifyId + , PayNotifyRecordService recordService) { + record.setNotifyId(notifyId); + String orderNo = params.get(PayConstants.OUT_TRADE_NO); + record.setOrderNo(orderNo); + record.setRequest(MapUtil.join(params, StrUtil.DASHED, StrUtil.DASHED)); + record.setResponse(result); + recordService.save(record); + } } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AbstractPayOrderHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java similarity index 56% rename from pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AbstractPayOrderHandler.java rename to pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java index feb3a0677..8339ac738 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AbstractPayOrderHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayOrderHandler.java @@ -1,8 +1,26 @@ -package com.pig4cloud.pigx.pay.handler; +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.pay.handler.impl; import com.pig4cloud.common.sequence.sequence.Sequence; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayTradeOrder; +import com.pig4cloud.pigx.pay.handler.PayOrderHandler; import com.pig4cloud.pigx.pay.mapper.PayGoodsOrderMapper; import com.pig4cloud.pigx.pay.utils.OrderStatusEnum; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AlipayPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java similarity index 86% rename from pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AlipayPayNotifyCallbackHandler.java rename to pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java index 989387feb..35a4d2213 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AlipayPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java @@ -15,7 +15,7 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.pay.handler; +package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharsetUtil; @@ -30,6 +30,7 @@ import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayNotifyRecord; import com.pig4cloud.pigx.pay.entity.PayTradeOrder; +import com.pig4cloud.pigx.pay.handler.MessageDuplicateCheckerHandler; import com.pig4cloud.pigx.pay.service.PayGoodsOrderService; import com.pig4cloud.pigx.pay.service.PayNotifyRecordService; import com.pig4cloud.pigx.pay.service.PayTradeOrderService; @@ -75,9 +76,15 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public Boolean duplicateChecker(Map params) { + //判断是否是为支付中 + if (StrUtil.equals(TradeStatusEnum.WAIT_BUYER_PAY.getDescription(), params.get(PayConstants.TRADE_STATUS))) { + log.info("支付宝订单待支付 {} 不做处理", params); + return true; + } + // 判断10秒内是否已经回调处理 - if (!duplicateCheckerHandler.isDuplicate(params.get(PayConstants.OUT_TRADE_NO))) { - log.warn("支付宝订单重复回调 {} 不做处理", params); + if (duplicateCheckerHandler.isDuplicate(params.get(PayConstants.OUT_TRADE_NO))) { + log.info("支付宝订单重复回调 {} 不做处理", params); this.saveNotifyRecord(params, "重复回调"); return true; } @@ -124,9 +131,9 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public String parse(Map params) { - String tradeStatus = EnumUtil.fromString(TradeStatusEnum.class, params.get("trade_status")).getStatus(); + String tradeStatus = EnumUtil.fromString(TradeStatusEnum.class, params.get(PayConstants.TRADE_STATUS)).getStatus(); - String orderNo = params.get("out_trade_no"); + String orderNo = params.get(PayConstants.OUT_TRADE_NO); PayGoodsOrder goodsOrder = goodsOrderService.getOne(Wrappers.lambdaQuery() .eq(PayGoodsOrder::getPayOrderId, orderNo)); goodsOrder.setStatus(tradeStatus); @@ -136,6 +143,7 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand .eq(PayTradeOrder::getOrderId, orderNo)); Long succTime = MapUtil.getLong(params, "time_end"); tradeOrder.setPaySuccTime(succTime); + tradeOrder.setChannelOrderNo(params.get("trade_no")); tradeOrder.setStatus(TradeStatusEnum.TRADE_SUCCESS.getStatus()); tradeOrder.setChannelOrderNo(params.get("transaction_id")); tradeOrderService.updateById(tradeOrder); @@ -153,11 +161,7 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand public void saveNotifyRecord(Map params, String result) { PayNotifyRecord record = new PayNotifyRecord(); String notifyId = params.get("notify_id"); - record.setNotifyId(notifyId); - String orderNo = params.get("out_trade_no"); - record.setOrderNo(orderNo); - record.setRequest(MapUtil.join(params, StrUtil.DASHED, StrUtil.DASHED)); - record.setResponse(result); - recordService.save(record); + saveRecord(params, result, record, notifyId, recordService); } + } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AlipayWapPayOrderHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java similarity index 80% rename from pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AlipayWapPayOrderHandler.java rename to pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java index 2767d6f8c..9244c1f07 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/AlipayWapPayOrderHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java @@ -1,4 +1,21 @@ -package com.pig4cloud.pigx.pay.handler; +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.URLUtil; @@ -54,7 +71,7 @@ public class AlipayWapPayOrderHandler extends AbstractPayOrderHandler { tradeOrder.setChannelMchId(AliPayApiConfigKit.getAliPayApiConfig().getAppId()); tradeOrder.setClientIp(ServletUtil.getClientIP(request)); tradeOrder.setCurrency("cny"); - tradeOrder.setExpireTime(Long.parseLong(payCommonProperties.getAliPayConfig().getReturnUrl())); + tradeOrder.setExpireTime(Long.parseLong(payCommonProperties.getAliPayConfig().getExpireTime())); tradeOrder.setStatus(OrderStatusEnum.INIT.getStatus()); tradeOrder.setBody(goodsOrder.getGoodsName()); tradeOrderMapper.insert(tradeOrder); @@ -83,7 +100,7 @@ public class AlipayWapPayOrderHandler extends AbstractPayOrderHandler { AliPayApi.wapPay(response, model, payCommonProperties.getAliPayConfig().getReturnUrl() , payCommonProperties.getAliPayConfig().getNotifyUrl()); } catch (AlipayApiException e) { - log.warn("支付宝支付失败 {} {}", e.getErrCode(), e.getErrMsg()); + log.error("支付宝手机支付失败", e); tradeOrder.setErrMsg(e.getErrMsg()); tradeOrder.setErrCode(e.getErrCode()); tradeOrder.setStatus(OrderStatusEnum.FAIL.getStatus()); diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/MessageRedisDuplicateCheckerHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/MessageRedisDuplicateCheckerHandler.java new file mode 100644 index 000000000..b01f67de0 --- /dev/null +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/MessageRedisDuplicateCheckerHandler.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.pay.handler.impl; + +import com.pig4cloud.pigx.pay.handler.MessageDuplicateCheckerHandler; +import lombok.AllArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.time.Duration; + +/** + * @author lengleng + * @date 2019-06-14 + *

+ * 消息去重 + */ +@Service +@AllArgsConstructor +public class MessageRedisDuplicateCheckerHandler implements MessageDuplicateCheckerHandler { + private final RedisTemplate redisTemplate; + + /** + * 判断回调消息是否重复. + * + * @param messageId messageId需要根据上面讲的方式构造 + * @return 如果是重复消息true，否则返回false + */ + @Override + public boolean isDuplicate(String messageId) { + return !redisTemplate.opsForValue() + .setIfAbsent(messageId, messageId, Duration.ofSeconds(10L)); + } +} diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/WeChatMpPayOrderHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java similarity index 77% rename from pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/WeChatMpPayOrderHandler.java rename to pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java index 4330cd641..e3f22f4d3 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/WeChatMpPayOrderHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java @@ -1,4 +1,21 @@ -package com.pig4cloud.pigx.pay.handler; +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ + +package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.extra.servlet.ServletUtil; import com.jpay.ext.kit.PaymentKit; @@ -8,6 +25,7 @@ import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.config.PayCommonProperties; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayTradeOrder; +import com.pig4cloud.pigx.pay.handler.impl.AbstractPayOrderHandler; import com.pig4cloud.pigx.pay.mapper.PayGoodsOrderMapper; import com.pig4cloud.pigx.pay.mapper.PayTradeOrderMapper; import com.pig4cloud.pigx.pay.utils.OrderStatusEnum; diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/WeChatPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java similarity index 88% rename from pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/WeChatPayNotifyCallbackHandler.java rename to pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java index ee02267a1..0397642d4 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/WeChatPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java @@ -15,11 +15,10 @@ * Author: lengleng (wangiegie@gmail.com) */ -package com.pig4cloud.pigx.pay.handler; +package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.EnumUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jpay.ext.kit.PaymentKit; import com.jpay.weixin.api.WxPayApiConfigKit; @@ -27,6 +26,7 @@ import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.pay.entity.PayGoodsOrder; import com.pig4cloud.pigx.pay.entity.PayNotifyRecord; import com.pig4cloud.pigx.pay.entity.PayTradeOrder; +import com.pig4cloud.pigx.pay.handler.MessageDuplicateCheckerHandler; import com.pig4cloud.pigx.pay.service.PayGoodsOrderService; import com.pig4cloud.pigx.pay.service.PayNotifyRecordService; import com.pig4cloud.pigx.pay.service.PayTradeOrderService; @@ -74,8 +74,8 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand @Override public Boolean duplicateChecker(Map params) { // 判断10秒内是否已经回调处理 - if (!duplicateCheckerHandler.isDuplicate(params.get(PayConstants.OUT_TRADE_NO))) { - log.warn("微信订单重复回调 {} 不做处理", params); + if (duplicateCheckerHandler.isDuplicate(params.get(PayConstants.OUT_TRADE_NO))) { + log.info("微信订单重复回调 {} 不做处理", params); this.saveNotifyRecord(params, "重复回调"); return true; } @@ -106,9 +106,9 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public String parse(Map params) { - String orderNo = params.get("out_trade_no"); - String tradeStatus = EnumUtil.fromString(TradeStatusEnum.class, params.get("result_code")).getStatus(); + String tradeStatus = EnumUtil.fromString(TradeStatusEnum.class, params.get(PayConstants.RESULT_CODE)).getStatus(); + String orderNo = params.get(PayConstants.OUT_TRADE_NO); PayGoodsOrder goodsOrder = goodsOrderService.getOne(Wrappers.lambdaQuery() .eq(PayGoodsOrder::getPayOrderId, orderNo)); goodsOrder.setStatus(tradeStatus); @@ -140,11 +140,6 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand public void saveNotifyRecord(Map params, String result) { PayNotifyRecord record = new PayNotifyRecord(); String notifyId = params.get("transaction_id"); - record.setNotifyId(notifyId); - String orderNo = params.get("out_trade_no"); - record.setOrderNo(orderNo); - record.setRequest(MapUtil.join(params, StrUtil.DASHED, StrUtil.DASHED)); - record.setResponse(result); - recordService.save(record); + saveRecord(params, result, record, notifyId, recordService); } } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/PayConstants.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/PayConstants.java index d4dbd012d..400192bb9 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/PayConstants.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/PayConstants.java @@ -23,4 +23,15 @@ public interface PayConstants { */ String MICRO_MESSENGER = "MicroMessenger"; + /** + * 返回码 + */ + String RESULT_CODE = "result_code"; + + /** + * 支付状态（支付宝） + */ + String TRADE_STATUS = "trade_status"; + + } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/TradeStatusEnum.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/TradeStatusEnum.java index 623436aa4..83016cbca 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/TradeStatusEnum.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/utils/TradeStatusEnum.java @@ -13,7 +13,7 @@ public enum TradeStatusEnum { /** * 交易完成 */ - WAIT_BUYER_PAY("TRADE_FINISHED", OrderStatusEnum.INIT.getStatus()), + WAIT_BUYER_PAY("WAIT_BUYER_PAY", OrderStatusEnum.INIT.getStatus()), /** * TRADE_CLOSED