bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserPointsMerchandiseServiceImpl.java

@@ -25,12 +25,17 @@
 */
@Service
public class UserPointsMerchandiseServiceImpl extends ServiceImpl<UserPointsMerchandiseMapper, UserPointsMerchandise> implements UserPointsMerchandiseService {

    @Autowired
    private UserPointsMerchandiseMapper userPointsMerchandiseMapper;




    @Override
    public List<PointMerchandiseIncomeVo> getAmount() {
        return userPointsMerchandiseMapper.getAmount();
        List<PointMerchandiseIncomeVo> amount = userPointsMerchandiseMapper.getAmount();
        return amount;
    }

    @Override
@@ -41,6 +46,9 @@

    @Override
    public List<ConsumeDetail> getConsumeDetails(BillingDataRequestVo requestVo) {
        return this.baseMapper.getConsumeDetails(requestVo);
        List<ConsumeDetail> consumeDetails = this.baseMapper.getConsumeDetails(requestVo);
        List<ConsumeDetail> consumeDetails1 = this.baseMapper.getConsumeDetails1(requestVo);
        consumeDetails.addAll(consumeDetails1);
        return consumeDetails;
    }
}