diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 0a2c02347..d4c8845ce 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -295,7 +295,7 @@ public class WxCouponOrderController extends BaseController { res.put("valuable", valuable); res.put("outOrderId",couponOrder.getComposeOrderId()); if(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode().equals(couponOrder.getCouponOrderStatus()) && valuable){ - WxRefundOrder refundOrder = wxRefundOrderService.findRefundOrder(getTenantInfo(), couponOrder.getOrderId()); + WxRefundOrder refundOrder = wxRefundOrderService.findRefundStatus(getTenantInfo(), couponOrder.getOrderId()); if(refundOrder != null){ res.put("outRefundOrderId",refundOrder.getId()); res.put("refundOrderStatus",refundOrder.getRefundOrderStatus()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 792b16ab6..74282fbf1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -708,7 +708,7 @@ public class WxOrderController extends BaseController { if(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus()) || EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode().equals(wxOrder.getOrderStatus()) || EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode().equals(wxOrder.getOrderStatus())){ - WxRefundOrder refundOrder = wxRefundOrderService.findRefundOrder(getTenantInfo(), orderId); + WxRefundOrder refundOrder = wxRefundOrderService.findRefundStatus(getTenantInfo(), orderId); map.put("outRefundOrderId",refundOrder.getId()); map.put("refundOrderStatus",refundOrder.getRefundOrderStatus()); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java index 7e9c14864..55ad73d18 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRefundOrderMapper.java @@ -4,8 +4,11 @@ import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxRefundOrder; import com.iformall.domain.po.base.TenantEntity; +import org.apache.ibatis.annotations.Param; public interface WxRefundOrderMapper extends CommonMapper { List findList(WxRefundOrder wxRefundOrder); + + WxRefundOrder findRefundStatus(@Param("orderId")Long orderId, @Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java index c7ee0c4a0..3887f2ae0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRefundOrderService.java @@ -103,6 +103,8 @@ public interface WxRefundOrderService { WxRefundOrder findRefundOrder(TenantEntity tenantInfo, Long orderId); + WxRefundOrder findRefundStatus(TenantEntity tenantInfo, Long orderId); + /** * 抖音2.0 退款回调创建退款订单 * @param tenantEntity diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index b647491e5..b11994a7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -869,6 +869,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { return null; } + @Override + public WxRefundOrder findRefundStatus(TenantEntity tenantInfo, Long orderId) { + return wxRefundOrderMapper.findRefundStatus(orderId,tenantInfo.getTenantId()); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback) { diff --git a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml index a997bd5a5..75ffa7a4b 100644 --- a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml @@ -132,5 +132,12 @@ +