admin
2020-05-14 2c3f16fddfe335e31c9f8ea943072dc8383c67d9
管理员自主开通会员bug修改
4个文件已修改
63 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/Constant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/rocket/consumer.xml 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/user/vip/UserVipApplyAdminController.java
@@ -198,6 +198,13 @@
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前账户失效,请重新登陆"));
                return;
            }
            UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid);
            if (user == null) {
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户不存在或已经被封禁"));
                return;
            }
            GiveVIPApplyInfo info = new GiveVIPApplyInfo();
            info.setApplyReason(applyReason);
            info.setTargetUid(uid);
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java
@@ -107,8 +107,8 @@
        if (info == null)
            throw new GiveVIPApplyInfoException(1, "记录不存在");
        if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)
            throw new GiveVIPApplyInfoException(2, "用户未提交资料");
//        if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)
//            throw new GiveVIPApplyInfoException(2, "用户未提交资料");
        if (info.getState() == GiveVIPApplyInfo.STATE_REJECT)
            throw new GiveVIPApplyInfoException(3, "已经被拒绝");
fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -24,7 +24,7 @@
    public static boolean IS_TEST = true;
    public static boolean ENABLE_MQ = false;
    public static boolean ENABLE_MQ = true;
    public static int PAGE_SIZE = 20;
    
fanli/src/main/resource/rocket/consumer.xml
@@ -238,8 +238,8 @@
            </map>
        </property>
    </bean>
    <!-- 导师分配 -->
    <bean id="tearcherMessageListener"
        class="com.yeshi.fanli.util.rocketmq.consumer.user.TearcherMessageListener"></bean>
@@ -269,10 +269,48 @@
            </map>
        </property>
    </bean>
    <!-- 粉丝消息接收 -->
    <bean id="userTeamMessageListener"
        class="com.yeshi.fanli.util.rocketmq.consumer.user.UserTeamMessageListener"></bean>
    <bean id="userTeamConsumer" class="com.aliyun.openservices.ons.api.bean.ConsumerBean"
        init-method="start" destroy-method="shutdown">
        <property name="properties"> <!--消费者配置信息 -->
            <props>
                <prop key="AccessKey">${rocketmq.AccessKey}</prop>
                <prop key="SecretKey">${rocketmq.SecretKey}</prop>
                <prop key="GROUP_ID">GID_USER_TEAM</prop>
                <prop key="NAMESRV_ADDR">${rocketmq.NAMESRV_ADDR}</prop>
                <prop key="ConsumeThreadNums">50</prop>
            </props>
        </property>
        <property name="subscriptionTable">
            <map>
                <!--用户活跃 -->
                <entry value-ref="userTeamMessageListener">
                    <key>
                        <bean class="com.aliyun.openservices.ons.api.bean.Subscription">
                            <property name="topic" value="TOPIC_USER" />
                            <!-- 用户活跃,用户信息更新,淘宝绑定成功,邀请成功,用户资金增加,成为有效用户,账号绑定  -->
                            <property name="expression"
                                value="userActve||userInfoUpdate||taobaoBindSuccess||inviteSuccess||userMoneyAdd||becomeValidUser" />
                        </bean>
                    </key>
                </entry>
            </map>
        </property>
    </bean>