diff --git a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java index fcec04c..45c9faa 100644 --- a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java @@ -30,7 +30,7 @@ public interface BeanConsumeService { Object selectFanBy(Integer pageNum, Integer pageSize, BeanConsumeFan beanConsumeFan); //筛选查询文章消费 Object selectArticleBy(Integer pageNum, Integer pageSize, BeanConsumeArticle beanConsumeArticle); - //消费金币合计数 + //消费金豆合计数 BeanConsumeGold sumConsumeGold(Page page); //查询直播礼物 List getLiveGift(); diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index 25a3faf..36f49a7 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -213,10 +213,27 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { public BeanConsumeGold sumConsumeGold(Page page) { BeanConsumeGold gold = new BeanConsumeGold(); Integer payType = page.getPayType(); + if (payType==1) { + //设置频道权限 + String channel=roleMapper.getChannel(page.getBeanConsumeLive().getRoleId()); + if (channel==null){ + page.getBeanConsumeLive().setLiveChannel(null); + } + if (!channel.equals("全部")){ + page.getBeanConsumeLive().setLiveChannel(channel); + } //直播消费合计 gold = liveMapper.selectSumLiveBy(page.getBeanConsumeLive()); }else if (payType==7) { + //设置频道权限 + String channel=roleMapper.getChannel(page.getBeanConsumeFan().getRoleId()); + if (channel==null){ + page.getBeanConsumeFan().setChannel(null); + } + if (!channel.equals("全部")){ + page.getBeanConsumeFan().setChannel(channel); + } //充值消费合计 gold = beanConsumeMapper.selectSumFansBy(page.getBeanConsumeFan()); }else if (payType==8) { diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 1541a4b..46e35f0 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -416,10 +416,10 @@ public User getNameAndMarket(Integer jwcode) { cashRecord.setPayload("Ipay88"); break; case 9: - cashRecord.setPayType("FistData"); + cashRecord.setPayType("FirstData"); cashRecord.setReceivedMarket("4"); cashRecord.setBankCode(gOrder.getFirstdataIpgTransactionId()); - cashRecord.setPayload("FistData"); + cashRecord.setPayload("FirstData"); break; default: break;