系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java

@@ -13,8 +13,10 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import com.yeshi.fanli.entity.SystemEnum;

import com.yeshi.fanli.entity.SystemFunction;

import com.yeshi.fanli.util.*;

import com.yeshi.fanli.vo.taobao.TaoBaoUser;

import org.springframework.stereotype.Controller;

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

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

@@ -289,6 +291,47 @@
        }

    }





    /**

     * 淘宝登录（子APP）

     *

     * @param acceptData

     * @param userData

     * @param request

     * @param out

     */

    @RequestMapping(value = "loginTB", method = RequestMethod.POST)

    public void loginTB(AcceptData acceptData, String userData,

                        HttpServletRequest request, PrintWriter out) {

        if (acceptData.getSystem() == SystemEnum.blks) {

            out.print(JsonUtil.loadFalseResult("暂不支持此种登录方式"));

            return;

        }

        TaoBaoUser taoBaoUser = new Gson().fromJson(userData, TaoBaoUser.class);

        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

                acceptData.getPackages(), acceptData.getSystem());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult("系统不存在"));

            return;

        }



        UserInfo userInfo = null;

        try {

            userInfo = userAccountService.loginTB(new ProxyIP(request.getRemoteHost(), request.getRemotePort()), taoBaoUser, system);

        } catch (UserAccountException e) {

            out.print(JsonUtil.loadFalseResult(e.getMsg()));

        }



        if (userInfo == null) {

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

        } else {

            JSONObject data = new JSONObject();

            data.put("userInfo", UserUtil.filterForClientUser(userInfo));

            data.put("inviteCode", userInfoExtraService.getInviteCodeByUid(userInfo.getId()));

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

        }

    }



    /**

     * 绑定电话号码 V2.0.1 微信登录

     *