Controller 层清理

yujian

2019-03-13 fc7cf89b891a9ac5074daeff59d87e20510f385a

Controller 层清理

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ClassRecommendGoodsAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java

@@ -28,35 +28,6 @@
    @Resource

    private ConfigService configService;

    

    @Resource

    private AdminUserService adminUserService;

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

    public void getConfigList(PrintWriter out){

        List<Config> configList =  configService.getAllList();

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

    }

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

    public void updateConfig(String map, PrintWriter out) {

        List<Config> list = configService.getAllList();

        List<Config> newList = new ArrayList<Config>();

        Map<String, String> data = JsonUtil.parseData(map);

        for (Config config : list) {

            String key = config.getKey();

            if(data.containsKey(key)){

                String value =data.get(key);

                if(!config.getValue().equals(value)){

                    config.setValue(value);

                    newList.add(config);

                }

            }

        }

        configService.update(newList);

        out.print(JsonUtil.loadTrueResult("修改成功"));

        return;

    }

    

    /**

     * 查询列表 - 新后台


 fanli/src/main/java/com/yeshi/fanli/controller/admin/DataAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java

@@ -62,9 +62,7 @@
    @Resource

    private SystemService systemService;



    // private static final String IMGPATH="/upload/class";



    @RequestMapping(value = "getGoodsClassList"/* , method = RequestMethod.POST */)

    @RequestMapping(value = "getGoodsClassList")

    public void getGoodsClassList(String callback, Integer pageIndex, String platform, String packages, String key, PrintWriter out) {



        List<GoodsClassAdmin> goodsClassList = goodsClassService.getGoodsClassAdmins(pageIndex - 1, platform, packages, key);

@@ -85,11 +83,6 @@
        data.put("goodsClassList", goodsClassList);



        JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



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



        return;



    }



    @RequestMapping(value = "queryAll")

@@ -103,26 +96,19 @@
                return;

            }



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

            map.put("platform", platform);

            map.put("packages", packages);

            JSONObject data = new JSONObject();



            // List<System> systemList = systemService.getSystems();

            // data.put("systemList", systemList);



            data.put("goodsClassList", goodsClassList);



            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

        } catch (Exception e) {

            // TODO Auto-generated catch block

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

        }



    }



    @RequestMapping(value = "getGoodsClasAll"/* , method = RequestMethod.POST */)

	
    @RequestMapping(value = "getGoodsClasAll")

    public void getGoodsClassAll(String callback, PrintWriter out) {

        List<GoodsClass> goodsClassList = goodsClassService.getGoodsClassAll();



@@ -136,67 +122,6 @@
        }

    }



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

    public void addGoodsClass(GoodsClass goodsClass, PrintWriter out) {

        if (goodsClass == null) {

            out.print(JsonUtil.loadFalseResult("goodsClass不能为空"));

            return;

        }

        Integer res = goodsClassService.addGoodsClass(goodsClass);

        if (res == null) {

            out.print(JsonUtil.loadTrueResult("添加分类成功"));

        } else {

            out.print(JsonUtil.loadFalseResult("添加失败"));

        }

        return;

    }



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

    // public void uploadImg(@RequestParam("file") CommonsMultipartFile

    // file,HttpServletRequest request,PrintWriter out){

    // ServletContext servletContext = request.getSession().getServletContext();

    // JSONObject json=new JSONObject();

    // if(file != null){

    // String root=servletContext.getRealPath(IMGPATH);

    // if (!new File(root).exists()){

    // new File(root).mkdirs();

    // }

    // File newFile=new File(root+"/"+file.getOriginalFilename());

    // //通过CommonsMultipartFile的方法直接写文件（注意这个时候）

    // try {

    // file.transferTo(newFile);

    // json.put("code", "0");

    // json.put("path", IMGPATH+"/"+newFile.getName());

    // } catch (IllegalStateException e) {

    // e.printStackTrace();

    // json.put("code", "1");

    // } catch (IOException e) {

    // e.printStackTrace();

    // json.put("code", "1");

    // }finally{

    // out.print(json);

    // }

    // }else{

    // json.put("code", "1");

    // out.print(json);

    // }

    // }



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

    public void setGoodsClassSystem(String type, long gcid, String platform, String packageName, PrintWriter out) {

        platform = Utils.getMap().get(platform);

        if (Constant.DEL.equals(type)) {

            Integer integer = superGoodsClassService.deleteSuperGoodsClass(gcid, platform, packageName);

            if (integer > 0) {

                out.print(JsonUtil.loadTrueResult("删除成功"));

            } else {

                out.print(JsonUtil.loadTrueResult("删除失败"));

            }

        } else {

            superGoodsClassService.addSuperGoodsClass(gcid, platform, packageName);

            out.print(JsonUtil.loadTrueResult("添加成功"));

        }

    }



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

    public void getGoodsClass(long id, PrintWriter out) {

@@ -208,17 +133,6 @@
        out.print(JsonUtil.loadFalseResult("不存在该GoodsClass"));

    }



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

    public void deleteGoodsClass(long[] gcids, PrintWriter out) {

        goodsClassService.deleteGoodsClasss(gcids);

        out.print(JsonUtil.loadTrueResult("删除成功"));

    }



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

    public void updateGoodsClass(GoodsClass goodsClass, PrintWriter out) {

        goodsClassService.updateGoodsClass(goodsClass);

        out.print(JsonUtil.loadTrueResult("修改成功"));

    }



    /**

     * 添加类别


 fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsSecondClassAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/HongBaoActivityAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/HongBaoManageAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/HotSearchAdminController.java

@@ -1,22 +1,16 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.admin.HotSearchAdmin;

import com.yeshi.fanli.entity.bus.search.HotSearch;

import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;

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

@@ -26,7 +20,8 @@
import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.Utils;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/search")

@@ -41,78 +36,6 @@
    @Resource

    private SuperHotSearchService superHotSearchService;

    

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

    public void getHotSearchList(int pageIndex,String platform,String packages,String key, PrintWriter out) {



         List<HotSearchAdmin> hotSearchs = hotSearchService.getHotSearchs(pageIndex - 1,platform,packages,key);

         int count =hotSearchService.getCount( platform, packages, key);

         int totalPage = count % Constant.PAGE_SIZE == 0 ? count

                 / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

         PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count,

                 totalPage);

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

         map.put("platform", platform);

         map.put("packages", packages);

         map.put("key", key);

         pe.setParams(map);

         JSONObject data = new JSONObject();

         data.put("pe", pe);

         List<System> systemList = systemService.getSystems();

         data.put("systemList", systemList);

         data.put("hotSerachList", hotSearchs);

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

         return;

    }

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

    public void setHotSearchSystem(String type, long hsid, String platform,

            String packageName, PrintWriter out) {

        platform = Utils.getMap().get(platform);

        if (Constant.DEL.equals(type)) {

            Integer integer = superHotSearchService

                    .deleteSuperHotSearch(hsid, platform, packageName);

            if (integer > 0) {

                out.print(JsonUtil.loadTrueResult("删除成功"));

            } else {

                out.print(JsonUtil.loadTrueResult("删除失败"));

            }

        } else {

            superHotSearchService.addSuperHotSearch(hsid, platform,packageName);

            out.print(JsonUtil.loadTrueResult("添加成功"));

        }



    }

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

    public void getHotSearch(long id,PrintWriter out){

        HotSearch  rb = hotSearchService.getHotSearch(id);

        if(rb != null){

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

            return;

        }

        out.print(JsonUtil.loadFalseResult("不存在该热门搜索"));

    }

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

    public void addHotSearch(HotSearch hotSearch, PrintWriter out) {

        if (hotSearch == null) {

            out.print(JsonUtil.loadFalseResult("热门搜索不能为空"));

            return;

        }

        hotSearchService.addHotSearch(hotSearch);

        out.print(JsonUtil.loadTrueResult("添加热门搜索成功"));

        return;

    }

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

    public void deleteSection(long[] hsids,PrintWriter out){

        Integer type = hotSearchService.deleteHotSearch(hsids);

        if(type==null){

            out.print(JsonUtil.loadTrueResult("删除成功"));

        }else{

            out.print(JsonUtil.loadFalseResult("删除失败"));

        }

    }

    

    @RequestMapping(value = "updateHotSearch")

    public void updateSection(String callback, HotSearch hotSearch, PrintWriter out){


 fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java

@@ -7,9 +7,6 @@


import javax.annotation.Resource;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -24,8 +21,10 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/lostOrder")

@@ -34,49 +33,6 @@
    @Resource

    private LostOrderService lostOrderService;



    @RequestMapping("findLostOrderList")

    public void findLostOrderList(int page, String key, PrintWriter out) {

        List<LostOrder> list = lostOrderService.findLostOrderList(key, page);

        int count = lostOrderService.getCount(key);

        PageEntity pe = new PageEntity(page, Constant.PAGE_SIZE, count);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("lostOrderList", GsonUtil.toJsonByUserAp(list));

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

    }



    @RequestMapping("pass")

    public void pass(long id, PrintWriter out) {

        LostOrder lostOrder = lostOrderService.getOne(id);

        if (lostOrder == null) {

            out.print(JsonUtil.loadFalseResult("不存在该查询订单"));

            return;

        }

        if (lostOrder.getState() != 0) {

            out.print(JsonUtil.loadFalseResult("该订单已处理"));

            return;

        }

        lostOrderService.pass(lostOrder);

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

    }



    @RequestMapping("reject")

    public void reject(long id,String reason, PrintWriter out) {

        LostOrder lostOrder = lostOrderService.getOne(id);

        if (lostOrder == null) {

            out.print(JsonUtil.loadFalseResult("不存在该查询订单"));

            return;

        }

        if (lostOrder.getState() != 0) {

            out.print(JsonUtil.loadFalseResult("该订单已处理"));

            return;

        }

        lostOrder.setRemake(reason);

        lostOrderService.reject(lostOrder);

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

    }



	
    /**

     * 新版后台 列表查询

     * @param callback


 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java

@@ -26,17 +26,6 @@
    @Resource

    private PushRecordService pushRecordService;

    

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

    public void getAll(String title,int type,int page,PrintWriter out){

        List<PushRecord> list = pushRecordService.getPushRecordList(title,type,page);

        int count = pushRecordService.getCount(title,type,page);

        PageEntity pe = new PageEntity(page, Constant.PAGE_SIZE, count);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("list", list);

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

    }

	
    

    /**

     * 推荐记录 -(新后台)


 fanli/src/main/java/com/yeshi/fanli/controller/admin/RecommendBanneAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/RecommendSectionAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/RecommendSectionDetailAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/RecommendSectionGoodsAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/RecommendSpecialAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ShareController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoCouponAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java

@@ -3,7 +3,6 @@
import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

@@ -13,7 +12,6 @@


import org.springframework.stereotype.Controller;

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

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

@@ -29,21 +27,15 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

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

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

import com.yeshi.fanli.exception.ExistObjectException;

import com.yeshi.fanli.exception.NotExistObjectException;

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

import com.yeshi.fanli.service.inter.goods.GoodsClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefRecordService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

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

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

@@ -56,13 +48,10 @@


    @Resource

    private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

    @Resource

    private TaoBaoGoodsBriefRecordService taoBaoGoodsBriefRecordService;



    @Resource

    private RedisManager redisManager;

    @Resource

    private QualityFactoryService qualityFactoryService;

	
    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;



@@ -74,159 +63,6 @@
    @Resource

    private TaoBaoClassService taoBaoClassService;



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

    public void getTaoBaoGoodsBriefList(int pageIndex, String key, PrintWriter out) {



        List<TaoBaoGoodsBrief> taoBaoGoodsBriefList = taoBaoGoodsBriefService.getTBList(pageIndex - 1, key);

        int count = taoBaoGoodsBriefService.getCount(key);

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);

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

        map.put("key", key);

        pe.setParams(map);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("taoBaoGoodsBriefList", GsonUtil.toDFJson(taoBaoGoodsBriefList));

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

    }



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

    public void getInvalidTaoBaoGoods(int pageIndex, PrintWriter out) {

        List<TaoBaoGoodsBrief> taoBaoGoodsBriefList = taoBaoGoodsBriefService.getInvalidTB(pageIndex);

        int count = taoBaoGoodsBriefService.getInvalidCount();

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("taoBaoGoodsBriefList", GsonUtil.toDFJson(taoBaoGoodsBriefList));

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

    }



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

    public void getTaoBaoGoodsBrief(long id, PrintWriter out) {

        TaoBaoGoodsBrief taobao = taoBaoGoodsBriefService.getTaoBao(id);



        if (taobao == null) {

            out.append(JsonUtil.loadFalseResult("不存在该商品"));

            return;

        }

        JSONObject data = new JSONObject();

        data.put("taobao", GsonUtil.toDFJson(taobao));

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

        list = TaoBaoUtil.getTbImg(taobao.getAuctionId() + "");

        data.put("imgList", list);

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

    }



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

    public void updateTaoBaoGoodsBrief(TaoBaoGoodsBrief tb, PrintWriter out) {

        try {

            taoBaoGoodsBriefService.updateTBGoods(tb);

        } catch (NotExistObjectException e) {

            out.append(JsonUtil.loadFalseResult(e.getMessage()));

            return;

        }

        out.append(JsonUtil.loadTrueResult("修改成功"));

    }



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

    public void deleteTaoBaoGoods(long[] ids, PrintWriter out) {

        for (long id : ids) {

            taoBaoGoodsBriefService.deleteTaoBaoGoods(id);

        }

        out.append(JsonUtil.loadTrueResult("删除成功"));

    }



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

    public void addTaoBaoGoodsBrief(String[] ids, PrintWriter out) {

        List<JSONObject> list = new ArrayList<JSONObject>();

        JSONObject data = null;

        for (String id : ids) {

            data = new JSONObject();



            TaoBaoGoodsBrief taoBaoGoodsBrief = null;

            try {

                taoBaoGoodsBrief = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id));

                taoBaoGoodsBrief.setUpdatetime(new Date());

                taoBaoGoodsBrief.setCreatetime(new Date());

            } catch (NumberFormatException e1) {

                e1.printStackTrace();

            } catch (TaobaoGoodsDownException e1) {

                e1.printStackTrace();

            }

            try {

                taoBaoGoodsBriefService.insertSelective(taoBaoGoodsBrief);

                // taoBaoGoodsBriefService.save(taoBaoGoodsBrief);

                data.put("id", id);

                data.put("msg", "添加成功");

            } catch (Exception e) {

                data.put("id", id);

                data.put("msg", e.getMessage());

            }

            list.add(data);

        }

        JSONObject dataAll = new JSONObject();

        dataAll.put("list", list);

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

    }



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

    public void addRecommendSectionGoods(long rsid, String tbids, PrintWriter out) {

        String[] tbidStrArr = tbids.split(",");

        long[] tbidArr = StringUtil.parseLong(tbidStrArr);

        List<JSONObject> list = new ArrayList<JSONObject>();

        JSONObject data = null;

        for (long tbid : tbidArr) {

            data = new JSONObject();

            try {

                taoBaoGoodsBriefService.addRecommendSectionGoods(rsid, tbid);

                data.put("id", tbid);

                data.put("msg", "添加成功");

            } catch (NotExistObjectException e) {

                data.put("id", tbid);

                data.put("msg", e.getMessage());

            } catch (ExistObjectException e) {

                data.put("id", tbid);

                data.put("msg", e.getMessage());

            }

            list.add(data);

        }

        JSONObject dataAll = new JSONObject();

        dataAll.put("list", list);

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

    }



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

    public void addClassRecommendGoods(long gcid, String tbids, PrintWriter out) {

        String[] tbidStrArr = tbids.split(",");

        long[] tbidArr = StringUtil.parseLong(tbidStrArr);

        List<JSONObject> list = new ArrayList<JSONObject>();

        JSONObject data = null;

        for (long tbid : tbidArr) {

            data = new JSONObject();

            try {

                taoBaoGoodsBriefService.addClassRecommendGoods(gcid, tbid);

                data.put("id", tbid);

                data.put("msg", "添加成功");

            } catch (NotExistObjectException e) {

                data.put("id", tbid);

                data.put("msg", e.getMessage());

            } catch (ExistObjectException e) {

                data.put("id", tbid);

                data.put("msg", e.getMessage());

            }

            list.add(data);

        }

        JSONObject dataAll = new JSONObject();

        dataAll.put("list", list);

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

    }



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

    public void updateAllTaoBaoGoods(PrintWriter out) {

        taoBaoGoodsBriefService.getUpdateTaoBao();

        out.print(JsonUtil.loadTrueResult("更新完成"));

    }



    /**

     * 

@@ -848,9 +684,6 @@
                data.put("listGoods", gson.toJson(listmap));



                JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



                // 插入本地数据-淘宝数据记录

                taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);

            }



        } catch (Exception e) {

@@ -1051,9 +884,6 @@


            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



            // 插入本地数据-淘宝数据记录

            taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);



        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询异常"));

            e.printStackTrace();

@@ -1151,7 +981,6 @@
                }



                map.put("isExistence", existence);



                listmap.add(map);

            }



@@ -1166,10 +995,6 @@
            data.put("listGoods", gson.toJson(listmap));



            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));



            // // 插入本地数据-淘宝数据记录

            taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);



        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询异常"));

            e.printStackTrace();


 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -258,8 +258,9 @@
        out.print(JsonUtil.loadTrueResult(data));

    }





    /**

     * 查询用户信息列表--相关数据统计

     * 查询用户信息列表   正常用户/异常用户

     * 

     * @param callback

     * @param pageIndex

@@ -442,176 +443,6 @@
        }

    }



    /**

     * 修改用户的状态、等级信息

     * 
     * @param callback

     * @param userInfo

     * @param out

     */

    @RequestMapping(value = "setInfo")

    public void setInfo(String callback, UserInfo userInfo, PrintWriter out) {

        try {



            Long id = userInfo.getId();



            if (id == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

                return;

            }



            UserInfo currentInfo = userInfoService.selectByPKey(id);

            if (currentInfo == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户已不存在"));

                return;

            }



            currentInfo = new UserInfo(id);



            boolean hasChange = false;



            // 等级修改

            Integer rank = userInfo.getRank();

            if (rank != null) {

                hasChange = true;

                currentInfo.setRank(rank);

            }



            // 状态修改

            Integer state = userInfo.getState();

            if (state != null) {

                hasChange = true;

                currentInfo.setState(state);

                if (state != null && state == UserInfo.STATE_FORBIDDEN)

                    currentInfo.setStateDesc("管理员封禁");

            }



            if (hasChange) {

                userInfoService.updateByPrimaryKeySelective(currentInfo);

                UserInfo nowUser = userInfoService.selectByPKey(id);

                if (state != null && state == UserInfo.STATE_FORBIDDEN) {

                    // 加入封禁的账号列表

                    ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

                    forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId);

                    forbiddenUserIdentifyCode.setIdentifyCode(nowUser.getWxUnionId());

                    forbiddenUserIdentifyCode.setBeiZhu(nowUser.getWxName());

                    try {

                        forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

                    } catch (ForbiddenUserIdentifyCodeException e) {

                        e.printStackTrace();

                    }



                    // 电话号码

                    forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

                    forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.phone);

                    forbiddenUserIdentifyCode.setIdentifyCode(nowUser.getPhone());

                    try {

                        forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

                    } catch (ForbiddenUserIdentifyCodeException e) {

                        e.printStackTrace();

                    }



                    // 淘宝

                    UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(nowUser.getId());

                    if (taoBao != null && !StringUtil.isNullOrEmpty(taoBao.getTaoBaoUid())) {

                        forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

                        forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.taobaoUid);

                        forbiddenUserIdentifyCode.setIdentifyCode(taoBao.getTaoBaoUid());

                        try {

                            forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

                        } catch (ForbiddenUserIdentifyCodeException e) {

                            e.printStackTrace();

                        }

                    }



                    // 查询支付宝绑定



                    List<BindingAccount> list = bindingAccountService.getBindingAccountByUid(nowUser.getId());

                    if (list != null)

                        for (BindingAccount ba : list) {

                            forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

                            forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount);

                            forbiddenUserIdentifyCode.setIdentifyCode(ba.getAccount());

                            forbiddenUserIdentifyCode.setBeiZhu(ba.getName());

                            try {

                                forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

                            } catch (ForbiddenUserIdentifyCodeException e) {

                                e.printStackTrace();

                            }

                        }

                } else if (state != null && state == UserInfo.STATE_NORMAL) {

                    // 解封微信

                    ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService

                            .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId,

                                    nowUser.getWxUnionId());

                    if (forbiddenUserIdentifyCode != null)

                        forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

                    // 解封手机

                    forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService

                            .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, nowUser.getPhone());

                    if (forbiddenUserIdentifyCode != null)

                        forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

                    // 解封淘宝

                    UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(nowUser.getId());

                    if (taoBao != null && !StringUtil.isNullOrEmpty(taoBao.getTaoBaoUid())) {

                        forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService.listByTypeAndIdentifyCode(

                                ForbiddenUserIdentifyCodeTypeEnum.taobaoUid, taoBao.getTaoBaoUid());

                        if (forbiddenUserIdentifyCode != null)

                            forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

                    }

                    // 解封支付宝

                    List<BindingAccount> list = bindingAccountService.getBindingAccountByUid(nowUser.getId());

                    if (list != null)

                        for (BindingAccount ba : list) {

                            forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService.listByTypeAndIdentifyCode(

                                    ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, ba.getAccount());

                            if (forbiddenUserIdentifyCode != null)

                                forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

                        }

                }



                JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("修改成功"));

            } else {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("无可修改内容"));

            }



        } catch (



        Exception e) {

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("修改失败"));

        }

    }



    /**

     * 删除绑定的账户信息： 支付宝 微信

     * 
     * @param callback

     * @param bindId

     * @param out

     */

    @RequestMapping(value = "deleteBindingAccount")

    public void deleteBindingAccount(String callback, Long bindId, PrintWriter out) {

        try {



            if (bindId == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

                return;

            }



            int count = bindingAccountService.deleteByPrimaryKey(bindId);



            if (count > 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("删除成功"));

            } else {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

            }



        } catch (Exception e) {

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

        }

    }



    /**

     * 

@@ -622,50 +453,72 @@
     *            需要解绑的账户类型

     */

    @RequestMapping("unBindUserInfo")

    public void unBindUserInfo(String callback, Long id, Integer type, PrintWriter out) {

    public void unBindUserInfo(String callback, Long uid, String typeArray, PrintWriter out) {

        try {



            if (id == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("不存在该用户！"));

            if (typeArray == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("没有可更改的内容"));

                return;

            }

			
            Gson gson = new Gson();

            List<Integer> list = gson.fromJson(typeArray, new TypeToken<ArrayList<Integer>>() {}.getType());

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

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("没有可更改的内容"));

                return;

            }

			
			
            if (uid == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户id不能为空"));

                return;

            }



            if (type == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("账户类型不可为空！"));

                return;

            }



            UserInfo find = userInfoService.getUserById(id);



            UserInfo find = userInfoService.getUserById(uid);

            if (find == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("不存在该用户！"));

                return;

            }



            String openid = find.getOpenid();

            String wxUnionId = find.getWxUnionId();

            String phone = find.getPhone();

            if (1 == type) {

                if (StringUtil.isNullOrEmpty(openid)) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定支付宝！"));

			
			
            for (Integer type: list) {

                String openid = find.getOpenid();

                String wxUnionId = find.getWxUnionId();

                String phone = find.getPhone();

                if (1 == type) {

                    if (StringUtil.isNullOrEmpty(openid)) {

                        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定淘宝！"));

                        return;

                    } else {

                        userInfoService.deleteBindInfo(find, type);

                    }

                } else if (2 == type) {

                    if (StringUtil.isNullOrEmpty(wxUnionId)) {

                        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定微信！"));

                        return;

                    } else {

                        userInfoService.deleteBindInfo(find, type);

                    }

                } else if (3 == type) {

                    if (StringUtil.isNullOrEmpty(phone)) {

                        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定手机号！"));

                        return;

                    } else {

                        userInfoService.deleteBindInfo(find, type);

                    }

                } else if (4 == type) {

                    // 查询支付宝绑定

                    BindingAccount account = bindingAccountService.getBindingAccountByUidAndType(uid, BindingAccount.TYPE_ALIPAY);

                    if (account == null) {

                        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定支付宝！"));

                        return;

                    } else {

                        bindingAccountService.deleteBindingAccount(account);

                    }

                } else {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("账户类型不匹配！"));

                    return;

                }

            } else if (2 == type) {

                if (StringUtil.isNullOrEmpty(wxUnionId)) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定微信！"));

                    return;

                }

            } else if (3 == type) {

                if (StringUtil.isNullOrEmpty(phone)) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("当前用户未绑定手机号！"));

                    return;

                }

            } else {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("账户类型有误！"));

                return;

            }



            userInfoService.deleteBindInfo(find, type);



            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("解绑成功"));



@@ -1273,6 +1126,157 @@
    }



    



    /**

     * 封禁用户ID

     * @param callback

     * @param uid

     * @param out

     */

    @RequestMapping(value = "forbiddenUser")

    public void forbiddenUser(String callback, Long uid, PrintWriter out) {

        try {



            if (uid == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

                return;

            }



            UserInfo currentInfo = userInfoService.selectByPKey(uid);

            if (currentInfo == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户已不存在"));

                return;

            }



            currentInfo.setState(UserInfo.STATE_FORBIDDEN);

            currentInfo.setStateDesc("管理员封禁");

            userInfoService.updateByPrimaryKeySelective(currentInfo);

			
            // 加入封禁的账号列表

            ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

            forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId);

            forbiddenUserIdentifyCode.setIdentifyCode(currentInfo.getWxUnionId());

            forbiddenUserIdentifyCode.setBeiZhu(currentInfo.getWxName());

            try {

                forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

            } catch (ForbiddenUserIdentifyCodeException e) {

                e.printStackTrace();

            }



            // 电话号码

            forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

            forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.phone);

            forbiddenUserIdentifyCode.setIdentifyCode(currentInfo.getPhone());

            try {

                forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

            } catch (ForbiddenUserIdentifyCodeException e) {

                e.printStackTrace();

            }



            // 淘宝

            UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(uid);

            if (taoBao != null && !StringUtil.isNullOrEmpty(taoBao.getTaoBaoUid())) {

                forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

                forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.taobaoUid);

                forbiddenUserIdentifyCode.setIdentifyCode(taoBao.getTaoBaoUid());

                try {

                    forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

                } catch (ForbiddenUserIdentifyCodeException e) {

                    e.printStackTrace();

                }

            }



            // 查询支付宝绑定



            List<BindingAccount> list = bindingAccountService.getBindingAccountByUid(uid);

            if (list != null) {

                for (BindingAccount ba : list) {

                    forbiddenUserIdentifyCode = new ForbiddenUserIdentifyCode();

                    forbiddenUserIdentifyCode.setType(ForbiddenUserIdentifyCodeTypeEnum.alipayAccount);

                    forbiddenUserIdentifyCode.setIdentifyCode(ba.getAccount());

                    forbiddenUserIdentifyCode.setBeiZhu(ba.getName());

                    try {

                        forbiddenUserIdentifyCodeService.addIdentifyCode(forbiddenUserIdentifyCode);

                    } catch (ForbiddenUserIdentifyCodeException e) {

                        e.printStackTrace();

                    }

                }

            }

			
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("用户封禁成功"));

			
        } catch (Exception e) {

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

        }

    }

	
	
    /**

     * 解除封禁用户ID

     * @param callback

     * @param uid

     * @param out

     */

    @RequestMapping(value = "relieveForbiddenUser")

    public void relieveForbiddenUser(String callback, Long uid, PrintWriter out) {

        try {



            if (uid == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请传递正确数据"));

                return;

            }



            UserInfo currentInfo = userInfoService.selectByPKey(uid);

            if (currentInfo == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户已不存在"));

                return;

            }



            currentInfo.setState(UserInfo.STATE_NORMAL);

            currentInfo.setStateDesc("管理员已解封");

            userInfoService.updateByPrimaryKeySelective(currentInfo);



            // 解封微信

            ForbiddenUserIdentifyCode forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService

                    .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId, currentInfo.getWxUnionId());

            if (forbiddenUserIdentifyCode != null)

                forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);



            // 解封手机

            forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService

                    .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, currentInfo.getPhone());

            if (forbiddenUserIdentifyCode != null)

                forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);



            // 解封淘宝

            UserExtraTaoBaoInfo taoBao = userExtraTaoBaoInfoService.getByUid(uid);

            if (taoBao != null && !StringUtil.isNullOrEmpty(taoBao.getTaoBaoUid())) {

                forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService

                        .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.taobaoUid, taoBao.getTaoBaoUid());

                if (forbiddenUserIdentifyCode != null)

                    forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

            }



            // 解封支付宝

            List<BindingAccount> list = bindingAccountService.getBindingAccountByUid(uid);

            if (list != null) {

                for (BindingAccount ba : list) {

                    forbiddenUserIdentifyCode = forbiddenUserIdentifyCodeService.listByTypeAndIdentifyCode(

                            ForbiddenUserIdentifyCodeTypeEnum.alipayAccount, ba.getAccount());

                    if (forbiddenUserIdentifyCode != null)

                        forbiddenUserIdentifyCodeService.delete(forbiddenUserIdentifyCode);

                }

            }



            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("用户解封成功"));



        } catch (Exception e) {

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

        }

    }

	
    

    /**

     * 用户账号- 封禁/解封 

@@ -1299,7 +1303,6 @@
            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

        }

		
    }

    

}


 fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemAdminController.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml

@@ -309,7 +309,7 @@
                   <if test="keyType == 3">
                       AND    u.`phone` = #{key}
                   </if>
                   <if test="keyType == 3">
                   <if test="keyType == 4">
                       AND    b.`account` = #{key}
                   </if>
               </if>
@@ -374,7 +374,7 @@
                   <if test="keyType == 3">
                       AND    u.`phone` = #{key}
                   </if>
                   <if test="keyType == 3">
                   <if test="keyType == 4">
                       AND    b.`account` = #{key}
                   </if>
               </if>

 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2CountMapper.xml

@@ -11,14 +11,13 @@
        <result column="hb_state" property="state" jdbcType="INTEGER" />
        <result column="hb_version" property="version" jdbcType="INTEGER" />
        <result column="hb_beizhu" property="beizhu" jdbcType="VARCHAR" />
        <result column="hb_pre_get_time" property="preGetTime"
            jdbcType="TIMESTAMP" />
        <result column="hb_pre_get_time" property="preGetTime" jdbcType="TIMESTAMP" />
        <result column="hb_get_time" property="getTime" jdbcType="TIMESTAMP" />
        <result column="hb_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="hb_update_time" property="updateTime" jdbcType="TIMESTAMP" />

        <result column="totalMoney" property="totalMoney" jdbcType="DECIMAL" />

		
        <association property="userInfo" column="hb_uid"
            javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
            <id column="hb_uid" property="id" jdbcType="BIGINT" />

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

@@ -704,7 +704,7 @@
        

        // 最近一次下单时间

        Date lastOrderTime = hongBaoV2CountService.getLastHongBaoTime(uid);

        if (lastOrderTime != null) {

        if (lastOrderTime != null && lastOrderTime.getTime() != 0) {

            userInfoVO.setLastOrderTime(lastOrderTime.getTime());

        }




 fanli/src/main/java/com/yeshi/fanli/vo/user/UserInfoVO.java

@@ -30,7 +30,7 @@
    // 累计订单

    private long totalOrder;

    // 最近下单时间

    private long lastOrderTime;

    private Long lastOrderTime;



    // 一级队员

    private long countLevelOne;


 fanli/src/test/java/org/fanli/push/SystemCouponServiceTest.java

New file
@@ -0,0 +1,32 @@
package org.fanli.push;



import org.junit.Test;



import com.yeshi.fanli.exception.PushException;

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

import com.yeshi.fanli.service.inter.push.PushCouponService;

import com.yeshi.fanli.util.BeanUtil;



public class SystemCouponServiceTest {

	
    @Test

    public void test3() {

		
        PushCouponService service = BeanUtil.getBean(PushCouponService.class);

		
        try {

            // 推送券

            service.executePush(5L);

			
        } catch (PushCouponException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        } catch (Exception e) {

            e.printStackTrace();

        }

		
    }

	


}