From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期四, 30 五月 2024 18:33:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java index cf4787b..4731fc4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java @@ -24,7 +24,8 @@ import com.ruoyi.order.util.tencent.common.XMLParser; import com.ruoyi.order.util.tencent.protocol.AppPayReqData; import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData; -import com.ruoyi.system.api.domain.dto.BondVO; + +import com.ruoyi.system.api.domain.dto.BondDTO; import com.ruoyi.system.api.domain.dto.RefundDTO; import com.ruoyi.system.api.feignClient.OrderClient; import java.io.IOException; @@ -45,6 +46,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.system.api.feignClient.OrderClient; import org.springframework.stereotype.Service; /** @@ -136,7 +139,7 @@ if(SinataUtil.isEmpty(one)) { iPaylogService.save(paylog1); if (paylog1.getOutTradeNo().contains("BO")) { - BondVO bondVO=new BondVO(); + BondDTO bondVO=new BondDTO(); bondVO.setOrderNO(paylog1.getOutTradeNo()); orderClient.UpdateBond(bondVO, SecurityConstants.INNER); @@ -231,7 +234,7 @@ paylog.setAddTime(LocalDateTime.now()); iPaylogService.save(paylog); if (paylog.getOutTradeNo().contains("BO")) { - BondVO bondVO=new BondVO(); + BondDTO bondVO=new BondDTO(); bondVO.setOrderNO(paylog.getOutTradeNo()); orderClient.UpdateBond(bondVO, SecurityConstants.INNER); -- Gitblit v1.7.1