From 6e8a55edef22faa7f7d5bbbccd727119a6fd918f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 03 六月 2024 14:05:08 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 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 1a037bf..95882ef 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;
@@ -46,7 +47,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.system.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;
/**
@@ -60,11 +60,7 @@
@Service
public class PaylogServiceImpl extends ServiceImpl<PaylogMapper, Paylog> implements IPaylogService {
- @Resource
- private PaylogServiceImpl paylogServiceImpl;
- @Resource
- private IPaylogService iPaylogService;
@Resource
private OrderClient orderClient;
@@ -81,10 +77,10 @@
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
- return paylogServiceImpl.alipay(orderNO, subject, body, price, request);
+ return this.alipay(orderNO, subject, body, price, request);
} else {
// 微信预下单
- return paylogServiceImpl.wxpay(2, orderNO, body,openId, price, request);
+ return this.wxpay(2, orderNO, body,openId, price, request);
}
}
} catch (Exception e) {
@@ -134,11 +130,11 @@
try {
LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Paylog::getOutTradeNo,paylog1.getOutTradeNo());
- Paylog one = iPaylogService.getOne(wrapper);
+ Paylog one = this.getOne(wrapper);
if(SinataUtil.isEmpty(one)) {
- iPaylogService.save(paylog1);
+ this.save(paylog1);
if (paylog1.getOutTradeNo().contains("BO")) {
- BondVO bondVO=new BondVO();
+ BondDTO bondVO=new BondDTO();
bondVO.setOrderNO(paylog1.getOutTradeNo());
orderClient.UpdateBond(bondVO, SecurityConstants.INNER);
@@ -220,7 +216,7 @@
LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
- Paylog one = iPaylogService.getOne(wrapper);
+ Paylog one = this.getOne(wrapper);
if(SinataUtil.isEmpty(one)) {
Paylog paylog = new Paylog();
paylog.setOutTradeNo(out_trade_no);
@@ -231,9 +227,9 @@
paylog.setState(1);
System.out.println("支付完成时间" + time_end);
paylog.setAddTime(LocalDateTime.now());
- iPaylogService.save(paylog);
+ this.save(paylog);
if (paylog.getOutTradeNo().contains("BO")) {
- BondVO bondVO=new BondVO();
+ BondDTO bondVO=new BondDTO();
bondVO.setOrderNO(paylog.getOutTradeNo());
orderClient.UpdateBond(bondVO, SecurityConstants.INNER);
@@ -473,7 +469,7 @@
Set<String> orderNoList = refundDTOS.stream().map(RefundDTO::getOrderNo)
.collect(Collectors.toSet());
if (StringUtils.isNotEmpty(orderNoList)) {
- Map<String, Paylog> paylogMap = iPaylogService.lambdaQuery()
+ Map<String, Paylog> paylogMap = this.lambdaQuery()
.in(Paylog::getOutTradeNo, orderNoList).eq(Paylog::getState, 1).list().stream()
.collect(Collectors.toMap(Paylog::getOutTradeNo, Function.identity()));
List<Paylog> updList = new ArrayList<>();
@@ -490,7 +486,7 @@
}
});
}
- iPaylogService.updateBatchById(updList);
+ this.updateBatchById(updList);
}
return map;
}
@@ -500,7 +496,7 @@
boolean res = false;
if (StringUtils.isNotNull(paylog)) {
if (paylog.getPayType() == 1) {
- res = paylogServiceImpl.refundForAlipay(paylog.getOutTradeNo(),
+ res = this.refundForAlipay(paylog.getOutTradeNo(),
paylog.getTradeNo(), amount.doubleValue());
}
if (paylog.getPayType() == 2) {
@@ -511,7 +507,7 @@
String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
Integer totalFee = Integer.parseInt(
money.substring(0, money.length() - 3));
- res = paylogServiceImpl.refundForWxpay(2, paylog.getTradeNo(),
+ res = this.refundForWxpay(2, paylog.getTradeNo(),
paylog.getOutTradeNo(), orderNo, totalFee,
refundFee, "4");
}
--
Gitblit v1.7.1