修改bug

mitao

2024-08-06 356b6e4b0a11a6e44717dc9b92beaacc9c0c4b7a

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

@@ -310,26 +310,27 @@
                    couponMemberDTO.setCouponStatus(CouponUseEnum.UNUSED.getCode());
                    promotionClient.updCouponMember(couponMemberDTO, SecurityConstants.INNER);
                }
                // 扣除订单积分
                Member member = memberClient.getMembeOne(order.getMemberId(),
                                SecurityConstants.INNER)
                        .getData();
                if (StringUtils.isNotNull(member)) {
                    MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
                    memberPointsDTO.setMemberId(order.getMemberId());
                    memberPointsDTO.setPointsType(2);
                    memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
                    memberPointsDTO.setPoints(order.getPoints());
                    memberClient.addMemberPoints(memberPointsDTO);

                    updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
                    updMembeOneDTO.setMemberId(order.getMemberId());
                    updMembeOneDTO.setType(2);
                    updMembeOneDTO.setTotalPoints(order.getPoints());
                    memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
                }
            }
            orderReturnRequest.setAuditStatus(AuditStatusEnum.PASSED);
            // 扣除订单积分
            Member member = memberClient.getMembeOne(order.getMemberId(), SecurityConstants.INNER)
                    .getData();
            if (StringUtils.isNotNull(member)) {
                MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
                memberPointsDTO.setMemberId(order.getMemberId());
                memberPointsDTO.setPointsType(2);
                memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
                memberPointsDTO.setPoints(order.getPoints());
                memberClient.addMemberPoints(memberPointsDTO);

                updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
                updMembeOneDTO.setMemberId(order.getMemberId());
                updMembeOneDTO.setType(2);
                updMembeOneDTO.setTotalPoints(
                        Math.max(member.getTotalPoints() - order.getPoints(), 0));
                memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
            }
        } else {
            orderReturnRequest.setStatus(ReturnRequestStatusEnum.REJECTED);
            orderReturnRequest.setAuditStatus(AuditStatusEnum.REJECTED);
@@ -395,7 +396,7 @@
            updMembeOneDTO updMembeOneDTO = new updMembeOneDTO();
            updMembeOneDTO.setMemberId(order.getMemberId());
            updMembeOneDTO.setType(2);
            updMembeOneDTO.setTotalPoints(Math.max(member.getTotalPoints() - order.getPoints(), 0));
            updMembeOneDTO.setTotalPoints(order.getPoints());
            memberClient.updMembeOne(updMembeOneDTO, SecurityConstants.INNER);
        }
        if (Objects.nonNull(order.getCouponId())) {