修改bug

mitao

2024-07-29 f9562fc61410d6c66e6973cb63a659557059d114

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

@@ -269,6 +269,30 @@
                }
            }
            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);
            }
            if (Objects.nonNull(order.getCouponId())) {
                CouponMemberDTO couponMemberDTO = new CouponMemberDTO();
                couponMemberDTO.setId(order.getCouponId());
                couponMemberDTO.setCouponStatus(CouponUseEnum.UNUSED.getCode());
                promotionClient.updCouponMember(couponMemberDTO, SecurityConstants.INNER);
            }
        } else {
            orderReturnRequest.setStatus(ReturnRequestStatusEnum.REJECTED);
            orderReturnRequest.setAuditStatus(AuditStatusEnum.REJECTED);
@@ -326,8 +350,8 @@
        if (StringUtils.isNotNull(member)) {
            MemberPointsDTO memberPointsDTO = new MemberPointsDTO();
            memberPointsDTO.setMemberId(order.getMemberId());
            memberPointsDTO.setPointsType(1);
            memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
            memberPointsDTO.setPointsType(2);
            memberPointsDTO.setPointsStatus(PointStatusEnum.REDUCE);
            memberPointsDTO.setPoints(order.getPoints());
            memberClient.addMemberPoints(memberPointsDTO);