清理过时的客户端接口

admin

2020-01-09 4bb562771a786ffae6814d83c9dc6e56d69865fb

清理过时的客户端接口

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -1,13 +1,9 @@
package com.yeshi.fanli.controller;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.net.URLEncoder;

import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

@@ -15,30 +11,19 @@
import javax.servlet.http.HttpSession;



import org.springframework.stereotype.Controller;

import org.springframework.ui.Model;

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

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

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

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.wx.WXUtil;



import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.exception.share.ShareGoodsException;

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -58,12 +43,9 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.Utils;

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

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

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



import net.sf.json.JSONArray;

@@ -136,102 +118,6 @@


    private static final String DOWNURL2 = "http://121.42.200.138/apk/fanliquan20180124.apk";



    @RequestMapping("coupon")

    public String conpon(Model model) {

        List<TaoBaoCoupon> couponList = taoBaoCouponService.getTaoBaoCouponList("", 1);

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        String jsonArr = Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(couponList));

        JSONArray jsonArray = JSONArray.fromObject(jsonArr);

        List<TaoBaoCoupon> collection = (List<TaoBaoCoupon>) JSONArray.toCollection(jsonArray, TaoBaoCoupon.class);

        model.addAttribute("couponList", collection);

        model.addAttribute("proportion", proportion);

        return "coupon";

    }



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

    public void getConpon(int page, PrintWriter out) {

        List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);

        BigDecimal proportion = hongBaoManageService.getFanLiRate();

        JSONObject data = new JSONObject();

        data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));

        data.put("proportion", proportion);

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

    }



    @RequestMapping("share")

    public String getShare(Model model, String uid) {

        String value = configService.get(ConfigKeyEnum.shareMessage.getKey());

        try {

            if (uid == null) {

                uid = "0";

            }

            String base64String = StringUtil.getBase64String(uid + "");

            String format = MessageFormat.format(value, base64String);

            model.addAttribute("share", format);

            model.addAttribute("down",

                    "http://file.sovideo.cn/buxinjie/weixinfriendinvite/index.html?yqm=" + base64String);

            model.addAttribute("shareCode", "邀请码：" + base64String);

        } catch (Exception e) {

            e.printStackTrace();

        }

        return "getcash";

    }



    @RequestMapping("shares")

    public String getShares(Model model, String uid) {

        String value = configService.get(ConfigKeyEnum.shareMessage.getKey());

        try {

            if (uid == null) {

                uid = "0";

            }

            String base64String = StringUtil.getBase64String(uid + "");

            String format = MessageFormat.format(value, base64String);

            model.addAttribute("share", format);

            model.addAttribute("uid", uid);

        } catch (Exception e) {

            e.printStackTrace();

        }

        return "invite";

    }



    @RequestMapping(value = "/{uid}")

    public String threeShareRep(@PathVariable String uid, String code, String state, String packages, String platform,

            String ios, HttpSession httpSession, HttpServletRequest request) {



        BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);

        String wxState = (String) httpSession.getAttribute("wxState");

        // 通过配置参数获取

        String down = DOWNURL2;



        SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,

                "fenxiao_download_apk_url");

        if (params != null)

            down = params.getValue();

        if ("2".equalsIgnoreCase(ios)) {

            down = DOWNURL;

        }

        if (state == null || !state.equals(wxState)) {// 不是微信返回的！

            // request.setAttribute("error", "1");

            return "redirect:" + down;

        }



        if (code == null) {// 用户取消了登陆！

            return "redirect:" + down;

        }



        UserInfo inviter = userInfoService.getUserById(Long.parseLong(uid));

        if (inviter == null) {// 没得这个人

            return "redirect:" + down;

        }

        boolean b = userInfoService.inviteWXUserInfo(code, inviter);

        if (!b) { // 绑定失败

            // request.setAttribute("msg", "非常遗憾，你已领取过红包，请勿再次领取。");

            return "redirect:" + down;

        }



        return "redirect:" + down;

    }



    @RequestMapping(value = "/new/{uid}")

    public String threeShareRepNew(@PathVariable String uid, String code, String state, String packages,

            String platform, String ios, HttpSession httpSession, HttpServletRequest request) {

@@ -255,43 +141,6 @@
        userInviteRecordService.saveInviteRecord(code, uid);



        return "redirect:" + down;

    }



    @RequestMapping("threeShare")

    public String threeShare(HttpServletRequest request, HttpSession session, long uid) {

        String serverName = request.getServerName();

        String contextPath = request.getContextPath();

        UserInfo userInfo = userInfoService.getUserById(uid);

        if (userInfo == null) {

            return "share/error";

        }



        try {

            String header = request.getHeader("User-Agent");// MicroMessenger：微信浏览器

            String ios = "ios=1";

            if (header.contains("iPhone")) {

                ios = "ios=2";

            }

            String redirect_uri = "http://" + serverName + contextPath + "/client/" + uid + "?packages="

                    + Constant.systemCommonConfig.getAndroidPackageName() + "&platform=ANDROID&" + ios;

            redirect_uri = URLEncoder.encode(redirect_uri, "utf-8");

            long currentTimeMillis = java.lang.System.currentTimeMillis();

            String md5 = StringUtil.Md5(currentTimeMillis + "");

            session.setAttribute("wxState", md5);

            String baseUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + WXLoginUtil.WEXIN_APPID

                    + "&redirect_uri=" + redirect_uri + "&response_type=code&scope=snsapi_userinfo&state=" + md5

                    + "#wechat_redirect";

            // List<HongBaoMessage> list =

            // shamUserService.findShamThreeSaleInfo();

            request.setAttribute("jumpUrl", baseUrl);

            request.setAttribute("name", userInfo.getNickName());

            request.setAttribute("picture", userInfo.getPortrait());

            // request.setAttribute("list", list);

        } catch (Exception e) {

            e.printStackTrace();

        }



        return "share2/yaoqing";

    }



    // 新版分享

@@ -326,110 +175,6 @@
        }



        return "share2/yaoqing";

    }



    @RequestMapping("callBack")

    public void callBack(HttpServletRequest request, PrintWriter out) {

        if (!StringUtil.isNullOrEmpty(request.getParameter("echostr"))) {

            out.print(request.getParameter("echostr"));

            return;

        }



        Map<String, String> map = WXUtil.parseXML(request);

        String ghId = map.get("ToUserName");

        if (ghId == null) {

            out.print("");

            return;

        }

        String type = map.get("MsgType");

        if ("event".equalsIgnoreCase(type)) {

            String event = map.get("Event");

            if (event.equalsIgnoreCase("subscribe")) {// 关注

                Map<String, String> parmas = new HashMap<>();

                parmas.put("ToUserName", map.get("FromUserName"));

                parmas.put("FromUserName", ghId);

                parmas.put("CreateTime", java.lang.System.currentTimeMillis() / 1000 + "");

                parmas.put("MsgType", "text");

                parmas.put("Content", Constant.wxGZConfig.getWelcomeMsg());

                out.print(WXUtil.loadWXMessage(parmas));

            }

        } else if ("text".equalsIgnoreCase(type)) {

            String content = map.get("Content");

            if (!StringUtil.isNullOrEmpty(content)) {

                try {

                    if (request.getSession().getAttribute("search-quan-" + map.get("FromUserName")) == null) {

                        request.getSession().setAttribute("search-quan-" + map.get("FromUserName"), "1");

                        SearchFilter sf = new SearchFilter();

                        sf.setPage(1);

                        sf.setPageSize(5);

                        sf.setKey(content);

                        sf.setQuan(1);

                        TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);

                        if (result == null || result.getTaoBaoGoodsBriefs() == null

                                || result.getTaoBaoGoodsBriefs().size() <= 0) {

                            Map<String, String> parmas = new HashMap<>();

                            parmas.put("ToUserName", map.get("FromUserName"));

                            parmas.put("FromUserName", ghId);

                            parmas.put("CreateTime", java.lang.System.currentTimeMillis() / 1000 + "");

                            parmas.put("MsgType", "text");

                            parmas.put("Content", String.format("[微笑]抱歉，没有能为你找到关于【%s】的优惠券，[机智]你可以试试其他关键词", content));

                            out.print(WXUtil.loadWXMessage(parmas));

                        } else {

                            String host = HttpUtil.getHost(Constant.wxGZConfig.getH5Url());

                            String url = HttpUtil.getShortLink("http://" + host + "/search.html?key=" + content);

                            String text = String.format("[得意]已经为你找到了关于【%s】的优惠券 \n 👉 %s", content, url);

                            Map<String, String> parmas = new HashMap<>();

                            parmas.put("ToUserName", map.get("FromUserName"));

                            parmas.put("FromUserName", ghId);

                            parmas.put("CreateTime", java.lang.System.currentTimeMillis() / 1000 + "");

                            parmas.put("MsgType", "text");

                            parmas.put("Content", text);

                            out.print(WXUtil.loadWXMessage(parmas));

                        }

                    }



                } finally {

                    request.getSession().removeAttribute("search-quan-" + map.get("FromUserName"));

                }



            }



        }



    }



    @RequestMapping("shareGoods")

    public void shareGoods(String auctionId, PrintWriter out) {

        TaoBaoGoodsBrief alimama = null;

        try {

            alimama = redisManager.getTaoBaoGoodsBrief(Long.parseLong(auctionId));

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

        }

        if (alimama != null) {

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

            TaoBaoGoodsBrief tb = null;

            try {

                tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(auctionId));

            } catch (NumberFormatException e) {

                e.printStackTrace();

            } catch (TaobaoGoodsDownException e) {

                e.printStackTrace();

            }

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, config.get(0));

            JSONObject data = new JSONObject();

            data.put("tb", GsonUtil.toJsonExpose(taoBaoGoodsBriefExtra));

            if ("1".equalsIgnoreCase(tb.getTkMktStatus())) {// 营销计划

                data.put("yxjh", 1);

            } else

                data.put("yxjh", 0);



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

            return;

        }

        JsonUtil.loadFalseResult("商品已下架！");

    }



    @RequestMapping("getShareGoodsInfo")

@@ -506,52 +251,6 @@
            out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

        }



    }



    @RequestMapping("getShareGoodsDetail")

    public void getShareGoodsDetail(String uid, long id, String sign, PrintWriter out) {

        // 添加分享

        uid = AESUtil.decrypt(uid);

        if (StringUtil.isNullOrEmpty(uid)) {

            out.print(JsonUtil.loadFalseResult(1, "用户ID不存在"));

            return;

        }



        try {

            UserShareGoodsHistory userShareGoodsHistory = shareGoodsService

                    .getShareGoodsHistoryDetail(Long.parseLong(uid), id);

            if (userShareGoodsHistory == null) {

                out.print(JsonUtil.loadFalseResult(2, "商品不存在"));

                return;

            }



            TaoBaoGoodsBrief goods = null;

            try {

                goods = redisManager.getTaoBaoGoodsBrief(userShareGoodsHistory.getGoodsId());

            } catch (TaobaoGoodsDownException e) {

                e.printStackTrace();

            }

            JSONObject data = JSONObject.fromObject(JsonUtil.getSimpleGson().toJson(userShareGoodsHistory));

            JSONObject goodsJSON = new JSONObject();

            goodsJSON.put("title", goods.getTitle());

            goodsJSON.put("zkPrice", goods.getZkPrice());

            // 有券

            if (!StringUtil.isNullOrEmpty(goods.getCouponInfo())) {

                BigDecimal finalPrice = goods.getZkPrice();

                if (goods.getCouponStartFee().compareTo(goods.getZkPrice()) <= 0

                        && goods.getZkPrice().compareTo(goods.getCouponAmount()) >= 0) {

                    finalPrice = goods.getZkPrice().subtract(goods.getCouponAmount());

                }

                goodsJSON.put("finalPrice", finalPrice);

            }

            data.put("goods", goodsJSON);

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

        } catch (ShareGoodsException e1) {

            out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));



            e1.printStackTrace();

        }



    }


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

@@ -1,35 +1,17 @@
package com.yeshi.fanli.controller;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;



import javax.annotation.Resource;



import org.springframework.stereotype.Controller;

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

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



import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.util.Constant;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.util.Constant;



@Controller

@RequestMapping("client/html/api/v1/config")

public class ConfigController {



    @Resource

    private ConfigService configService;



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

    public void getConfigList(String[] keys, PrintWriter out) {

        List<String> configList = new ArrayList<String>();

        for (String key : keys) {

            String value = configService.get(key);

            configList.add(value);

        }

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

    }



    @RequestMapping(value = "getSystemName")

    public void getSystemName(String[] keys, PrintWriter out) {


 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -4,7 +4,6 @@
import java.io.File;

import java.io.FileReader;

import java.io.IOException;

import java.io.InputStream;

import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

@@ -28,10 +27,7 @@
import org.springframework.cache.ehcache.EhCacheCacheManager;

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.QRCodeUtil;

import org.yeshi.utils.tencentcloud.COSManager;

import org.yeshi.utils.wx.WXUtil;



import com.google.gson.Gson;

@@ -44,11 +40,9 @@
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.dynamic.InviteMaterial;

import com.yeshi.fanli.entity.jd.JDGoods;

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

import com.yeshi.fanli.exception.ActivityException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

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

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -60,7 +54,6 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ActivityController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java

@@ -7,14 +7,12 @@


import javax.annotation.Resource;



import org.hibernate.engine.spi.VersionValue;

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.sun.accessibility.internal.resources.accessibility;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.jd.JDFilter;

import com.yeshi.fanli.dto.jd.JDSearchResult;

@@ -29,7 +27,6 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java

@@ -5,8 +5,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -14,10 +12,11 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.exception.banner.SwiperPictureException;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



/**

 * 动态

 * 


 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserController.java

File was deleted

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

@@ -12,9 +12,7 @@
import org.springframework.stereotype.Controller;

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

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

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

import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;


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

@@ -11,13 +11,11 @@
import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.JsonUtil;



import com.aliyuncs.unmarshaller.JsonUnmashaller;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;

import com.yeshi.fanli.entity.elme.ElmeOrder;

import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.elme.ElmeUserOrderVO;


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

@@ -3,12 +3,12 @@
import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -28,7 +28,6 @@
import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.util.TimeUtil;

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;


 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5TaoLiJinController.java

@@ -22,10 +22,8 @@
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

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

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

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

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


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

File was deleted

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

@@ -25,7 +25,6 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;

import com.yeshi.fanli.entity.jd.JDGoods;

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.TaoBaoGoodsBrief;

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


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

@@ -58,43 +58,7 @@
    @Resource

    private CustomerContentService customerContentService;



    // 优惠券

    /*

     * public final static int quanType = 1;

     * 
     * public final static int baoyou = 2;

     * 
     * public final static int TMALL = 3;

     */



    /**

     * 
     * 方法说明: 关键字提示建议搜索

     * 
     * @author mawurui createTime 2018年4月25日 下午3:04:52

     * @param acceptData

     * @param kw

     * @param out

     */

    @RequestMapping(value = "suggestsearch", method = RequestMethod.GET)

    public void getSugguestSearch(String callback, AcceptData acceptData, String kw, PrintWriter out) {

        List<String> list = TaoBaoUtil.getSuguestSearch(kw);

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

            JSONArray array = new JSONArray();

            int num = 0;

            for (String st : list) {

                array.add(st);

                num = num + 1;

                if (num >= 5) {

                    break;

                }

            }

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));

        } else {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));

        }

        return;

    }



    /**

     * 

@@ -114,12 +78,7 @@
    @RequestMapping(value = "search", method = RequestMethod.GET)

    public void search(String callback, AcceptData acceptData, String kw, int page, String filter, String order,

            String startprice, String endprice, String fastFilter, PrintWriter out) {

        /*

         * System system = webControllerUtil.getSystem(acceptData); if(system ==

         * null){

         * out.print(JsonUtil.loadFalseResult(WebControllerUtil.NOSYSTEM));

         * return; }

         */



        if (!StringUtil.isNullOrEmpty(fastFilter)) {

            if (!StringUtil.isNullOrEmpty(filter)) {

                JSONArray filterArray = JSONArray.fromObject(filter);

@@ -270,20 +229,6 @@
        return data;

    }



    /**

     * 
     * 方法说明: 联系客服接口

     * 
     * @author mawurui createTime 2018年4月10日 上午9:02:41

     */

    @RequestMapping(value = "contactCustomer", method = RequestMethod.GET)

    public void contactCustomerService(PrintWriter out) {

        String title = "联系客服";

        List<CustomerContent> contentList = customerContentService.contactCustomerService(title);

        JSONObject data = new JSONObject();

        data.put("contentList", JsonUtil.getSimpleGsonWithDate().toJson(contentList));

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

    }



    /**

     * 


 fanli/src/main/java/com/yeshi/fanli/controller/web/WebGoodsClassController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebSearchController.java

@@ -65,76 +65,6 @@
    @Resource

    private QualityGoodsService qualityGoodsService;



    // 优惠券

    /*

     * public final static int quanType = 1;

     * 
     * public final static int baoyou = 2;

     * 
     * public final static int TMALL = 3;

     */



    /**

     * 
     * 方法说明: 关键字提示建议搜索

     * 
     * @author mawurui createTime 2018年4月25日 下午3:04:52

     * @param acceptData

     * @param kw

     * @param out

     */

    @RequestMapping(value = "suggestsearch", method = RequestMethod.GET)

    public void getSugguestSearch(String callback, AcceptData acceptData, String kw, PrintWriter out) {

        List<String> list = TaoBaoUtil.getSuguestSearch(kw);

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

            JSONArray array = new JSONArray();

            int num = 0;

            for (String st : list) {

                array.add(st);

                num = num + 1;

                if (num >= 5) {

                    break;

                }

            }

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));

        } else {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));

        }

        return;

    }



    /**

     * 
     * 方法说明: 搜索

     * 
     * @author mawurui createTime 2018年5月3日 上午9:53:54

     * @param acceptData

     * @param kw

     * @param page

     * @param filter

     * @param order

     * @param startprice

     * @param endprice

     * @param fastFilter

     * @param out

     */

    @RequestMapping(value = "search", method = RequestMethod.GET)

    public void search(String callback, AcceptData acceptData, String kw, int page, String filter, String order,

            String startprice, String endprice, String fastFilter, PrintWriter out) {

        if (!StringUtil.isNullOrEmpty(fastFilter)) {

            if (!StringUtil.isNullOrEmpty(filter)) {

                JSONArray filterArray = JSONArray.fromObject(filter);

                JSONArray fastFilterArray = JSONArray.fromObject(fastFilter);

                filterArray.addAll(fastFilterArray);

                filter = filterArray.toString();

            } else {

                filter = fastFilter;

            }

        }

        JSONObject data = search(kw, page, filter, order, startprice, endprice);

        out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

    }



    @RequestMapping(value = "searchGoods", method = RequestMethod.GET)

    public void searchGoods(String callback, AcceptData acceptData, String kw, int page, int pagesize, String filters,

            String rate, String order, String startprice, String endprice, PrintWriter out) {

@@ -267,193 +197,6 @@
        data.put("result", gson2.toJson(listExtra));

        data.put("count", count);

        out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

    }



    private JSONObject search(String kw, int page, String filter, String order, String startprice, String endprice) {



        SearchFilter sf = new SearchFilter();

        sf.setKey(kw);

        sf.setPage(page);

        sf.setSort(0);



        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(startprice)) {

            sf.setStartPrice(new BigDecimal(startprice));

        }



        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(endprice)) {

            sf.setEndPrice(new BigDecimal(endprice));

        }



        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(order)) {

            if (Integer.parseInt(order) == 0) { // 销量

                sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);

            } else if (Integer.parseInt(order) == 3) {

                sf.setSort(TaoBaoUtil.SORT_PRICE_HIGH_TO_LOW);

            } else if (Integer.parseInt(order) == 2) {

                sf.setSort(TaoBaoUtil.SORT_PRICE_LOW_TO_HIGH);

            } else if (Integer.parseInt(order) == 1) {



            }

        }

        /*

         * else{ //默认销量从高到低排序 sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW); }

         */



        if (!com.yeshi.fanli.util.StringUtil.isNullOrEmpty(filter)) {

            // 查询淘宝天猫



            if (Integer.parseInt(filter) == 1) {

                filter = "[{\"type\": \"quantype\"}]";

            } else if (Integer.parseInt(filter) == 2) {

                filter = "[{\"type\": \"baoyou\"}]";

            } else if (Integer.parseInt(filter) == 3) {

                filter = "[{\"type\": \"userType\"}]";

            } else {

                filter = "[]";

            }

            JSONArray array = JSONArray.fromObject(filter);

            Set<String> params = new HashSet<String>();

            for (int i = 0; i < array.size(); i++) {

                String ty = array.optJSONObject(i).optString("type");

                if ("shoptype".equalsIgnoreCase(ty)) {

                    if (array.optJSONObject(i).optInt("id") == 21) {

                        sf.setTmFlagship(false); // 不筛�?

                    } else {

                        sf.setTmFlagship(true);

                        sf.setTmall(true);

                        sf.setShopTag("b2c");

                    }

                } else if ("category".equalsIgnoreCase(ty)) {

                    sf.setCateIds(array.optJSONObject(i).optString("id"));

                } else if ("userType".equalsIgnoreCase(ty)) {

                    // if(array.optJSONObject(i).optInt("id") == 51)

                    sf.setTmall(true);

                    // else

                    // sf.setTmall(false);

                } else if ("baoyou".equalsIgnoreCase(ty)) {

                    // if(array.optJSONObject(i).optInt("id") == 61)

                    sf.setBaoYou(true);

                    // else

                    // sf.setBaoYou(false);

                } else if ("quantype".equalsIgnoreCase(ty)) {

                    // if (array.optJSONObject(i).optInt("id") == 31){

                    sf.setQuan(1);

                    if (sf.isTmFlagship()) {

                        sf.setShopTag(sf.getShopTag() + ",dpyhq");

                    } else {

                        sf.setShopTag("dpyhq");

                    }

                    // }

                    // else

                    // sf.setQuan(2);

                } else if ("hongbaotype".equalsIgnoreCase(ty)) {

                    if (array.optJSONObject(i).optInt("id") == 41)// 有红�?

                        sf.setHongbao(1);

                    else// 无红�?

                        sf.setHongbao(2);

                } else if ("property".equalsIgnoreCase(ty)) {

                    String pid = (String) array.optJSONObject(i).opt("pid");

                    String id = (String) array.optJSONObject(i).opt("id");

                    boolean flag = false;

                    String str = null;

                    for (String string : params) {

                        flag = string.contains(pid + ":");

                        if (flag) {

                            str = string;

                            break;

                        }

                    }

                    if (flag) {

                        params.add(str + "," + id);

                        params.remove(str);

                    } else {

                        params.add(pid + ":" + id);

                    }

                }

            }

            sf.setParams(params);

        }

        TaoBaoSearchResult result = TaoBaoUtil.search(sf);

        List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();

        if (result.getNavList() != null)

            navList.addAll(result.getNavList());

        Gson gson = new GsonBuilder().create();

        JSONObject data = new JSONObject();

        data.put("nav", gson.toJson(navList));

        List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();

        int fq = sf.getQuan();

        int fh = sf.getHongbao();

        boolean ft = sf.isTmall();

        Map<String, String> map = manageService.convertMap();

        BigDecimal proportion = manageService.getFanLiRate();

        if (fq == 0 && fh == 0 && !ft) {

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

                re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));

            }

        } else {

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;

            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),

                        "");

                re.add(taoBaoGoodsBriefExtra);

            }

        }

        Gson gson2 = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();

        data.put("result", gson2.toJson(re));

        data.put("count", result.getTaoBaoHead().getDocsfound());

        return data;

    }



    /**

     * 
     * 方法说明: 联系客服接口

     * 
     * @author mawurui createTime 2018年4月10日 上午9:02:41

     */

    @RequestMapping(value = "contactCustomer", method = RequestMethod.GET)

    public void contactCustomerService(PrintWriter out) {

        String title = "联系客服";

        List<CustomerContent> contentList = customerContentService.contactCustomerService(title);

        JSONObject data = new JSONObject();

        data.put("contentList", JsonUtil.getSimpleGsonWithDate().toJson(contentList));

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

    }



    /**

     * 
     * 方法说明: 热门搜索

     * 
     * @author mawurui createTime 2018年5月11日 下午4:32:46

     * @param acceptData

     * @param out

     */

    @RequestMapping(value = "getHotSearch", method = RequestMethod.GET)

    public void getHotSearch(AcceptData acceptData, String callback, PrintWriter out) {

        /*

         * System system = xcxMiniControllerUtil.getSystem(acceptData); if

         * (system == null) {

         * out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));

         * return; }

         */

        List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4,null); // 板栗快省app

        if (superHotSearchList == null || superHotSearchList.size() == 0) {

            out.print(JsonUtil.loadFalseResult(WebControllerUtil.NODATA));

            return;

        }

        List<HotSearch> hotSearchList = new ArrayList<HotSearch>();

        for (SuperHotSearch superHotSearch : superHotSearchList) {

            HotSearch hotSearch = superHotSearch.getHotSearch();

            hotSearchList.add(hotSearch);

        }



        JSONObject data = new JSONObject();

        data.put("count", hotSearchList.size());

        data.put("hotSearchList", hotSearchList);



        String result = JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data));

        out.print(result);

        return;

    }



}


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/AppPageNotificationMapper.java

@@ -23,32 +23,32 @@
     * @return

     */

    AppPageNotification selectByType(String type);

	


    /**

     * 通过类型获取有效通知

     * 

     * @param type

     * @return

     */

    AppPageNotification selectValidByType(String type);

    List<AppPageNotification> listValidByType(String type);



    int updateByPrimaryKeySelective(AppPageNotification record);



    int updateByPrimaryKey(AppPageNotification record);

	


    /**

     * 根据主键批量删除

     * @param list

     * @return

     */

    int deleteBatchByPrimaryKey(List<Long> list);

	


    /**

     * 后端列表查询

     * @return

     */

    List<AppPageNotification> listQuery(@Param("start") long start, @Param("count") int count,

            @Param("key") String key, @Param("show") Integer show, @Param("canClose") Integer canClose);

	
    long countQuery(@Param("key") String key,@Param("show") Integer show, @Param("canClose") Integer canClose);

    List<AppPageNotification> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key,

            @Param("show") Integer show, @Param("canClose") Integer canClose);



    long countQuery(@Param("key") String key, @Param("show") Integer show, @Param("canClose") Integer canClose);

}

 fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml

@@ -33,7 +33,7 @@
        from yeshi_ec_apppage_notification where an_type = #{0}

    </select>



    <select id="selectValidByType" resultMap="BaseResultMap" parameterType="java.lang.String">

    <select id="listValidByType" resultMap="BaseResultMap" parameterType="java.lang.String">

        SELECT <include refid="Base_Column_List" /> FROM yeshi_ec_apppage_notification 

        WHERE an_type = #{0} AND an_show = 1 

             AND IF(an_begin_time IS NULL,TRUE, an_begin_time<![CDATA[<=]]> NOW()) 


 fanli/src/main/java/com/yeshi/fanli/service/impl/help/AppPageNotificationServiceImpl.java

@@ -33,11 +33,10 @@


    @Resource

    private AppVersionService appVersionService;

	


    @Resource

    private AdActivityVersionControlService adActivityVersionControlService;

	
	


    @Override

    public AppPageNotification getAppPageNotificationByType(String type) {



@@ -47,10 +46,10 @@
    @Cacheable(value = "configCache", key = "'getValidNotificationByTypeCache-'+#type+'-'+ #platform+'-'+#versionCode")

    @Override

    public AppPageNotification getValidNotificationByTypeCache(String type, String platform, Integer versionCode) {

        AppPageNotification record = appPageNotificationMapper.selectValidByType(type);

        if (record == null)

        List<AppPageNotification> recordList = appPageNotificationMapper.listValidByType(type);

        if (recordList == null || recordList.size() == 0)

            return null;

		


        // 过滤版本

        AppVersionInfo app = appVersionService.getClientVersion(platform, versionCode);

        if (app == null) {

@@ -58,19 +57,22 @@
        }

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

        versionIdList.add(app.getId());

		


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

        sourceIdList.add(record.getId());

        for (AppPageNotification an : recordList)

            sourceIdList.add(an.getId());

        Set<Long> sourceIds = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,

                AdActivityType.notification, versionIdList);

		
        if (!sourceIds.contains(record.getId())) {

        if (sourceIds == null || sourceIds.size() == 0)

            return null;

        long sourceId = sourceIds.iterator().next();



        for (AppPageNotification record : recordList) {

            if (record.getId().longValue() == sourceId)

                return record;

        }

		
        return record;

        return null;

    }

	


    @Override

    public void addAppPageNotification(AppPageNotification apn) throws Exception {

@@ -96,12 +98,12 @@


    @Override

    public void updateByPrimaryKey(AppPageNotification record) {

        appPageNotificationMapper.updateByPrimaryKey(record);		
        appPageNotificationMapper.updateByPrimaryKey(record);

    }

	


    @Override

    public void updateByPrimaryKeySelective(AppPageNotification record) {

        appPageNotificationMapper.updateByPrimaryKeySelective(record);		
        appPageNotificationMapper.updateByPrimaryKeySelective(record);

    }



    @Override

@@ -124,7 +126,6 @@
        return appPageNotificationMapper.countQuery(key, show, canClose);

    }



	
    @Transactional(rollbackFor = Exception.class)

    @Override

    public void setVersions(Long id, List<Long> versions) throws Exception {

@@ -171,5 +172,5 @@
            }

        }

    }

	


}