yujian
2019-03-19 2587b2940e5b88ef1cf96f459cd3ebddf39b9376
删除   推荐模块RecommendSection
13个文件已删除
6个文件已修改
942 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendSectionDao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendSectionDetailDao.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/goods/SuperRecommendSectionDao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendSectionAdmin.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendSection.java 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendSectionDetail.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendSection.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSectionDetailServiceImpl.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSectionServiceImpl.java 248 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendSectionServiceImpl.java 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendSectionDetailService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendSectionService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/SuperRecommendSectionService.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/Utils.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -27,7 +27,6 @@
import com.google.gson.GsonBuilder;
import com.taobao.api.ApiException;
import com.yeshi.fanli.entity.bus.recommend.RecommendDetails;
import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -51,8 +50,6 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionDetailService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -102,12 +99,6 @@
    @Resource
    private RecommendDetailsService recommendDetailsService;
    @Resource
    private RecommendSectionService recommendSectionService;
    @Resource
    private RecommendSectionDetailService recommendSectionDetailService;
    @Resource
    private ThreeSaleSerivce threeSaleSerivce;
@@ -473,19 +464,6 @@
        return "tuijian";
    }
    @RequestMapping("getRecommendSectionDetail")
    public void getRecommendSectionDetail(long id, PrintWriter out) {
        RecommendSectionDetail recommendSectionDetail = recommendSectionDetailService
                .getRecommendSectionDetailByRsId(id);
        if (recommendSectionDetail == null) {
            out.println(JsonUtil.loadFalseResult("recommendSectionDetail不能为空"));
            return;
        }
        JSONObject data = new JSONObject();
        data.put("picUrl", recommendSectionDetail.getPicUrl());
        data.put("html", recommendSectionDetail.getHtmlCode());
        out.println(JsonUtil.loadTrueResult(data));
    }
    @RequestMapping("shareGoods")
    public void shareGoods(String auctionId, PrintWriter out) {
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -79,7 +79,6 @@
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -126,9 +125,6 @@
    @Resource
    private SuperRecommendBannerService superRecommendBannerService;
    @Resource
    private SuperRecommendSectionService superRecommendSectionService;
    @Resource
    private SuperRecommendSpecialService superRecommendSpecialService;
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -33,7 +33,6 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -58,9 +57,6 @@
    @Resource
    private SuperRecommendBannerService superRecommendBannerService;
    @Resource
    private SuperRecommendSectionService superRecommendSectionService;
    @Resource
    private HongBaoManageService hongBaoManageService;
fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
@@ -27,14 +27,12 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import net.sf.json.JSONObject;
@@ -48,9 +46,6 @@
    @Resource
    private SuperRecommendBannerService superRecommendBannerService;
    @Resource
    private SuperRecommendSectionService superRecommendSectionService;
    @Resource
    private HongBaoManageService hongBaoManageService;
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendSectionDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/RecommendSectionDetailDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/dao/goods/SuperRecommendSectionDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/admin/RecommendSectionAdmin.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendSection.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendSectionDetail.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendSection.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSectionDetailServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendSectionServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperRecommendSectionServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java
@@ -15,9 +15,6 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendSectionDetailService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/RecommendSectionService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/goods/SuperRecommendSectionService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/util/Utils.java
@@ -27,7 +27,6 @@
import com.yeshi.fanli.entity.admin.GoodsClassAdmin;
import com.yeshi.fanli.entity.admin.HotSearchAdmin;
import com.yeshi.fanli.entity.admin.RecommendBannerAdmin;
import com.yeshi.fanli.entity.admin.RecommendSectionAdmin;
import com.yeshi.fanli.entity.admin.RecommendSpecialAdmin;
import com.yeshi.fanli.entity.common.AdminUser;
@@ -172,22 +171,6 @@
            });
            LinkedHashMap<Long, Object> newMap = new LinkedHashMap<Long, Object>();
            for (Entry<Long, GoodsClassAdmin> entry : list) {
                newMap.put(entry.getKey(), entry.getValue());
            }
            return newMap;
        } else if (obj instanceof RecommendSectionAdmin) {
            List<Map.Entry<Long, RecommendSectionAdmin>> list = new ArrayList<Map.Entry<Long, RecommendSectionAdmin>>(
                    (Collection) map.entrySet());
            Collections.sort(list, new Comparator<Map.Entry<Long, RecommendSectionAdmin>>() {
                public int compare(Map.Entry<Long, RecommendSectionAdmin> mapping1,
                        Map.Entry<Long, RecommendSectionAdmin> mapping2) {
                    int orderby1 = mapping1.getValue().getRecommendSection().getOrderby();
                    int orderby2 = mapping2.getValue().getRecommendSection().getOrderby();
                    return orderby1 - orderby2;
                }
            });
            LinkedHashMap<Long, Object> newMap = new LinkedHashMap<Long, Object>();
            for (Entry<Long, RecommendSectionAdmin> entry : list) {
                newMap.put(entry.getKey(), entry.getValue());
            }
            return newMap;