44323
2023-10-25 5588692dbb59c9e67c1b0cf81eb5b3108a484be1
运营商权限
4个文件已修改
6 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/model/query/RechargeRecordsQuery.java
@@ -22,4 +22,5 @@
    private List<Integer> userIds;
    private BigDecimal amount;
    private Integer insertType;
    private Integer objectId;
}
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
@@ -10,6 +10,9 @@
            <if test="query.amount!=null and query.amount!= ''">
                and t1.amount &lt;= #{query.amount}
            </if>
            <if test="query.objectId!=null and query.objectId!= ''">
                and t2.addUserId = #{query.objectId}
            </if>
            <if test="query.insertType!=null and query.insertType!= ''">
                and t2.insertType = #{query.insertType}
            </if>
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -150,6 +150,7 @@
                       query.setInsertType(roleType);
            competitionQuery.setInsertType(roleType);
                 incomeQuery.setInsertType(roleType);
        rechargeRecordsQuery.setObjectId(UserExt.getUser().getObjectId());
        List<IncomeVO> incomeVOS = new ArrayList<>();
        // 会员支付记录
        List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsQuery.java
@@ -23,4 +23,5 @@
    private List<Integer> userIds;
    private BigDecimal amount;
    private Integer insertType;
    private Integer objectId;
}