From 564cf34a6fb2447515e61c3cc698faea2c4fb08d Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期日, 09 六月 2024 21:23:07 +0800
Subject: [PATCH] 用户端 商品

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java |   89 ++++++++++++++++++++++++++------------------
 1 files changed, 53 insertions(+), 36 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 1cea2f1..1297b6c 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
@@ -72,6 +72,7 @@
 
     @Resource
     private OrderMapper OrderMapper;
+
     @Resource
     private AuctionClient auctionClient;
 
@@ -143,33 +144,42 @@
                 try {
                     LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
                     wrapper.eq(Paylog::getOutTradeNo,paylog1.getOutTradeNo());
-                    Paylog one = this.getOne(wrapper);
-                    if(SinataUtil.isEmpty(one)) {
+                    Paylog paylog = this.getOne(wrapper);
+                    if(SinataUtil.isEmpty(paylog)) {
                         this.save(paylog1);
+                        if (paylog1.getOutTradeNo().contains("BO")) {
                             BondDTO bondVO=new BondDTO();
                             bondVO.setOrderNO(paylog1.getOutTradeNo());
                             auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
 
+                        }else{
+                            BondDTO bondVO=new BondDTO();
+
+                            bondVO.setOrderNO(paylog.getOutTradeNo());
+                            auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+
                             LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
-                            wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
+                            wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
                             wrapper1.eq(Order::getDelFlag,0);
                             Order page1 = OrderMapper.selectOne(wrapper1);
                             page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
                             OrderMapper.updateById(page1);
 
-                           MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
-                           memberPointsDTO.setMemberId(page1.getMemberId());
-                           memberPointsDTO.setPointsType(1);
-                           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);
+                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+                            memberPointsDTO.setMemberId(page1.getMemberId());
+                            memberPointsDTO.setPointsType(1);
+                            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);
+
+                        }
 
                     }
 
@@ -259,32 +269,39 @@
                         System.out.println("支付完成时间" + time_end);
                         paylog.setAddTime(LocalDateTime.now());
                         this.save(paylog);
-                        BondDTO bondVO=new BondDTO();
+                        if (paylog.getOutTradeNo().contains("BO")) {
+                            BondDTO bondVO=new BondDTO();
+                            bondVO.setOrderNO(paylog.getOutTradeNo());
+                            auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
 
-                        bondVO.setOrderNO(paylog.getOutTradeNo());
-                        auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+                        }else{
+                            BondDTO bondVO=new BondDTO();
 
-                        LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
-                        wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
-                        wrapper1.eq(Order::getDelFlag,0);
-                        Order page1 = OrderMapper.selectOne(wrapper1);
-                        page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
-                        OrderMapper.updateById(page1);
+                            bondVO.setOrderNO(paylog.getOutTradeNo());
+                            auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
 
-                        MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
-                        memberPointsDTO.setMemberId(page1.getMemberId());
-                        memberPointsDTO.setPointsType(1);
-                        memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
-                        memberPointsDTO.setPoints(page1.getPoints());
-                        memberClient.addMemberPoints(memberPointsDTO);
+                            LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+                            wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
+                            wrapper1.eq(Order::getDelFlag,0);
+                            Order page1 = OrderMapper.selectOne(wrapper1);
+                            page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+                            OrderMapper.updateById(page1);
 
-                        updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
-                        MembeOneDTO.setType(1);
-                        MembeOneDTO.setMemberId(page1.getMemberId());
-                        MembeOneDTO.setMoney(page1.getTotalAmount());
-                        MembeOneDTO.setTotalPoints(page1.getPoints());
-                        memberClient.updMembeOne(MembeOneDTO);
+                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+                            memberPointsDTO.setMemberId(page1.getMemberId());
+                            memberPointsDTO.setPointsType(1);
+                            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);
+
+                        }
                         log.debug("WxpayController.notify__回调处理成功:SUCCESS");
                         response.getOutputStream().print("success");
                     }

--
Gitblit v1.7.1