【同步】BOOT 和 CLOUD 的功能

(cherry picked from commit 5b816120860fa13ee7e0e4515d605cf1f015ffbf)
This commit is contained in:
YunaiV
2025-05-14 15:05:12 +08:00
committed by dengqichen
parent eaaaa5cba0
commit dd58d334f5
24 changed files with 1109 additions and 696 deletions
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.pay.service.demo;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -231,7 +232,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
throw exception(DEMO_ORDER_NOT_FOUND);
}
// 1.2 校验退款订单匹配
if (Objects.equals(order.getPayRefundId(), payRefundId)) {
if (ObjUtil.notEqual(order.getPayRefundId(), payRefundId)) {
log.error("[validateDemoOrderCanRefunded][order({}) 退款单不匹配({}),请进行处理!order 数据是:{}]",
id, payRefundId, toJsonString(order));
throw exception(DEMO_ORDER_REFUND_FAIL_REFUND_ORDER_ID_ERROR);