From 38213237cc11c9bd3f11b0fa69c56ef663049a4b Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Fri, 29 Aug 2025 11:40:54 +0800
Subject: [PATCH] feat: 店铺地址和坐标合并

---
 oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java b/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java
index ddd360b..3af99bd 100644
--- a/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java
@@ -5,8 +5,8 @@
 import com.oying.modules.hwc.utils.SignUtil;
 import com.oying.modules.hwc.utils.XmlUtils;
 import com.oying.modules.security.config.SwiftPassProperties;
-import com.oying.modules.sh.domain.OrderReturn;
 import com.oying.modules.sh.domain.vo.OrderResponse;
+import com.oying.modules.sh.domain.vo.OrderReturnResponse;
 import com.oying.modules.sh.service.OrderReturnService;
 import com.oying.modules.sh.service.OrderService;
 import com.oying.utils.enums.OrderStatusEnum;
@@ -94,8 +94,8 @@
                 String sign_type = map.get("sign_type");
                 String reSign = map.get("sign");
                 if (map.containsKey("sign")) {
-                    OrderReturn order = returnService.getByReturnNum(map.get("out_refund_no"));
-                    PayTypeEnum status = PayTypeEnum.find(order.getPayType());
+                    OrderReturnResponse order = returnService.getByReturnNum(map.get("out_refund_no"));
+                    PayTypeEnum status = PayTypeEnum.find(order.getOrderReturn().getPayType());
                     if (SignUtil.verifySign(reSign, sign_type, map, properties, status)) {
                         log.error("汇旺财退款验证签名错误!:{}", map.toString());
                     } else {

--
Gitblit v1.9.3