拼多多授权绑定

admin

2021-01-27 e1a62ec62e7331d97af9302e90e1ce44af8235eb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -18,16 +18,17 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.yeshi.fanli.entity.SystemFunction;

import com.yeshi.fanli.util.*;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.StringUtil;

import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.multipart.MultipartFile;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

import org.yeshi.utils.*;

import org.yeshi.utils.entity.wx.WeiXinUser;

import org.yeshi.utils.taobao.TbImgUtil;

import org.yeshi.utils.tencentcloud.COSManager;



@@ -59,7 +60,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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;

@@ -70,8 +70,8 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

@@ -130,7 +130,7 @@
import com.yeshi.fanli.util.factory.OrderItemFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.util.wx.WXLoginUtil;

import com.yeshi.fanli.util.wx.MyWXLoginUtil;

import com.yeshi.fanli.vo.user.MineInfoVO;

import com.yeshi.fanli.vo.user.UserInfoExtraVO;

import com.yeshi.fanli.vo.user.UserSettingsVO;

@@ -342,7 +342,7 @@
            // WeiXinUserParam wxParam = null;

            // 如果是微信登陆，那需要先获取到微信的unionid

            WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

            WeiXinUser weiXinUser = MyWXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                    account.getAppSecret());

            if (loginType == Constant.WEIXIN && StringUtil.isNullOrEmpty(form.getWxUnionId())) {

                // wxParam = WXinUtil.getWxParam(code);

@@ -440,7 +440,7 @@


                WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());



                WeiXinUser xinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                WeiXinUser xinUser = MyWXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                        account.getAppSecret());

                if (xinUser == null) {

                    out.print(JsonUtil.loadFalseResult("登录失败"));

@@ -696,7 +696,7 @@
        int loginType = form.getLoginType();

        if (loginType == Constant.WEIXIN) {

            WXAccountInfoDTO account = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

            WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

            WeiXinUser weiXinUser = MyWXLoginUtil.getWeiXinUserWithSavePortrait(code, account.getAppId(),

                    account.getAppSecret());



            if (weiXinUser == null) {

@@ -2179,12 +2179,14 @@
            data.put("welfareCenterNews", welfareCenterNews);// 福利中心消息

            data.put("vipLink", userVipConfigService.getValueByKey("vip_link"));// 超级会员升级链接



            // 2.0.1之后绑定手机号

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

                boolean bindPhone = false;

                if (StringUtil.isNullOrEmpty(userInfo.getPhone()))

                    bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);

                data.put("bindPhone", bindPhone);

            if(SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.bindPhone)) {

                // 2.0.1之后绑定手机号

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

                    boolean bindPhone = false;

                    if (StringUtil.isNullOrEmpty(userInfo.getPhone()))

                        bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);

                    data.put("bindPhone", bindPhone);

                }

            }



            if (!StringUtil.isNullOrEmpty(invitCode)) {