dubbo集成修改

admin

2020-07-16 be67478cae6bf9308f15949a21e7d0a57a3f0ecb

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

@@ -18,16 +18,16 @@
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.taobao.TbImgUtil;

import org.yeshi.utils.tencentcloud.COSManager;



@@ -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;

@@ -324,7 +324,7 @@
        }

        // 不是用ID的登陆的事就多了

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

                acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -515,7 +515,7 @@
        }

        // 不是用ID的登陆的事就多了

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

                acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -1155,7 +1155,7 @@
        }



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

                acceptData.getPackages());

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

        if (system == null) {

            LogHelper.userInfo("提现时，不存在该系统");

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

@@ -1502,7 +1502,7 @@
        List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();

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



            BigDecimal proportion = hongBaoManageService.getFanLiRate();

            BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());



            List<Long> listGid = new ArrayList<Long>();

            for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {

@@ -2050,7 +2050,7 @@
    public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {

        try {

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

                    acceptData.getPackages());

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

            if (system == null) {

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

                return;

@@ -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)) {