Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-15 4b25a348feacbc6eb1b07fe2a107e3a94c6d9c4e

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java

@@ -313,7 +313,7 @@
                //添加积分明细
                if(!shopAppUser.getLavePoint().equals(lavePoint)){
                    UserPoint userPoint = new UserPoint();
                    userPoint.setType(9);
                    userPoint.setType(8);
                    userPoint.setHistoricalPoint(lavePoint);
                    userPoint.setVariablePoint(hxmd_point);
                    userPoint.setBalance(shopAppUser.getLavePoint());