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 | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 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 0633717..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
@@ -13,7 +13,7 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.order.domain.pojo.Paylog;
+import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.PaylogMapper;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.SinataUtil;
@@ -24,9 +24,10 @@
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.OrderAuctionBond;
-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;
import java.io.PrintWriter;
import java.math.BigDecimal;
@@ -36,7 +37,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
@@ -139,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);
@@ -234,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);
@@ -494,22 +494,6 @@
iPaylogService.updateBatchById(updList);
}
return map;
- }
-
- public static void main(String[] args) {
- Map<String, Object> map = new HashMap<>();
- map.put("1", true);
- map.put("2", false);
- map.put("3", true);
- map.put("4", false);
- map.put("5", true);
- List<String> collect = map.entrySet().stream().map(entry -> {
- if (!(boolean) entry.getValue()) {
- return entry.getKey();
- }
- return null;
- }).filter(Objects::nonNull).collect(Collectors.toList());
- System.out.println(collect);
}
private Boolean handleRefund(Paylog paylog, BigDecimal amount,
--
Gitblit v1.7.1