每日任务相关代码删除

admin

2018-12-18 ecda3630b637155ce1ae4a4cabf6ef869a561fbd

每日任务相关代码删除

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

@@ -2,7 +2,6 @@


import java.io.InputStream;

import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

@@ -12,8 +11,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

@@ -26,12 +23,10 @@
import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

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

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

import com.yeshi.fanli.entity.bus.invite.SpreadImg;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.service.AdminUserService;

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

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

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

import com.yeshi.fanli.tag.PageEntity;

@@ -39,7 +34,8 @@
import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

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



import net.sf.json.JSONObject;



@Controller

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

@@ -48,8 +44,7 @@
    @Resource

    private InviteGetMoneyService inviteGetMoneyService;

    

    @Resource

    private EveryDayTaskService everyDayTaskService;



    

    @Resource

    private TaoBaoGoodsBriefService taoBaoGoodsBriefService; 

@@ -57,88 +52,9 @@
    @Resource

    private AdminUserService adminUserService;

    

    /**

     * 
     * 方法说明: 每日任务商品库列表查询

     * @author mawurui

     */

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

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

        //查询商品总数

        Integer totalCount = everyDayTaskService.getCount();

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

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

         PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount,

                 totalPage);

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

         map.put("key", key);

         pageEntity.setParams(map);

         //分页查询所有商品

         List<EveryDayTask> everyDayTaskList = everyDayTaskService.everyDayTaskList(pageIndex-1, key);

         for(EveryDayTask everyDayTask: everyDayTaskList) {

             //计算用户得到的佣金

             String getMoney = taoBaoGoodsBriefService.getGoodsUserHongBao(everyDayTask.getEtGoods());

             everyDayTask.setGetMoney(getMoney);

			 
             //计算券后价

             BigDecimal quanhoujia = TaoBaoUtil.getAfterUseCouplePrice(everyDayTask.getEtGoods());

             everyDayTask.setQuanhoujia(quanhoujia);

			 
         }

		 
        JSONObject data=new JSONObject();

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

        data.put("everyDayTaskList", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(everyDayTaskList));

        out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "成功"));

    }



    

    /**

     * 
     * 方法说明: 删除每日任务商品库（真删除）

     * @author mawurui

     * createTime 2018年3月29日 下午6:22:21

     * @param ids

     * @param out

     */

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

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

        for (long id : ids) {

            everyDayTaskService.deletEeveryDayTask(id);

        }

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

    }

	
    /***

     * 
     * 方法说明: 修改每日任务商品库排序值

     * @author mawurui

     * createTime 2018年3月30日 上午9:29:46

     * @param id

     * @param out

     */

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

    public void updateEveryDayTask(EveryDayTask everyDayTask , PrintWriter out) {

        everyDayTaskService.updateEveryDayTask(everyDayTask);

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

    }

	
    /**

     * 
     * 方法说明: 查询每日任务详情(页面反显)

     * @author mawurui

     * createTime 2018年3月30日 上午9:32:52

     * @param id

     * @return

     */

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

    public void getEveryDayTask(long id, PrintWriter out) {

        EveryDayTask everyDayTask = everyDayTaskService.getEveryDayTask(id);

        JSONObject data = new JSONObject();

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

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

    }

	
    /**

        /**

     * 

     * 方法说明: 查询邀请榜单列表

     * @author mawurui


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

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


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

@@ -46,7 +45,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;

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



import org.yeshi.utils.JsonUtil;

import net.sf.json.JSONObject;



@Controller

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

@@ -63,16 +62,15 @@
    private QualityFactoryService selectionGoodsService;

    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;

	


    @Resource

    private TaobaoMeterialService taobaoMeterialService;

    @Resource

    private GoodsClassService goodsClassService;

	


    @Resource

    private TaoBaoClassService taoBaoClassService;

	
	


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

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



@@ -142,8 +140,8 @@
        JSONObject data = null;

        for (String id : ids) {

            data = new JSONObject();

			
            TaoBaoGoodsBrief taoBaoGoodsBrief=null;



            TaoBaoGoodsBrief taoBaoGoodsBrief = null;

            try {

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

                taoBaoGoodsBrief.setUpdatetime(new Date());

@@ -155,7 +153,7 @@
            }

            try {

                taoBaoGoodsBriefService.insertSelective(taoBaoGoodsBrief);

//                taoBaoGoodsBriefService.save(taoBaoGoodsBrief);

                // taoBaoGoodsBriefService.save(taoBaoGoodsBrief);

                data.put("id", id);

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

            } catch (Exception e) {

@@ -179,40 +177,6 @@
            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));

    }



    /**

     * 
     * 方法说明: 添加商品到每日任务

     * 
     * @author mawurui createTime 2018年3月29日 上午11:36:25

     * @param tbids

     * @param out

     */

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

    public void addEveryDayTask(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.addEveryDayTask(tbid);

                data.put("id", tbid);

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

            } catch (NotExistObjectException e) {

@@ -280,15 +244,15 @@
     * @param out

     */

    @RequestMapping(value = "queryOnSale")

    public void queryOnSale(String callback, Integer pageIndex, Integer pageSize, String key,  Long tbClassId, Integer startPrice,

            Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall, Integer hasCoupon,

            Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay, Integer includePayRate30,

            Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel, PrintWriter out) {

    public void queryOnSale(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,

            Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,

            Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,

            Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel,

            PrintWriter out) {



        try {

			


            SearchFilter filter = new SearchFilter();

			


            // 页大小，默认20，1~100

            if (pageSize == null || pageSize < 1)

@@ -306,17 +270,17 @@
            if (!StringUtil.isNullOrEmpty(key))

                filter.setKey(key);



            if(tbClassId != null ) {

            if (tbClassId != null) {

                GoodsClass rb = goodsClassService.getGoodsClass(tbClassId);

                if (rb == null) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该类型已不存在,请刷新重试"));

                    return;

                } else {

					


                    // 淘宝类目id

                    String taoBaoCatIds = taoBaoClassService.getTaoBaoCatIds(tbClassId);

					
                    if (StringUtil.isNullOrEmpty(taoBaoCatIds)){



                    if (StringUtil.isNullOrEmpty(taoBaoCatIds)) {

                        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该类型淘宝id为空，请通知相关人员进行维护"));

                        return;

                    } else {

@@ -324,12 +288,12 @@
                    }

                }

            }

			


            // 查询条件和类目id不能同时为空

            if (StringUtil.isNullOrEmpty(key) && tbClassId == null){

            if (StringUtil.isNullOrEmpty(key) && tbClassId == null) {

                filter.setKey("女装");

            }

			


            // 折扣价范围下限

            if (startPrice != null)

                filter.setStartPrice(new BigDecimal(startPrice));

@@ -341,7 +305,7 @@
            // 淘客佣金比率下限 如：1234表示12.34%

            if (!StringUtil.isNullOrEmpty(startTkRate)) {

                int tkRate = (int) (Float.parseFloat(startTkRate) * 100);

                    filter.setStartTkRate(tkRate);

                filter.setStartTkRate(tkRate);

            }



            // 淘客佣金比率上限 如：1234表示12.34%

@@ -363,9 +327,9 @@
            // 是否包邮，true表示包邮，空或false表示不限

            if (baoYou != null && baoYou == 1) {

                filter.setBaoYou(true);

                //filter.setIp("113.251.22.10");// 重庆

                // filter.setIp("113.251.22.10");// 重庆

                filter.setIp("218.72.111.105");// 杭州

				


            }



            // 店铺dsr评分

@@ -442,23 +406,23 @@
            if (taoBaoGoodsBriefs == null || taoBaoGoodsBriefs.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未查询到淘宝商品信息"));

                return;

            } 
            }



            // 插入商品集合

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

            for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {

                listAuctionId.add(goodsBrief.getAuctionId());

            }

			


            // 验证是否存在数据库

            List<QualityFactory> listHas = selectionGoodsService.listQueryByAuctionId(listAuctionId);

			


            List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();



            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

				


                taoBaoGoodsBrief.setId(null);

				


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



                map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());

@@ -532,7 +496,6 @@
                        }

                    }

                }

				


                map.put("isExistence", existence);



@@ -550,15 +513,15 @@
            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();

        }

		


    }



    /**

@@ -604,9 +567,9 @@
            if (!StringUtil.isNullOrEmpty(key)) {

                filter.setKey(key);

            } else {

                // 高佣id 
                // 高佣id

                if (!StringUtil.isNullOrEmpty(catIds)) {

					


                    // 男装+ 类目id

                    String[] split = catIds.split(",");

                    filter.setCateIds(split[1]);

@@ -618,7 +581,7 @@
                filter.setStartPrice(new BigDecimal(startPrice));



            // 折扣价范围上限

            if (endPrice != null )

            if (endPrice != null)

                filter.setEndPrice(new BigDecimal(endPrice));



            // 佣金比率下限

@@ -648,7 +611,7 @@
                filter.setBaoYou(true);



            // 销量

             if (!StringUtil.isNullOrEmpty(startBiz30day))

            if (!StringUtil.isNullOrEmpty(startBiz30day))

                filter.setStartBiz30day(startBiz30day);



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

@@ -671,9 +634,9 @@
                List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();



                for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

					


                    taoBaoGoodsBrief.setId(null);

					


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



                    map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());

@@ -783,11 +746,11 @@
                data.put("listGoods", gson.toJson(listmap));



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

				


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

                taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);

            }

			


        } catch (Exception e) {

            // TODO Auto-generated catch block

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

@@ -843,7 +806,6 @@
        }

    }



	
    /**

     * 

     * @param callback

@@ -863,13 +825,13 @@
     * @param out

     */

    @RequestMapping(value = "searchMaterial")

    public void searchMaterial(String callback, Integer pageIndex, Integer pageSize, 
            String subName, String superName, PrintWriter out) {

    public void searchMaterial(String callback, Integer pageIndex, Integer pageSize, String subName, String superName,

            PrintWriter out) {



        try {



            List<TaobaoMeterial> taobaoMeterials = null;

            if (!StringUtil.isNullOrEmpty(subName) && !StringUtil.isNullOrEmpty(superName) ) {

            if (!StringUtil.isNullOrEmpty(subName) && !StringUtil.isNullOrEmpty(superName)) {

                taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperName(subName, superName);

            } else if (!StringUtil.isNullOrEmpty(superName)) {

                taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperName(null, superName);

@@ -877,60 +839,55 @@
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请选择筛选类目"));

                return;

            }

			


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

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("类目信息不存在"));

                return;

            } 
			
            }



            TaobaoMeterial taobaoMeterial = taobaoMeterials.get(0);

            Integer materialId = taobaoMeterial.getMaterialId();

            if (materialId == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该类目物料ID不存在"));

                return;

            }

			
			


            // 页大小，默认20，1~100

            if (pageSize == null || pageSize < 1)

                pageSize = Constant.PAGE_SIZE;





            // 第几页，默认：１

            if (pageIndex == null || pageIndex < 1)

                pageIndex = 1;



            TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(materialId, pageIndex, pageSize);

			


            if (result == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂未获取到相关数据"));

                return;

            } 
			
            }



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

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

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无相关数据"));

                return;

            } 
			
			
            }



            // 插入商品集合

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

            for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {

                listAuctionId.add(goodsBrief.getAuctionId());

            }

						


            // 验证是否存在数据库

            List<QualityFactory> listHas = selectionGoodsService.listQueryByAuctionId(listAuctionId);

						
			


            List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();



            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                taoBaoGoodsBrief.setId(null);

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



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



                map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());

                map.put("title", taoBaoGoodsBrief.getTitle());

@@ -976,8 +933,7 @@
                        }

                    }

                }

				
				


                map.put("isExistence", existence);



                listmap.add(map);

@@ -994,69 +950,60 @@
            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();

        }

		
		


    }

	
	
	


    @RequestMapping(value = "getQiangGou")

    public void getQiangGou(String callback, Integer pageIndex, PrintWriter out) {



        try {



			
            int pageSize = 40;



            // 第几页，默认：１

            if (pageIndex == null || pageIndex < 1)

                pageIndex = 1;

			


            String startTime = "2018-09-17 09:00:00";

			
            String endTime ="2018-09-17 16:00:00";

			
            TaoBaoSearchResult result = TaoKeApiUtil.taoQiangGou(pageIndex, pageSize,startTime, endTime);

			
			
			


            String endTime = "2018-09-17 16:00:00";



            TaoBaoSearchResult result = TaoKeApiUtil.taoQiangGou(pageIndex, pageSize, startTime, endTime);



            if (result == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂未获取到相关数据"));

                return;

            } 
			
            }



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

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

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无相关数据"));

                return;

            } 
			
			
            }



            // 插入商品集合

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

            for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {

                listAuctionId.add(goodsBrief.getAuctionId());

            }

						


            // 验证是否存在数据库

            List<QualityFactory> listHas = selectionGoodsService.listQueryByAuctionId(listAuctionId);

						
			


            List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();



            for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {

                taoBaoGoodsBrief.setId(null);

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



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



                map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());

                map.put("title", taoBaoGoodsBrief.getTitle());

@@ -1102,8 +1049,7 @@
                        }

                    }

                }

				
				


                map.put("isExistence", existence);



                listmap.add(map);

@@ -1120,16 +1066,15 @@
            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/client/InviteGetMoneyController.java

@@ -2,7 +2,6 @@


import java.io.IOException;

import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.List;



import javax.annotation.Resource;

@@ -10,28 +9,18 @@
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.yeshi.fanli.entity.accept.AcceptData;

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

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

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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;

import com.yeshi.fanli.exception.UserRankingsException;

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

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

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

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.Utils;

import com.yeshi.fanli.util.account.UserUtil;

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -51,9 +40,6 @@
    private InviteGetMoneyService inviteGetMoneyService;



    @Resource

    private EveryDayTaskService everyDayTaskService;



    @Resource

    private SystemClientParamsService systemClientParamsService;



    @Resource

@@ -64,114 +50,9 @@


    @Resource

    private TaoBaoGoodsBriefService taoBaoGoodsBriefService;

	


    @Resource

    private UserRankingsService userRankingsService;



    /**

     * 
     * 方法说明: 返回到前端接口

     * 
     * @author mawurui createTime 2018年3月29日 下午2:37:38

     * @throws NotExistObjectException

     */

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

    public void everyDayTaskList(AcceptData acceptData, int pageIndex, PrintWriter out, String uid)

            throws NotExistObjectException {

        // 查询商品总数

        Integer totalCount = everyDayTaskService.getCount();

        int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount / Constant.PAGE_SIZE

                : totalCount / Constant.PAGE_SIZE + 1;

        PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount, totalPage);



        // 分页查询所有每日商品

        List<EveryDayTask> everyDayTaskList = everyDayTaskService.everyDayTaskListCache(pageIndex - 1, "");

        for (EveryDayTask everyDayTask : everyDayTaskList) {

            // 计算用户得到的佣金

            BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(everyDayTask.getEtGoods());

            String getMoney = money.toString();

            everyDayTask.setGetMoney("赚" + "¥" + getMoney);

            // 计算券后价

            BigDecimal quanhoujia = TaoBaoUtil.getAfterUseCouplePrice(everyDayTask.getEtGoods());

            if (Integer.parseInt(acceptData.getVersion()) >= 20)

                everyDayTask.setQuanhoujiaStr("¥" + quanhoujia.toString());

            else

                everyDayTask.setQuanhoujiaStr(quanhoujia.toString());

            everyDayTask.getEtGoods().setSalesCount(TaoBaoUtil.getSaleCount(everyDayTask.getEtGoods().getBiz30day()));

        }



        /*

        // 分页查询邀请提成榜

        List<InviteGetMoney> inviteGetMoneyList = inviteGetMoneyService.inviteGetMoneyList(pageIndex - 1, "");

		
        // 名字*处理

        for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) {



            String name = inviteGetMoney.getName();

            if (name != null) {

                if (name.length() > 2) {

                    name = Utils.getStarString(name, 1, name.length() - 1);

                } else {

                    name = name.substring(0, 1) + "**" + name.substring(name.length() - 1);

                }

            }

            inviteGetMoney.setName(name);

            inviteGetMoney.setRankIcon(UserUtil.getRankIcon(3));

        }

        */

		
		
        List<InviteGetMoney> inviteGetMoneyList = userRankingsService.getRank(0,5);

		
		
        JSONObject data = new JSONObject();

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

        data.put("everyDayTaskList", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(everyDayTaskList));

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

        if (uid.equals("0") || uid == null) {

            data.put("myTeam", "---");

            data.put("moneyToday", "---");

            data.put("moneyMonth", "---");

            data.put("moneyLastMonth", "---");

        } else {

            // 我的队员

            int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid);

            int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid);

            int myTeamCount = myFirstTeamCount + mySecondTeamCount;

            data.put("myTeam", myTeamCount);

            // 今日 本月预估收益

            BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid + "");

            if (moneyToday == null) {

                moneyToday = new BigDecimal(0);

            }

            BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid + "");

            if (moneyMonth == null) {

                moneyMonth = new BigDecimal(0);

            }



            BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + "");



            data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("moneyLastMonth", moneyLastMonth);

        }



        // 活动规则

        String key = "activityRules"; // key值

        com.yeshi.fanli.entity.system.System system = new System();

        system.setCreatetime(java.lang.System.currentTimeMillis());

        system.setPlatform(1);

        system.setId(4L);

        SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, key);

        // 转换换行符 给前端

        String valueN = values.getValue();

        String valueBr = valueN.replace("\n", "<br><br>");



        data.put("activityRules", valueBr);

        data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",

                Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));

        out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "成功"));

    }



    /**

     * 


 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java

@@ -1,33 +1,15 @@
package com.yeshi.fanli.controller.xcx;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.List;



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 com.yeshi.fanli.entity.admin.EveryDayTask;

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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;

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

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

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.Utils;

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

import org.yeshi.utils.JsonUtil;



/**

 * 

@@ -45,9 +27,6 @@
    private InviteGetMoneyService inviteGetMoneyService;



    @Resource

    private EveryDayTaskService everyDayTaskService;



    @Resource

    private SystemClientParamsService systemClientParamsService;



    @Resource

@@ -58,89 +37,5 @@


    @Resource

    private TaoBaoGoodsBriefService taoBaoGoodsBriefService;



    /**

     * 
     * 方法说明: 返回到前端接口

     * 
     * @author mawurui createTime 2018年3月29日 下午2:37:38

     * @throws NotExistObjectException

     */

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

    public void everyDayTaskList(int pageIndex, PrintWriter out, String uid) throws NotExistObjectException {

        // 查询商品总数

        Integer totalCount = everyDayTaskService.getCount();

        int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount / Constant.PAGE_SIZE

                : totalCount / Constant.PAGE_SIZE + 1;

        PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount, totalPage);



        // 分页查询所有每日商品

        List<EveryDayTask> everyDayTaskList = everyDayTaskService.everyDayTaskList(pageIndex - 1, "");

        for (EveryDayTask everyDayTask : everyDayTaskList) {

            // 计算用户得到的佣金

            BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(everyDayTask.getEtGoods());

            String getMoney = money.toString();

            everyDayTask.setGetMoney("赚" + "¥" + getMoney);

            // 计算券后价

            BigDecimal quanhoujia = TaoBaoUtil.getAfterUseCouplePrice(everyDayTask.getEtGoods());

            everyDayTask.setQuanhoujia(quanhoujia);

        }

        // 分页查询邀请提成榜

        List<InviteGetMoney> inviteGetMoneyList = inviteGetMoneyService.inviteGetMoneyList(pageIndex - 1, "");

        // 名字*处理

        for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) {

            String name = inviteGetMoney.getName();

            if (name != null) {

                if (name.length() > 2) {

                    name = Utils.getStarString(name, 1, name.length() - 1);

                } else {

                    name = name.substring(0, 1) + "**" + name.substring(name.length() - 1);

                }

            }

            inviteGetMoney.setName(name);

        }



        JSONObject data = new JSONObject();

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

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

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

        if (uid.equals("0") || uid == null) {

            data.put("myTeam", "---");

            data.put("moneyToday", "---");

            data.put("moneyMonth", "---");

        } else {

            // 我的队员

            int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid);

            int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid);

            int myTeamCount = myFirstTeamCount + mySecondTeamCount;

            data.put("myTeam", myTeamCount);

            // 今日 本月预估收益

            BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid);

            if (moneyToday == null) {

                moneyToday = new BigDecimal(0);

            }

            BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid);

            if (moneyMonth == null) {

                moneyMonth = new BigDecimal(0);

            }

            data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));

        }



        // 活动规则

        String key = "activityRules"; // key值

        com.yeshi.fanli.entity.system.System system = new System();

        system.setCreatetime(java.lang.System.currentTimeMillis());

        system.setPlatform(1);

        system.setId(4L);

        SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, key);

        // 转换换行符 给前端

        String valueN = values.getValue();

        String valueBr = valueN.replace("\n", "<br><br>");

        data.put("activityRules", valueBr);

        data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",

                Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));

        out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "成功"));

    }



}


 fanli/src/main/java/com/yeshi/fanli/dao/config/AddEveryDayTaskDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/config/EveryDayTaskDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/admin/EveryDayTask.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java

@@ -131,7 +131,7 @@


    @org.yeshi.utils.mybatis.Column(name = "rank")

    @Expose

    private Integer rank;// 0 普通  1 铜  2银 3 金

    private Integer rank;// 0 普通 1 铜 2银 3 金



    @org.yeshi.utils.mybatis.Column(name = "phone")

    @Column(name = "phone", length = 16)

@@ -151,7 +151,7 @@


    @Transient

    @Expose

    private String rankNamePicture;// 等级名称图片 
    private String rankNamePicture;// 等级名称图片



    public Integer getState() {

        return state;

@@ -195,7 +195,7 @@
        tbPic = "";

        portrait = "";

        myHongBao = BigDecimal.valueOf(0);

        state=0;

        state = 0;

    }



    public UserInfo(long id) {


 fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java

@@ -14,7 +14,6 @@
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.EveryDayTaskService;

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

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

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

@@ -38,9 +37,6 @@


    @Resource

    private TaoBaoGoodsBriefService taoBaoGoodsBriefService;



    @Resource

    private EveryDayTaskService everyDayTaskService;



    @Resource

    private RecommendSectionGoodsService recommendSectionGoodsService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/config/EveryDayTaskServiceImpl.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/TaoBaoGoodsBriefServiceImpl.java

@@ -15,11 +15,9 @@
import org.springframework.stereotype.Service;

import org.yeshi.utils.NumberUtil;



import com.yeshi.fanli.dao.config.AddEveryDayTaskDao;

import com.yeshi.fanli.dao.goods.RecommendSectionGoodsDao;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;

import com.yeshi.fanli.dao.taobao.TaoBaoGoodsBriefDao;

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

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.recommend.RecommendSection;

import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;

@@ -68,8 +66,6 @@
    @Resource

    private GoodsClassService goodsClassService;



    @Resource

    private AddEveryDayTaskDao addEveryDayTaskDao;



    @Resource

    private HongBaoManageService hongBaoManageService;

@@ -168,20 +164,6 @@
        recommendSectionGoodsService.addRecommendSectionGoods(recommendSection, taobao);

    }



    /**

     * 添加商品到每日任务

     */

    @Override

    public void addEveryDayTask(long tbid) throws NotExistObjectException, ExistObjectException {

        TaoBaoGoodsBrief taobao = taoBaoGoodsBriefDao.find(TaoBaoGoodsBrief.class, tbid);

        if (taobao == null) {

            throw new NotExistObjectException("不存在该淘宝商品");

        }

        EveryDayTask everyDaoTask = new EveryDayTask();

        everyDaoTask.setEtGoods(taobao);

        everyDaoTask.setEtCreateTime(new Date());

        addEveryDayTaskDao.create(everyDaoTask);

    }



    @Transactional

    public void addClassRecommendGoods(long gcid, long tbid) throws NotExistObjectException, ExistObjectException {


 fanli/src/main/java/com/yeshi/fanli/service/inter/config/EveryDayTaskService.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/TaoBaoGoodsBriefService.java

@@ -52,7 +52,6 @@


    public List<RecommendSectionGoods> listRecommendSectionGoods();



    public void addEveryDayTask(long tbid) throws NotExistObjectException, ExistObjectException;



    /**

     * 获取单个商品用户能够分得的红包