Merge remote-tracking branch 'origin/master'

admin

2019-04-17 70a0aed5a22fbdbb486351258535944b5dae2a79

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml

@@ -83,8 +83,8 @@

<!-- 根据邀请者ID查询关系 -->
    <select id="getByWorkerId" resultMap="BaseResultMap" parameterType="java.lang.Long">
        select     <include refid="Base_Column_List" /> from yeshi_ec_threeSale
        where worker_id = #{0} AND t.state=0 AND (t.expire = 0 OR t.expire IS NULL)
        select     <include refid="Base_Column_List" /> from yeshi_ec_threeSale 
        where worker_id = #{0} AND state=0 AND (expire = 0 OR expire IS NULL)
    </select>
    


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -564,6 +564,10 @@
            throw new ThreeSaleException(1, "关系绑定失败");

        }

        

        UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

        threeSale.setBoss(boss);

		
		
        // 添加到队列

        ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);

        // 邀请消息


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -931,8 +931,7 @@
                throw new UserAccountException(1, "验证码错误，重新输入");

            }

        }

        redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);



		
        JSONObject logInfo = new JSONObject();

        logInfo.put("appId", appId);

        logInfo.put("phone", phone);

@@ -945,6 +944,13 @@
        if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {

            throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

        }

		
		
        // 清空限制

        redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

        // 清理次数

        redisManager.removeCommonString("sendMSNLoginCount" + phone);

		


        // 查询是否存在该电话历史用户

        UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java

@@ -405,7 +405,7 @@
        

        

        // 获取微信信息

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinWYUser(code);

        WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);

        if (weiXinUser == null) {

            throw new UserInfoExtraException(1, "微信授权失败");

        }


 fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java

@@ -74,7 +74,7 @@
        return weiXinUser;

    }



    private static WeiXinUser getWeiXinUser(String code) {

    public static WeiXinUser getWeiXinUser(String code) {

        WeiXinUserParam param = getWxParam(code);

        if (param == null) {

            return null;