From 0b9f2eeb5e2ff7995f39d217e90a6c64e37366d4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 六月 2024 15:32:44 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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 d926c5f..58f439f 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
@@ -17,6 +17,7 @@
import com.ruoyi.common.core.enums.PointStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.Paylog;
+import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.mapper.PaylogMapper;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.service.IPaylogService;
@@ -32,6 +33,7 @@
import com.ruoyi.system.api.domain.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
@@ -69,7 +71,7 @@
@Resource
- private IOrderService iOrderService;
+ private OrderMapper OrderMapper;
@Resource
private AuctionClient auctionClient;
@@ -77,14 +79,15 @@
private MemberClient memberClient;
@Override
- public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) {
+ public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
Double price = 0.0;
-
+ String subject;
+ String body;
try {
if(judgeContainsStr(orderNO)){
price= Double.valueOf(1);
- body = body;
- subject = subject;
+ body = " 订单支付";
+ subject = " 订单支付";
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
@@ -151,9 +154,10 @@
LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
wrapper1.eq(Order::getDelFlag,0);
- Order page1 = iOrderService.getOne(wrapper1);
+ Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
- iOrderService.updateById(page1);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
memberPointsDTO.setMemberId(page1.getMemberId());
@@ -161,6 +165,13 @@
memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
+
}
@@ -258,9 +269,10 @@
LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
wrapper1.eq(Order::getDelFlag,0);
- Order page1 = iOrderService.getOne(wrapper1);
+ Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
- iOrderService.updateById(page1);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
memberPointsDTO.setMemberId(page1.getMemberId());
@@ -269,6 +281,12 @@
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
response.getOutputStream().print("success");
--
Gitblit v1.7.1