删除了部分残余代码

admin

2019-03-20 435bed78efa8ab34bbf456ef55eb586ccfc113f1

删除了部分残余代码

 fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java

@@ -90,25 +90,9 @@


        ClientTBPid clientTBPid = null;

        if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {

            TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);

            if (tbPid == null)

                clientTBPid = tbPidService.getIOSDefault();

            else {

                String siteId = tbPid.getPid().split("_")[2];

                String adzoneId = tbPid.getPid().split("_")[3];

                TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            }

        } else {

            TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_ANDROID);

            if (tbPid == null)

                clientTBPid = tbPidService.getAndroidDefault();

            else {

                String siteId = tbPid.getPid().split("_")[2];

                String adzoneId = tbPid.getPid().split("_")[3];

                TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

            }

        }



        String cartJS = configService.get("taobao_cart_js");


 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -129,7 +129,6 @@
    @Resource

    private SuperRecommendSpecialService superRecommendSpecialService;





    @Resource

    private OrderService orderService;



@@ -223,10 +222,10 @@
    @Resource

    private UserInfoExtraService userInfoExtraService;





    @RequestMapping(value = "getHonestList")

    public void getHonestList(AcceptData acceptData, PrintWriter out) {

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

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

                acceptData.getPackages());

        List<Honest> honestList = null;

        List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

        if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))

@@ -393,7 +392,8 @@
    @RequestMapping(value = "getrecommendspecial")

    public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {



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

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

                acceptData.getPackages());



        if (system == null) {

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

@@ -435,7 +435,8 @@
    @RequestMapping(value = "guessLike", method = RequestMethod.POST)

    public void guessLike(AcceptData acceptData, PrintWriter out) {



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

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

                acceptData.getPackages());



        if (system == null) {

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

@@ -473,7 +474,8 @@
    @RequestMapping(value = "getrecommendbanner")

    public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {



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

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

                acceptData.getPackages());

        JSONObject json = new JSONObject();

        if (system == null) {

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

@@ -540,7 +542,8 @@
            out.print(JsonUtil.loadFalseResult(1, "请上传id"));

            return;

        }

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

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

                acceptData.getPackages());



        if (system == null) {

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

@@ -693,7 +696,8 @@
            out.print(JsonUtil.loadFalseResult(1, "请上传id"));

            return;

        }

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

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

                acceptData.getPackages());



        if (system == null) {

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

@@ -712,38 +716,11 @@
        // 获取淘客参数

        ClientTBPid clientTBPid = null;

        // 用户已经登录

        if (!StringUtil.isNullOrEmpty(uid)) {

            TBPid tbPid = null;

            if (acceptData.getPlatform().equalsIgnoreCase("android")) {

                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);

                if (tbPid != null) {

                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                } else {

                    clientTBPid = tbPidService.getAndroidDefault();

                }



            } else {

                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

                if (tbPid != null) {



                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                } else {

                    clientTBPid = tbPidService.getIOSDefault();

                }

            }



        } else {

            if (acceptData.getPlatform().equalsIgnoreCase("android"))

                clientTBPid = tbPidService.getAndroidDefault();

            else

                clientTBPid = tbPidService.getIOSDefault();

        }



        LogHelper.test("获取PID耗时：" + (java.lang.System.currentTimeMillis() - startTime));



@@ -996,25 +973,9 @@
        if (!StringUtil.isNullOrEmpty(uid)) {

            TBPid tbPid = null;

            if (acceptData.getPlatform().equalsIgnoreCase("android")) {

                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);

                if (tbPid != null) {

                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                } else {

                    clientTBPid = tbPidService.getAndroidDefault();

                }

            } else {

                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

                if (tbPid != null) {

                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                } else {

                    clientTBPid = tbPidService.getIOSDefault();

                }

            }



        } else {

@@ -1060,7 +1021,8 @@
    // 根据商品获取推荐

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

    public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {

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

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

                acceptData.getPackages());

        if (system == null) {

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

            return;

@@ -1186,7 +1148,8 @@
            return;

        }

        page = page + 1;

        BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());

        BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),

                acceptData.getPackages());

        if (sys == null) {

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

            return;

@@ -1231,7 +1194,8 @@


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

    public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {

        BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());

        BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),

                acceptData.getPackages());



        if (sys == null) {

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

@@ -1396,7 +1360,8 @@
    @RequestMapping(value = "getRecommendInfo")

    public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {



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

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

                acceptData.getPackages());

        if (system == null) {

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

            return;

@@ -1503,7 +1468,8 @@
    public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,

            PrintWriter out) {



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

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

                acceptData.getPackages());

        if (system == null) {

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

            return;

@@ -1641,7 +1607,8 @@
            return;

        }



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

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

                acceptData.getPackages());

        if (system == null) {

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

            return;

@@ -1671,32 +1638,10 @@


        } else {

            // 用户已经登录

            TBPid tbPid = null;

            if (acceptData.getPlatform().equalsIgnoreCase("android")) {



                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);



                if (tbPid == null) {

                    clientTBPid = tbPidService.getAndroidDefault();

                } else {

                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                }



            } else {



                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);



                if (tbPid == null) {

                    clientTBPid = tbPidService.getIOSDefault();

                } else {

                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                }

            }

        }



@@ -2039,7 +1984,8 @@
    @RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)

    public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {



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

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

                acceptData.getPackages());

        if (system == null) {

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

            return;

@@ -2130,7 +2076,8 @@
    @RequestMapping(value = "getSpecialActivities")

    public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {



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

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

                acceptData.getPackages());

        if (system == null) {

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

            return;


 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java

@@ -1071,15 +1071,8 @@


            } else {



                tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);

                if (tbPid != null) {

                    String siteId = tbPid.getPid().split("_")[2];

                    String adzoneId = tbPid.getPid().split("_")[3];

                    TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);

                    clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);

                } else {

                    clientTBPid = tbPidService.getIOSDefault();

                }



            }



        } else {


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

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

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

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

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

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

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

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

@@ -194,7 +194,7 @@
                List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService

                        .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);

                String pid = null;

                TBPid tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_SHARE_GOODS);

                ClientTBPid  tbPid = tbPidService.getSharePid();

                if (tbPid != null)

                    pid = tbPid.getPid();

                else {

@@ -226,7 +226,7 @@
        } else {

            List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService

                    .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);

            String pid = configList.get(0).getDefaultPid();

            String pid =tbPidService.getSharePid().getPid();

            TaoKeAppInfo app = new TaoKeAppInfo();

            app.setAdzoneId(pid.split("_")[3]);

            app.setAppKey(configList.get(0).getAppKey());


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

@@ -17,6 +17,7 @@
import org.springframework.orm.hibernate4.HibernateCallback;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.HttpUtil;



import com.yeshi.fanli.dao.mybatis.TBPidMapper;

import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;

@@ -28,7 +29,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import org.yeshi.utils.HttpUtil;

import com.yeshi.fanli.util.Constant;



import net.sf.json.JSONObject;



@@ -369,4 +370,12 @@
            }

        }

    }



    @Override

    public ClientTBPid getSharePid() {

        String pid = Constant.TAOBAO_RELATION_PID_DEFAULT;

        ClientTBPid clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, pid, pid.split("_")[2],

                pid.split("_")[3]);

        return clientTBPid;

    }

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/TBPidService.java

@@ -35,5 +35,11 @@
     * @return

     */

    public TBPid getTBPid(Long uid, int type);

	
    /**

     * 获取分享用的PID

     * @return

     */

    public ClientTBPid getSharePid();



}


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -365,6 +365,7 @@
                goods.getUserType());

        if (result != null && result.getTaoBaoGoodsBriefs() != null)

            for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {

                System.out.println(goods.getAuctionId() + ":" + g.getAuctionId());

                if (goods.getAuctionId().longValue() == g.getAuctionId()) {

                    g.setId(goods.getAuctionId());

                    // 判断是否有优惠券