Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-14 752d00df1ac102f3645e0c98943ae18f8b7e9c3f

Merge remote-tracking branch 'origin/div' into div

 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/controller/client/v1/UserInfoController.java

@@ -58,6 +58,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.vip.GiveVIPApplyInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

@@ -77,6 +79,7 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -111,8 +114,10 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteService;

import com.yeshi.fanli.service.inter.user.vip.GiveVIPApplyInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.service.manger.user.UserLevelManager;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

@@ -254,11 +259,18 @@


    @Resource

    private UserInviteService userInviteService;

	


    @Resource

    private TeamFansInfoService teamFansInfoService;



	
    @Resource

    private UserLevelManager userLevelManager;



    @Resource

    private JumpDetailV2Service jumpDetailV2Service;



    @Resource

    private GiveVIPApplyInfoService giveVIPApplyInfoService;



    private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();

    private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();

@@ -1895,12 +1907,12 @@
            out.print(JsonUtil.loadFalseResult("该记录不存在"));

            return;

        }

		


        int type = 1;

        if (threeSale.getBoss().getId() != uid) {

            type = 2;

        }

		


        ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());

        if (extraInfo == null) {

            extraInfo = new ThreeSaleExtraInfo();

@@ -1910,7 +1922,7 @@
            } else {

                extraInfo.setType(2); // 间接

            }

			


            extraInfo.setWorker(worker);

            extraInfo.setNickname(memoName);

            extraInfo.setCreateTime(new Date());

@@ -1924,13 +1936,12 @@
            updateInfo.setUpdateTime(new Date());

            threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(updateInfo);

        }

		


        // 更新粉丝记录信息

        teamFansInfoService.updateMemoName(worker.getId(), type, memoName);

		


        out.print(JsonUtil.loadTrueResult("保存成功"));

    }





    /**

     * 设置界面开关状态

@@ -2112,7 +2123,7 @@
            if (mySettings.getNoInvitationBonus() == null) {

                mySettings.setNoInvitationBonus(0);

            }

			


            if (mySettings.getNoDisplayPhoneNum() == null) {

                mySettings.setNoDisplayPhoneNum(0);

            }

@@ -2220,9 +2231,48 @@
                inviteLevel.put("link", level.getLink());

                data.put("inviteLevel", inviteLevel);

            }

			


            if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {

                data.put("fansCountLink", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));

                // 会员动作

                // 查询是否为超级会员，是的话返回超会管理链接

                UserLevelEnum level = userLevelManager.getUserLevel(uid);



                JSONObject vipAction = null;

                if (level == UserLevelEnum.superVIP || level == UserLevelEnum.tearcher) {

                    vipAction = new JSONObject();

                    vipAction.put("name", "超会管理");

                    vipAction.put("jumpDetail",

                            jumpDetailV2Service.getByTypeCache("web",

                                    acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,

                                    Integer.parseInt(acceptData.getVersion())));

                    JSONObject params = new JSONObject();

                    params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));

                    vipAction.put("params", params);



                } else {

                    // 查询是否可以提交会员申请，是的话返回资料填写页面

                    List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByStateAndTargetUid(uid,

                            GiveVIPApplyInfo.STATE_NO_INFO, 1, 20);

                    if (list != null && list.size() > 0) {

                        String link = userVipConfigService.getValueByKey("apply_vip_upload_info_link");

                        if (!StringUtil.isNullOrEmpty(link)) {

                            vipAction = new JSONObject();

                            vipAction.put("name", "申请会员");

                            vipAction.put("jumpDetail",

                                    jumpDetailV2Service.getByTypeCache("web",

                                            acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,

                                            Integer.parseInt(acceptData.getVersion())));

                            JSONObject params = new JSONObject();

                            params.put("url", link.replace("[ID]", list.get(0).getId()));

                            vipAction.put("params", params);

                        }

                    }

                }



                if (vipAction != null)

                    data.put("vipAction", vipAction);



            }



            out.print(JsonUtil.loadTrueResult(data));

@@ -2391,7 +2441,7 @@
                }

            }



            //修改邀请码

            // 修改邀请码

            if (!StringUtil.isNullOrEmpty(inviteCode)) {// 邀请码不为空

                inviteCode = inviteCode.trim();

                if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {


 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>