yujian
2019-04-17 6956ce8e4def0b7e6a58d74d44c0e7665457e3b1
微信激活邀请码调整
4个文件已修改
12 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/wx/WXLoginUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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;