bug

jiangqs

2023-08-06 7cc15f642b71595a2137fb939804a951f62448ec

bug

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberTotalChangeDto.java

@@ -59,4 +59,11 @@
    @ApiModelProperty(value = "单品订单变化")
    private Integer goodsOrderChange;

    @ApiModelProperty(value="订单")
    private String orderId;

    @ApiModelProperty(value="订单")
    private String orderNo;


}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -1500,6 +1500,17 @@
            } else {
                memberTotal.setUseableIntegral(memberTotal.getUseableIntegral() + memberTotalChangeDto.getChangeIntegral());
                memberTotal.setTotalIntegral(memberTotal.getTotalIntegral() + memberTotalChangeDto.getChangeIntegral());
                IntegralRecord integralRecord = new IntegralRecord();
                integralRecord.setDelFlag(0);
                integralRecord.setUserId(memberTotalChangeDto.getUserId());
                integralRecord.setChangeType(5);
                integralRecord.setCreateTime(new Date());
                integralRecord.setChangeIntegral(memberTotalChangeDto.getChangeIntegral());
                integralRecord.setSurpIntegral(memberTotal.getUseableIntegral()+memberTotalChangeDto.getChangeIntegral());
                integralRecord.setChangeReason("订单【"+memberTotalChangeDto.getOrderNo()+"】获得积分");
                integralRecord.setOrderId(memberTotalChangeDto.getOrderId());
                integralRecord.setOrderNo(memberTotalChangeDto.getOrderNo());
                integralRecordService.saveOrUpdate(integralRecord);
            }
        }
        //消费变动

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

@@ -3695,6 +3695,8 @@
            Integer integral = Integer.valueOf(integralBig.toString());
            memberTotalChangeDto.setChangeIntegral(integral);
            memberTotalChangeDto.setTypeIntegral(1);
            memberTotalChangeDto.setOrderId(orderId);
            memberTotalChangeDto.setOrderNo(order.getOrderNo());
        }
        // 设置会员支付金额和支付时间
        memberTotalChangeDto.setPayMoney(order.getPayMoney());