Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-15 2427b05aeca08ee3c4998843bf749d35440d461b

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java

@@ -72,7 +72,6 @@

    @Resource
    private OrderMapper OrderMapper;

    @Resource
    private AuctionClient auctionClient;

@@ -80,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) {
                    // 支付宝预下单
@@ -144,25 +144,19 @@
                try {
                    LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
                    wrapper.eq(Paylog::getOutTradeNo,paylog1.getOutTradeNo());
                    Paylog paylog = this.getOne(wrapper);
                    if(SinataUtil.isEmpty(paylog)) {
                    Paylog one = this.getOne(wrapper);
                    if(SinataUtil.isEmpty(one)) {
                        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,paylog.getOutTradeNo());
                            wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
                            wrapper1.eq(Order::getDelFlag,0);
                            Order page1 = OrderMapper.selectOne(wrapper1);
                            page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
                            page1.setPayTime(LocalDateTime.now());
                            OrderMapper.updateById(page1);

                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
@@ -171,7 +165,6 @@
                            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                            memberPointsDTO.setPoints(page1.getPoints());
                            memberClient.addMemberPoints(memberPointsDTO);

                            updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
                            MembeOneDTO.setType(1);
                            MembeOneDTO.setMemberId(page1.getMemberId());
@@ -179,7 +172,6 @@
                            MembeOneDTO.setTotalPoints(page1.getPoints());
                            memberClient.updMembeOne(MembeOneDTO);

                        }

                    }

@@ -269,12 +261,6 @@
                        System.out.println("支付完成时间" + time_end);
                        paylog.setAddTime(LocalDateTime.now());
                        this.save(paylog);
                        if (paylog.getOutTradeNo().contains("BO")) {
                            BondDTO bondVO=new BondDTO();
                            bondVO.setOrderNO(paylog.getOutTradeNo());
                            auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);

                        }else{
                            BondDTO bondVO=new BondDTO();

                            bondVO.setOrderNO(paylog.getOutTradeNo());
@@ -285,6 +271,7 @@
                            wrapper1.eq(Order::getDelFlag,0);
                            Order page1 = OrderMapper.selectOne(wrapper1);
                            page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
                        page1.setPayTime(LocalDateTime.now());
                            OrderMapper.updateById(page1);

                            MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
@@ -301,7 +288,6 @@
                            MembeOneDTO.setTotalPoints(page1.getPoints());
                            memberClient.updMembeOne(MembeOneDTO);

                        }
                        log.debug("WxpayController.notify__回调处理成功：SUCCESS");
                        response.getOutputStream().print("success");
                    }