ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -81,11 +81,12 @@ SysUser sysUser = sysUserService.getById(userid); LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>() .ne(SysRole::getRoleId, 2) .isNull(SysRole::getShopId) .eq(SysRole::getDelFlag, 0) .eq(SysRole::getStatus, 0); if (sysUser.getRoleType() == 2) { wrapper.eq(SysRole::getShopId, sysUser.getObjectId()); }else { wrapper.isNull(SysRole::getShopId); } List<SysRole> list = roleService.list(wrapper); return AjaxResult.success(list); ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
@@ -42,6 +42,7 @@ @Override public CommissionStatistics commissionStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) { balanceChangeRecord.setChangeType(4); List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord); BigDecimal totalCommission = balanceChangeRecordList.stream() ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
@@ -36,7 +36,9 @@ t_balance_change_record tbcr LEFT JOIN t_app_user tau ON tbcr.app_user_id = tau.id <where> and tbcr.change_type = 4 <if test="changeRecord.changeType == null"> and tbcr.change_type = #{changeRecord.changeType} </if> <if test="changeRecord.userName != null and changeRecord.userName != ''"> and tau.name like concat('%',#{changeRecord.userName},'%') </if> ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -808,6 +808,7 @@ } List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0)); int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum(); System.out.println("111111111111222"); orderInfo.setGoodsNum(sum); List<Object> goodsJson = new ArrayList<>(); for (OrderGood orderGood : orderGoods) {
