修改bug

rentaiming

2024-07-03 03ea0fc5754a5d37d9c5f6e872f5798054360303

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

@@ -96,7 +96,13 @@
                    wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
                    wrapper1.eq(OrderAuctionBond::getDelFlag,0);
                    OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
                    one1.setBoundStatus(BondStatusEnum.PAID);
                    if (one1.getBond().compareTo(new BigDecimal(0))==0){
                        one1.setBoundStatus(BondStatusEnum.PAID);
                        Map<String, Object> returnMap = new HashMap<>();
                        returnMap.put("Type",1);
                       return R.ok(returnMap);
                    }


                }else{
                    LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
@@ -107,8 +113,9 @@
                        page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
                        page1.setPayTime(LocalDateTime.now());
                        OrderMapper.updateById(page1);
                        Map<String, Object> returnMap = new HashMap<>(20);
                        Map<String, Object> returnMap = new HashMap<>();
                        returnMap.put("Type",1);
                        return R.ok(returnMap);
                    }

                    page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
@@ -121,6 +128,7 @@
                    memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
                    memberPointsDTO.setPoints(page1.getPoints());
                    memberClient.addMemberPoints(memberPointsDTO);

                    updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
                    MembeOneDTO.setType(1);
                    MembeOneDTO.setMemberId(page1.getMemberId());
@@ -140,7 +148,7 @@
                    if (type == 1) {
                        // 支付宝预下单
                        return this.alipay(orderNO, subject, body, price, request);
                    } else {
                    } if (type == 2){
                        // 微信预下单
                        return this.wxpay(2, orderNO, body, openId, price, request);
                    }
@@ -156,7 +164,7 @@
                    if (type == 1) {
                        // 支付宝预下单
                        return this.alipay(orderNO, subject, body, price, request);
                    } else {
                    } if (type == 2) {
                        // 微信预下单
                        return this.wxpay(2, orderNO, body,openId, price, request);
                    }