System 对象更名为 BusinessSystem

yujian

2019-03-14 4aadf484e193995c23ee1d5bb1971a497d2f9a0d

System 对象更名为   BusinessSystem

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

@@ -37,9 +37,9 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

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

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

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

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

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

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

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

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

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

@@ -51,11 +51,11 @@
import com.yeshi.fanli.exception.ShareGoodsException;

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

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

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

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

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

@@ -142,7 +142,7 @@
    private ThreeSaleRankService threeSaleRankService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private SystemConfigService systemConfigService;

@@ -302,7 +302,7 @@
    public String threeShareRep(@PathVariable String uid, String code, String state, String packages, String platform,

            String ios, HttpSession httpSession, HttpServletRequest request) {



        System system = systemService.getSystem(platform, packages);

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

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

        // 通过配置参数获取

        String down = DOWNURL2;

@@ -339,7 +339,7 @@
    public String threeShareRepNew(@PathVariable String uid, String code, String state, String packages,

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



        System system = systemService.getSystem(platform, packages);

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

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

        // 通过配置参数获取

        String down = DOWNURL2;

@@ -805,7 +805,7 @@
        JSONObject data = new JSONObject();



        String key = "activityRules";

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

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

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

        system.setPlatform(1);

        system.setId(4L);

@@ -850,7 +850,7 @@
    @RequestMapping("getinviteactivityrules")

    public void getInviteActivityRules(String callback, PrintWriter out) {

        String key = "activityRules"; // key值

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

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

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

        system.setPlatform(1);

        system.setId(4L);


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

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

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

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

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

@@ -24,8 +22,8 @@
import com.google.gson.reflect.TypeToken;

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

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

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

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

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

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

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

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

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

@@ -36,6 +34,8 @@
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/goodsclass")

@@ -60,7 +60,7 @@
    private LabelClassService labelClassService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @RequestMapping(value = "getGoodsClassList")

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

@@ -77,7 +77,7 @@
        pe.setParams(map);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

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

        List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();



        data.put("systemList", systemList);

        data.put("goodsClassList", goodsClassList);


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

@@ -13,10 +13,10 @@
import com.google.gson.reflect.TypeToken;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -31,7 +31,7 @@
    private HotSearchService hotSearchService;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private SuperHotSearchService superHotSearchService;

@@ -178,7 +178,7 @@
        }

        

        try {

            System system = systemService.getById(systemId);

            BusinessSystem system = businessSystemService.getById(systemId);

            List<SuperHotSearch> list = superHotSearchService.getHotSearchSystem(id, systemId);

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

                superHotSearchService.addSuper(id, system);


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

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

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

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

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;

import com.yeshi.fanli.exception.PushException;

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

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

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;

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

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

@@ -22,9 +23,6 @@
import com.yeshi.fanli.service.inter.user.SystemZnxService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.IOSPushFactory;



import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -51,9 +49,6 @@


    @Resource

    private AccountMessageService accountMessageService;



    @Resource

    private SystemService systemService;



    @Resource

    private PushService pushService;


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

@@ -18,7 +18,7 @@
import com.google.gson.reflect.TypeToken;

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

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

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

@@ -143,7 +143,7 @@
                HomeNavbar homeNavbar = new HomeNavbar();

                homeNavbar.setId(id);

                

                System system = new System();

                BusinessSystem system = new BusinessSystem();

                system.setId(systemId);

                

                SuperHomeNavbar superNavbar = new  SuperHomeNavbar();


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java

@@ -7,8 +7,6 @@


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

@@ -20,22 +18,20 @@
import com.google.gson.reflect.TypeToken;

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

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

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

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

import com.yeshi.fanli.service.AdminUserService;

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



@Controller

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

public class HomeNavbarAdminController {



    @Resource

    private SystemService systemService;

	
    @Resource

    private AdminUserService adminUserService;

    

@@ -150,7 +146,7 @@
                HomeNavbar homeNavbar = new HomeNavbar();

                homeNavbar.setId(id);

                

                System system = new System();

                BusinessSystem system = new BusinessSystem();

                system.setId(systemId);

                

                SuperHomeNavbar superNavbar = new  SuperHomeNavbar();


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java

@@ -7,8 +7,6 @@


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

@@ -22,17 +20,19 @@
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;

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

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

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

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

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



@Controller

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

@@ -57,7 +57,7 @@
    private AdminUserService adminUserService;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    

    

@@ -86,9 +86,9 @@
            specialCard.setUpdatetime(nowTime);

            specialCardService.insert(specialCard);

            

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

            List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();

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

                for (System system: systemList) {

                for (BusinessSystem system: systemList) {

                    SuperSpecialCard superCard = new  SuperSpecialCard();

                    superCard.setSpecialCard(specialCard);

                    superCard.setSystem(system);

@@ -224,7 +224,7 @@
                SpecialCard specialCard = new SpecialCard();

                specialCard.setId(cardId);

                

                System system = new System();

                BusinessSystem system = new BusinessSystem();

                system.setId(systemId);

                

                SuperSpecialCard superCard = new  SuperSpecialCard();


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

@@ -28,7 +28,6 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

@@ -75,9 +74,6 @@


    @Resource

    private TaoBaoClassService taoBaoClassService;



    @Resource

    private SystemService systemService;



    @Resource

    private QualityGoodsService qualityGoodsService;


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

@@ -4,7 +4,6 @@
import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;

import java.util.Map;



@@ -25,17 +24,15 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;

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

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

@@ -49,7 +46,6 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

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

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

@@ -91,7 +87,7 @@
    private HongBaoManageService manageService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private RedisManager redisManager;

@@ -126,7 +122,7 @@
    public void getGoodsClass(AcceptData acceptData, PrintWriter out) {



        try {

            System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

            if (system == null) {

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

                return;

@@ -280,7 +276,7 @@
    @RequestMapping(value = "getgoods", method = RequestMethod.POST)

    public void getGoods(AcceptData acceptData, int page, long scid, String filter, String order, String startprice,

            String endprice, String fastFilter, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -388,7 +384,7 @@
    @RequestMapping(value = "getsecondclassgoods", method = RequestMethod.POST)

    public void getSecondClassGoods(AcceptData acceptData, int page, long scid, String filter, String order,

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

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -562,7 +558,7 @@
    @RequestMapping("choiceGoods")

    public void choiceGoods(AcceptData acceptData, long gcid, int page, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -832,7 +828,7 @@
    @RequestMapping(value = { "getcategory" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })

    public void getcategory(AcceptData acceptData, PrintWriter out) {

        try {

            com.yeshi.fanli.entity.system.System system = this.systemService.getSystemCache(acceptData.getPlatform(),

            com.yeshi.fanli.entity.system.BusinessSystem system = this.businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

                    acceptData.getPackages());

            if (system == null) {

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


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

@@ -9,14 +9,14 @@
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.bus.homemodule.HomeNavbar;

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

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

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

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

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

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -25,7 +25,7 @@
public class HomeNavbarController<E> {



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private SuperHomeNavbarService superHomeNavbarService;

@@ -41,7 +41,7 @@
    @RequestMapping(value = "gethomenavbar", method = RequestMethod.POST)

    public void gethomenavbar(AcceptData acceptData, PrintWriter out) {

        

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;


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

@@ -20,7 +20,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSale;

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

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

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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;

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

@@ -144,7 +144,7 @@


        // 活动规则

        String key = "activityRules"; // key值

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

        BusinessSystem system = new BusinessSystem();

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

        system.setPlatform(1);

        system.setId(4L);

@@ -218,7 +218,7 @@


        // 邀请规则

        String key = "inviteRules"; // key值

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

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

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

        system.setPlatform(1);

        system.setId(4L);


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

@@ -19,11 +19,11 @@
import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.push.PushGoodsRecord;

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

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

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

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

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

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

@@ -44,7 +44,7 @@
public class PushController {



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private PushRecordService pushRecordService;

@@ -81,7 +81,7 @@


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

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

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;


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

@@ -46,14 +46,13 @@
import com.yeshi.fanli.entity.bus.user.Order;

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

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

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

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

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

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

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.ScanHistoryV2;

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

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

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

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

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

@@ -72,11 +71,11 @@
import com.yeshi.fanli.exception.user.UserCustomSettingsException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

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

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

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

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

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

@@ -129,7 +128,7 @@
    private RecommendBannerService recommendService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private SuperRecommendBannerService superRecommendBannerService;

@@ -246,7 +245,7 @@
            index = 0;

        }



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -324,7 +323,7 @@


    @RequestMapping(value = "getHonestList")

    public void getHonestList(AcceptData acceptData, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        List<Honest> honestList = null;

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

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

@@ -491,7 +490,7 @@
    @RequestMapping(value = "getrecommendspecial")

    public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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



        if (system == null) {

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

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

    public void guessLike(AcceptData acceptData, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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



        if (system == null) {

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

@@ -571,7 +570,7 @@
    @RequestMapping(value = "getrecommendbanner")

    public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        JSONObject json = new JSONObject();

        if (system == null) {

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

@@ -638,7 +637,7 @@
            out.print(JsonUtil.loadFalseResult(1, "请上传id"));

            return;

        }

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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



        if (system == null) {

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

@@ -796,7 +795,7 @@
            out.print(JsonUtil.loadFalseResult(1, "请上传id"));

            return;

        }

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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



        if (system == null) {

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

@@ -1163,7 +1162,7 @@
    // 根据商品获取推荐

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

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

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -1299,7 +1298,7 @@
            return;

        }

        page = page + 1;

        System sys = systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages());

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

        if (sys == null) {

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

            return;

@@ -1344,7 +1343,7 @@


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

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

        System sys = systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages());

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



        if (sys == null) {

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

@@ -1509,7 +1508,7 @@
    @RequestMapping(value = "getRecommendInfo")

    public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -1616,7 +1615,7 @@
    public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,

            PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -1754,7 +1753,7 @@
            return;

        }



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -2140,7 +2139,7 @@
    @RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)

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



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -2231,7 +2230,7 @@
    @RequestMapping(value = "getSpecialActivities")

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



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;


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

@@ -25,7 +25,7 @@
import com.yeshi.fanli.entity.bus.search.HistorySearch;

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

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

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

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

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

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

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

@@ -34,9 +34,9 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

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

@@ -57,7 +57,7 @@
public class SearchController {



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private ConfigService configService;

@@ -82,7 +82,7 @@


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

    public void getHotSearch(AcceptData acceptData, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -160,7 +160,7 @@
            String endprice, String fastFilter, PrintWriter out) {

        String bid = getHistorySearchBid(acceptData);

        historySearchService.addHistorySearch(kw, bid);

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -424,7 +424,7 @@


        historySearchService.addHistorySearch(kw, bid);



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;


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

@@ -1,10 +1,8 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.lang.reflect.InvocationTargetException;

import java.util.ArrayList;

import java.util.List;

import java.util.Properties;



import javax.annotation.Resource;



@@ -17,12 +15,12 @@
import com.google.gson.GsonBuilder;

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

import com.yeshi.fanli.entity.push.DeviceActive;

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.ThreadUtil;

@@ -34,7 +32,7 @@
public class SystemClientController {



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private SystemClientParamsService systemClientParamsService;

@@ -50,7 +48,7 @@


    @RequestMapping("getsystemclientparams")

    public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

            out.print("系统不存在");

            return;


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

@@ -21,7 +21,7 @@
import com.yeshi.fanli.entity.bus.user.SMSHistory;

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

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

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

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

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

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

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

@@ -30,9 +30,9 @@
import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

@@ -91,7 +91,7 @@
    private ConfigService configService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private ShamUserService shamUserService;

@@ -159,7 +159,7 @@
    public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,

            String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,

            HttpSession session, HttpServletRequest request, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -265,7 +265,7 @@
    @RequestMapping(value = "register")

    public void register(AcceptData acceptData, String tbOpenid, String tbNickName, String tbPortrait, String vcode,

            String phone, HttpServletRequest request, HttpSession session, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -325,7 +325,7 @@
     */

    @RequestMapping(value = "connect")

    public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -358,7 +358,7 @@
     */

    @RequestMapping(value = "getuid")

    public void getUid(AcceptData acceptData, String code, String tbOpenid, String phone, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -422,7 +422,7 @@
     */

    @RequestMapping(value = "bindPhone")

    public void bindPhone(AcceptData acceptData, Long uid, String vcode, String phone, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -485,7 +485,7 @@
     */

    @RequestMapping(value = "unBindPhone")

    public void unBindPhone(AcceptData acceptData, Long uid, String phone, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -521,7 +521,7 @@
    @RequestMapping(value = "bindTaoBao")

    public void bindTaoBao(AcceptData acceptData, Long uid, String tbOpenid, String tbNickName, String tbPortrait,

            String tbSession, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -583,7 +583,7 @@
     */

    @RequestMapping(value = "unBindTaoBao")

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

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -607,7 +607,7 @@
     */

    @RequestMapping(value = "changeWX")

    public void changeWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -654,7 +654,7 @@
     */

    @RequestMapping(value = "getphone")

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

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -674,7 +674,7 @@


    @RequestMapping(value = "verifyvcodeforbind")

    public void verifyVcodeForbind(AcceptData acceptData, Long uid, String vcode, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -719,7 +719,7 @@
     */

    @RequestMapping(value = "bindalipay")

    public void bindAlipay(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -774,7 +774,7 @@
    @RequestMapping(value = "bindalipaywithverify")

    public void bindAlipayWithVerify(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -864,7 +864,7 @@
    @RequestMapping(value = "bindalipaywithverifynew")

    public void bindAlipayWithVerifyNew(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;


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

@@ -59,7 +59,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.HongBaoOrder;

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

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

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

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

import com.yeshi.fanli.exception.BindingAccountException;

@@ -71,8 +71,8 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

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

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

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

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

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

@@ -143,7 +143,7 @@
    private ConfigService configService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private ShamUserService shamUserService;

@@ -267,7 +267,7 @@
            }

        }

        // 不是用ID的登陆的事就多了

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -453,7 +453,7 @@
            }

        }

        // 不是用ID的登陆的事就多了

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

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

            return;

@@ -1108,7 +1108,7 @@
            out.print(JsonUtil.loadFalseResult("用户不存在"));

            return;

        }

        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

            LogHelper.userInfo("提现时，不存在该系统");

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

@@ -1224,7 +1224,7 @@
            return;

        }



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

        if (system == null) {

            LogHelper.userInfo("提现时，不存在该系统");

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


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

@@ -5,8 +5,8 @@
import org.springframework.stereotype.Component;



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

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

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

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

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



@Component

public class H5ControllerUtil {

@@ -18,12 +18,12 @@
    static final String HB_EXCEPTION = "打开红包失败";



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    System getSystem(AcceptData acceptData) {

    BusinessSystem getSystem(AcceptData acceptData) {

        String platform = acceptData.getPlatform();

        String packages = acceptData.getPackages();

        System system = systemService.getSystem(platform, packages);

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

        return system;

    }

}


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

@@ -23,7 +23,7 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

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

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

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

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

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

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

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

@@ -33,9 +33,9 @@
import com.yeshi.fanli.exception.ShareGoodsException;

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

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

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

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

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

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

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

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

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

@@ -81,7 +81,7 @@
    private RedisManager redisManager;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private ConfigService configService;

@@ -118,7 +118,7 @@
    @RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)

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



        System system = systemService.getSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        JSONObject json = new JSONObject();

        if (system == null) {

            out.print(JsonUtil.loadFalseResult(1, H5ControllerUtil.NOSYSTEM));

@@ -171,7 +171,7 @@
    @RequestMapping(value = "getRecommendSection", method = RequestMethod.GET)

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



        System system = systemService.getSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult(1, H5ControllerUtil.NOSYSTEM));

            return;


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

@@ -5,8 +5,8 @@
import org.springframework.stereotype.Component;



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

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

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

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

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



@Component

public class WebControllerUtil {

@@ -17,11 +17,11 @@
    static final String HB_EXCEPTION ="打开红包失败";

    

    @Resource

    private SystemService systemService;

    System getSystem(AcceptData acceptData) {

    private BusinessSystemService businessSystemService;

    BusinessSystem getSystem(AcceptData acceptData) {

        String platform = acceptData.getPlatform();

        String packages = acceptData.getPackages();

        System system= systemService.getSystem(platform, packages);

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

        return system;

    }

}


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

@@ -23,15 +23,15 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;

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

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -73,7 +73,7 @@
    private RedisManager redisManager;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private CollectionGoodsV2Service collectionGoodsV2Service;

@@ -104,7 +104,7 @@
    @RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)

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



        System system = systemService.getSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        JSONObject json = new JSONObject();

        if (system == null) {

            out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));

@@ -157,7 +157,7 @@
    @RequestMapping(value = "getRecommendSection", method = RequestMethod.GET)

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



        System system = systemService.getSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());

        if (system == null) {

            out.print(JsonUtil.loadFalseResult(1, WebControllerUtil.NOSYSTEM));

            return;

@@ -252,10 +252,10 @@
            out.print(JsonUtil.loadFalseResult(1, "请上传id"));

            return;

        }

        System system = webControllerUtil.getSystem(acceptData);

        BusinessSystem system = webControllerUtil.getSystem(acceptData);

        // 淘特价

        if (system.getId() == 7) {

            system = systemService.getSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());

            system = businessSystemService.getBusinessSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());

        }



        if (system == null) {

@@ -329,7 +329,7 @@
                    // 添加浏览记录

                    ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);

                    sh.setDevice(acceptData.getDevice());

                    sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));

                    sh.setSystem(businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages()));

                    sh.setCreatetime(new Date());

                    if (uid != null && !uid.equals("")) {

                        sh.setUid(Long.parseLong(uid));


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

@@ -7,12 +7,10 @@


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.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

@@ -22,9 +20,8 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

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

import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;

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

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

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

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

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

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

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

@@ -32,14 +29,15 @@
import com.yeshi.fanli.service.inter.goods.SuperGoodsClassService;

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.Utils;

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

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

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/xcx/v1/XcxClass")

@@ -114,7 +112,7 @@
     */

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

    public void getGoodsClass(AcceptData acceptData, PrintWriter out) {

        System system = xcxMiniControllerUtil.getSystem(acceptData);

        BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

        if (system == null) {

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

            return;

@@ -226,7 +224,7 @@
    @RequestMapping(value = "getgoods", method = RequestMethod.POST)

    public void getGoods(AcceptData acceptData, int page, long scid, String filter, String order, String startprice,

            String endprice, String fastFilter, PrintWriter out) {

        System system = xcxMiniControllerUtil.getSystem(acceptData);

        BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

        if (system == null) {

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

            return;


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

@@ -1,10 +1,12 @@
package com.yeshi.fanli.controller.xcx;



import javax.annotation.Resource;



import org.springframework.stereotype.Component;



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

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

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

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

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



@Component

public class XcxMiniControllerUtil {

@@ -16,11 +18,12 @@
    static final String HB_EXCEPTION ="打开红包失败";

    

    @Resource

    private SystemService systemService;

    System getSystem(AcceptData acceptData) {

    private BusinessSystemService businessSystemService;

	
    BusinessSystem getSystem(AcceptData acceptData) {

        String platform = acceptData.getPlatform();

        String packages = acceptData.getPackages();

        System system= systemService.getSystem(platform, packages);

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

        return system;

    }




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

@@ -21,7 +21,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

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

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

@@ -51,9 +50,6 @@


    @Resource

    private RecommendBannerService recommendService;



    @Resource

    private SystemService systemService;



    @Resource

    private ShareGoodsService shareGoodsService;

@@ -141,7 +137,7 @@
            return;

        }

        /*

         * System system = xcxMiniControllerUtil.getSystem(acceptData); // 淘特价

         * BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData); // 淘特价

         * if (system.getId() == 7) { system =

         * systemService.getSystem("ANDROID", "com.yeshi.ec.rebate"); }

         * 


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

@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

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

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

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

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

import com.yeshi.fanli.exception.goods.CollectionGoodsException;

@@ -35,7 +35,6 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

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

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

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

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

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

@@ -60,11 +59,6 @@


    @Resource

    private OrderService orderService;







    @Resource

    private BindingAccountService bindingAccountService;



    @Resource

    private ExtractService extractService;

@@ -126,7 +120,7 @@
            }

        }

        // 不是用ID的登陆的事就多了

        System system = xcxMiniControllerUtil.getSystem(acceptData);

        BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);

        if (system == null) {

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

            return;


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

New file
@@ -0,0 +1,12 @@
package com.yeshi.fanli.dao.config;



import org.springframework.stereotype.Repository;



import com.yeshi.fanli.dao.BaseDao;

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





@Repository

public class BusinessSystemDao extends BaseDao<BusinessSystem> {



}


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

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/BusinessSystemMapper.java

New file
@@ -0,0 +1,8 @@
package com.yeshi.fanli.dao.mybatis;

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

public interface BusinessSystemMapper extends BaseMapper<BusinessSystem>{

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/SystemMapper.java

File was deleted

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

@@ -4,10 +4,11 @@
import java.util.List;



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

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



public class GoodsClassAdmin {

    private GoodsClass goodsClass;

    private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();



    public GoodsClassAdmin() {

        // TODO Auto-generated constructor stub

@@ -24,7 +25,7 @@
    public void setGoodsClass(GoodsClass goodsClass) {

        this.goodsClass = goodsClass;

    }

    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }




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

@@ -4,14 +4,14 @@
import java.util.List;



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

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

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



public class HongBaoActivityAdmin {

	
    private HongBaoActivity hongBaoActivity;

    private final List<System> systemList=new ArrayList<System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();

    

    public HongBaoActivityAdmin() {

        // TODO Auto-generated constructor stub

    }

    

    public HongBaoActivityAdmin(HongBaoActivity hongBaoActivity) {

@@ -25,7 +25,7 @@
    public void setHongBaoActivity(HongBaoActivity hongBaoActivity) {

        this.hongBaoActivity = hongBaoActivity;

    }

    public List<System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }

    


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

@@ -4,11 +4,12 @@
import java.util.List;



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

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

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



public class HotSearchAdmin {

	
    private HotSearch hotSearch;

    private final List<System> systemList=new ArrayList<System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();

    

    public HotSearchAdmin() {

    }

@@ -26,7 +27,7 @@
        this.hotSearch = hotSearch;

    }



    public List<System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }

    


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

@@ -4,11 +4,12 @@
import java.util.List;



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

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



public class RecommendBannerAdmin {

    

    private RecommendBanner recommendBanner;

    private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();

    

    public RecommendBannerAdmin() {

        // TODO Auto-generated constructor stub

@@ -23,7 +24,7 @@
    public void setRecommendBanner(RecommendBanner recommendBanner) {

        this.recommendBanner = recommendBanner;

    }

    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }

    


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

@@ -4,11 +4,12 @@
import java.util.List;



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

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



public class RecommendBannerV2Admin {



    private RecommendBannerV2 recommendBanner;

    private final List<com.yeshi.fanli.entity.system.System> systemList = new ArrayList<com.yeshi.fanli.entity.system.System>();

    private final List<BusinessSystem> systemList = new ArrayList<BusinessSystem>();



    public RecommendBannerV2Admin() {

    }

@@ -26,7 +27,7 @@
        this.recommendBanner = recommendBanner;

    }



    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }




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

@@ -4,11 +4,12 @@
import java.util.List;



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

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



public class RecommendSectionAdmin {

    

    private RecommendSection recommendSection;

    private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();

    

    public RecommendSectionAdmin() {

        // TODO Auto-generated constructor stub

@@ -25,7 +26,7 @@
    public void setRecommendSection(RecommendSection recommendSection) {

        this.recommendSection = recommendSection;

    }

    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }

    


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

@@ -3,13 +3,13 @@
import java.util.ArrayList;

import java.util.List;



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

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

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



public class RecommendSpecialAdmin {

    

    private RecommendSpecial recommendSpecial;

    private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();

    

    public RecommendSpecialAdmin() {

    }

@@ -27,7 +27,7 @@
        this.recommendSpecial = recommendSpecial;

    }



    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }

    


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

@@ -3,16 +3,16 @@
import java.util.ArrayList;

import java.util.List;



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

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



public class SystemClientParamsAdmin {

    

    private SystemClientParams systemClientParams;

    private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();

    private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();

    

    

    public SystemClientParamsAdmin() {

        // TODO Auto-generated constructor stub

    }

    

    public SystemClientParamsAdmin(SystemClientParams systemClientParams) {

@@ -26,7 +26,7 @@
    public void setSystemClientParams(SystemClientParams systemClientParams) {

        this.systemClientParams = systemClientParams;

    }

    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }

    @Override


 fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java

@@ -11,6 +11,8 @@
import javax.persistence.Table;

import javax.persistence.Transient;



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



/**

 * 商品分类

 * 

@@ -66,7 +68,7 @@
    private int countlabel = 0; 

    

    @Transient // 系统关联列表

    private  List<com.yeshi.fanli.entity.system.System> systemList;

    private  List<BusinessSystem> systemList;





    public GoodsClass(String name, String picture, int orderby, long createtime) {

@@ -165,11 +167,11 @@
        this.countClick = countClick;

    }



    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }



    public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {

    public void setSystemList(List<BusinessSystem> systemList) {

        this.systemList = systemList;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/HomeNavbar.java

@@ -13,6 +13,8 @@
import javax.persistence.Table;

import javax.persistence.Transient;



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



/**

 * 导航管理

 * 

@@ -90,7 +92,7 @@
    private Date updatetime;

    

    @Transient // 系统关联列表

    private List<com.yeshi.fanli.entity.system.System> systemList;

    private List<BusinessSystem> systemList;



    public Long getId() {

        return id;

@@ -164,11 +166,11 @@
        this.updatetime = updatetime;

    }



    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }



    public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {

    public void setSystemList(List<BusinessSystem> systemList) {

        this.systemList = systemList;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java

@@ -13,6 +13,8 @@
import javax.persistence.Table;

import javax.persistence.Transient;



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



/**

 * 专题标识管理

 * 

@@ -63,7 +65,7 @@
    private Long totalSpecial;

    

    @Transient // 系统关联列表

    private List<com.yeshi.fanli.entity.system.System> systemList;

    private List<BusinessSystem> systemList;

    

    



@@ -107,11 +109,11 @@
        this.updatetime = updatetime;

    }



    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }



    public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {

    public void setSystemList(List<BusinessSystem> systemList) {

        this.systemList = systemList;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SuperHomeNavbar.java

@@ -12,7 +12,7 @@
import javax.persistence.ManyToOne;

import javax.persistence.Table;



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

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



/**

 * 导航对应启用系统

@@ -44,7 +44,7 @@
    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "sp_system_id")

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

    private System system;

    private BusinessSystem system;



    public Long getId() {

        return id;

@@ -62,11 +62,11 @@
        this.homeNavbar = homeNavbar;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

    


 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SuperSpecial.java

@@ -12,7 +12,7 @@
import javax.persistence.ManyToOne;

import javax.persistence.Table;



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

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



/**

 * 专题对应启用系统

@@ -44,7 +44,7 @@
    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "sup_system_id")

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

    private System system;

    private BusinessSystem system;



    public Long getId() {

        return id;

@@ -62,11 +62,11 @@
        this.special = special;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

    


 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SuperSpecialCard.java

@@ -12,7 +12,7 @@
import javax.persistence.ManyToOne;

import javax.persistence.Table;



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

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



/**

 * 专题对应启用系统

@@ -44,7 +44,7 @@
    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "sp_system_id")

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

    private System system;

    private BusinessSystem system;

    



    public Long getId() {

@@ -63,11 +63,11 @@
        this.specialCard = specialCard;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/bus/search/HotSearch.java

@@ -11,6 +11,8 @@
import javax.persistence.Table;

import javax.persistence.Transient;



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



@Entity

@Table(name = "yeshi_ec_hot_search")

public class HotSearch implements Serializable {

@@ -28,7 +30,7 @@


    @Transient

    // 系统关联列表

    private List<com.yeshi.fanli.entity.system.System> systemList;

    private List<BusinessSystem> systemList;



    public HotSearch() {

    }

@@ -76,11 +78,11 @@
        this.name = name;

    }



    public List<com.yeshi.fanli.entity.system.System> getSystemList() {

    public List<BusinessSystem> getSystemList() {

        return systemList;

    }



    public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {

    public void setSystemList(List<BusinessSystem> systemList) {

        this.systemList = systemList;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java

@@ -13,7 +13,7 @@
import javax.persistence.Table;



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

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

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



@Entity

@Table(name = "yeshi_ec_super_goodsclass")

@@ -33,13 +33,12 @@
    private GoodsClass goodsClass;

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "system_id")

    private System system;

    private BusinessSystem system;



    public SuperGoodsClass() {

        // TODO Auto-generated constructor stub

    }

    

    public SuperGoodsClass(GoodsClass goodsClass, System system) {

    public SuperGoodsClass(GoodsClass goodsClass, BusinessSystem system) {

        super();

        this.goodsClass = goodsClass;

        this.system = system;

@@ -61,11 +60,11 @@
        this.goodsClass = goodsClass;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/hongbao/SuperHongBaoActivity.java

@@ -11,7 +11,7 @@
import javax.persistence.Table;



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

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

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



@Entity

@Table(name="yeshi_ec_super_hongbao_activity")

@@ -26,7 +26,7 @@
    

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "system_id")

    private System system;

    private BusinessSystem system;



    public long getId() {

        return id;

@@ -44,11 +44,11 @@
        this.hongBaoActivity = hongBaoActivity;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendBanner.java

@@ -13,7 +13,7 @@
import javax.persistence.Table;



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

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

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



@Entity

@Table(name = "yeshi_ec_super_recommendbanner")

@@ -32,12 +32,12 @@
    private RecommendBanner recommendBanner;

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "system_id")

    private System system;

    private BusinessSystem system;



    public SuperRecommendBanner() {

    }

    

    public SuperRecommendBanner(RecommendBanner recommendBanner, System system) {

    public SuperRecommendBanner(RecommendBanner recommendBanner, BusinessSystem system) {

        super();

        this.recommendBanner = recommendBanner;

        this.system = system;

@@ -59,11 +59,11 @@
        this.recommendBanner = recommendBanner;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendBannerV2.java

@@ -12,9 +12,8 @@
import javax.persistence.ManyToOne;

import javax.persistence.Table;



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

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

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

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



@Entity

@Table(name = "yeshi_ec_super_recommendbanner_v2")

@@ -35,12 +34,12 @@
    

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "system_id")

    private System system;

    private BusinessSystem system;



    public SuperRecommendBannerV2() {

    }

    

    public SuperRecommendBannerV2(RecommendBannerV2 recommendBanner, System system) {

    public SuperRecommendBannerV2(RecommendBannerV2 recommendBanner, BusinessSystem system) {

        super();

        this.recommendBanner = recommendBanner;

        this.system = system;

@@ -62,11 +61,11 @@
        this.recommendBanner = recommendBanner;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendSection.java

@@ -13,7 +13,7 @@
import javax.persistence.Table;



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

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

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



@Entity

@Table(name = "yeshi_ec_super_recommendsection")

@@ -34,14 +34,12 @@
    private RecommendSection recommendSection;

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "system_id")

    private System system;

    private BusinessSystem system;

    

    public SuperRecommendSection() {

        // TODO Auto-generated constructor stub

    }

    

    public SuperRecommendSection(RecommendSection recommendSection,

            System system) {

    public SuperRecommendSection(RecommendSection recommendSection, BusinessSystem system) {

        super();

        this.recommendSection = recommendSection;

        this.system = system;

@@ -63,11 +61,11 @@
        this.recommendSection = recommendSection;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/recommend/SuperRecommendSpecial.java

@@ -13,7 +13,7 @@
import javax.persistence.Table;



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

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

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



@Entity

@Table(name = "yeshi_ec_super_recommendspecial")

@@ -32,14 +32,13 @@
    private RecommendSpecial recommendSpecial;

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "system_id")

    private System system;

    private BusinessSystem system;



    public SuperRecommendSpecial() {

        // TODO Auto-generated constructor stub

    }

    

    public SuperRecommendSpecial(RecommendSpecial recommendSpecial,

            System system) {

    public SuperRecommendSpecial(RecommendSpecial recommendSpecial, BusinessSystem system) {

        super();

        this.recommendSpecial = recommendSpecial;

        this.system = system;

@@ -61,11 +60,11 @@
        this.recommendSpecial = recommendSpecial;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/bus/su/search/SuperHotSearch.java

@@ -13,7 +13,7 @@
import javax.persistence.Table;



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

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

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





@Entity

@@ -32,7 +32,7 @@
    

    @JoinColumn(name="system_id")

    @ManyToOne(fetch = FetchType.EAGER)

    private System system;

    private BusinessSystem system;

    

    @JoinColumn(name="hotSearch_id")

    @ManyToOne(fetch = FetchType.EAGER)

@@ -41,7 +41,7 @@
    public SuperHotSearch() {

    }

    

    public SuperHotSearch(System system, HotSearch hotSearch) {

    public SuperHotSearch(BusinessSystem system, HotSearch hotSearch) {

        super();

        this.system = system;

        this.hotSearch = hotSearch;

@@ -55,11 +55,11 @@
        this.id = id;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




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

@@ -14,7 +14,7 @@
import javax.persistence.Table;



import com.google.gson.annotations.Expose;

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

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



/**

 * 提现记录

@@ -66,7 +66,7 @@


    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "sid")

    private System system;

    private BusinessSystem system;



    @Column(name = "adminId")

    @Expose

@@ -92,11 +92,11 @@
        this.adminId = adminId;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




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

@@ -11,7 +11,7 @@
import javax.persistence.Transient;



import com.google.gson.annotations.Expose;

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

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



/**

 * 用户信息

@@ -128,7 +128,7 @@
    @org.yeshi.utils.mybatis.Column(name = "sid")

    @ManyToOne

    @JoinColumn(name = "sid")

    private System system;

    private BusinessSystem system;



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

    @Expose

@@ -358,11 +358,11 @@
        this.lastLoginIp = lastLoginIp;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/system/BusinessSystem.java

File was renamed from fanli/src/main/java/com/yeshi/fanli/entity/system/System.java
@@ -11,7 +11,7 @@
import javax.persistence.Transient;



/**

 * 系统

 *    业务系统

 * 

 * @author Administrator

 *

@@ -19,7 +19,7 @@
@Entity

@Table(name = "yeshi_ec_system")

@org.yeshi.utils.mybatis.Table("yeshi_ec_system")

public class System implements Serializable{

public class BusinessSystem implements Serializable{

    private static final long serialVersionUID = 2735576110255715412L;

    

    @Id

@@ -56,13 +56,25 @@
    

    

    

    public System() {

    public BusinessSystem() {

    }



    public System(Long id) {

    public BusinessSystem(Long id) {

        super();

        this.id = id;

    }

	
    public BusinessSystem(String name, int platform, long createtime, String beizhu,

            String packageName) {

        super();

        this.name = name;

        this.platform = platform;

        this.createtime = createtime;

        this.beizhu = beizhu;

        this.packageName = packageName;

    }

	
	
    

    public Long getId() {

        return id;

@@ -88,15 +100,6 @@
        this.createtime = createtime;

    }



    public System(String name, int platform, long createtime, String beizhu,

            String packageName) {

        super();

        this.name = name;

        this.platform = platform;

        this.createtime = createtime;

        this.beizhu = beizhu;

        this.packageName = packageName;

    }

    public String getAppid() {

        return appid;

    }


 fanli/src/main/java/com/yeshi/fanli/entity/system/SystemClientParams.java

@@ -36,7 +36,7 @@
    private long id;

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "systemid")

    private System system;

    private BusinessSystem system;

    @Column(name = "`key`", length = 50)

    @Expose

    private String key;

@@ -53,7 +53,7 @@
        // TODO Auto-generated constructor stub

    }

    

    public SystemClientParams(System system, String key, String value) {

    public SystemClientParams(BusinessSystem system, String key, String value) {

        super();

        this.system = system;

        this.key = key;

@@ -68,11 +68,11 @@
        this.id = id;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/system/SystemConfig.java

@@ -3,7 +3,6 @@
import java.util.HashSet;

import java.util.Set;



import javax.persistence.CascadeType;

import javax.persistence.Column;

import javax.persistence.Entity;

import javax.persistence.FetchType;

@@ -14,10 +13,6 @@
import javax.persistence.JoinTable;

import javax.persistence.ManyToMany;

import javax.persistence.Table;



import org.hibernate.annotations.Cascade;

import org.hibernate.annotations.Fetch;

import org.hibernate.annotations.FetchMode;



/**

 * 系统配置参数

@@ -34,7 +29,7 @@
    private long id;

    @ManyToMany(fetch = FetchType.EAGER)

    @JoinTable(name="yeshi_ec_system_systemconfig",joinColumns=@JoinColumn(name="scid",referencedColumnName="id"),inverseJoinColumns=@JoinColumn(name="sid",referencedColumnName="id"))

    private Set<System> systems=new HashSet<System>();

    private Set<BusinessSystem> systems=new HashSet<BusinessSystem>();

    @Column(name = "`key`", length = 50)

    private String key;

    @Column(name = "`value`", length = 1024)

@@ -60,11 +55,11 @@
        this.id = id;

    }



    public Set<System> getSystems() {

    public Set<BusinessSystem> getSystems() {

        return systems;

    }



    public void setSystems(Set<System> systems) {

    public void setSystems(Set<BusinessSystem> systems) {

        this.systems = systems;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/taobao/ScanHistory.java

@@ -17,7 +17,7 @@
import org.hibernate.annotations.Type;



import com.google.gson.annotations.Expose;

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

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



/**

 * 浏览足记

@@ -39,7 +39,7 @@


    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "systemid")

    private System system;

    private BusinessSystem system;



    private Long uid; //用户id

    

@@ -59,11 +59,11 @@
        this.device = device;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoLink.java

@@ -10,7 +10,7 @@
import javax.persistence.Table;

import javax.persistence.Transient;



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

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



@Entity

@Table(name="yeshi_ec_taobao_link")

@@ -28,7 +28,7 @@
    

    @ManyToOne

    @JoinColumn(name="sid")

    private System system;

    private BusinessSystem system;

    

    /**

     * 淘宝token

@@ -76,11 +76,11 @@
        this.taoToken = taoToken;

    }



    public System getSystem() {

    public BusinessSystem getSystem() {

        return system;

    }



    public void setSystem(System system) {

    public void setSystem(BusinessSystem system) {

        this.system = system;

    }




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

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.yeshi.fanli.dao.mybatis.SystemMapper">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.System">
<mapper namespace="com.yeshi.fanli.dao.mybatis.BusinessSystemMapper">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.system.BusinessSystem">
        <id column="id" property="id" jdbcType="BIGINT" />
        <result column="name" property="name" jdbcType="VARCHAR" />
        <result column="platform" property="platform" jdbcType="INTEGER" />
@@ -21,12 +21,12 @@
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_system where id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.system.System"
    <insert id="insert" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"
        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_system
        (id,name,platform,createtime,beizhu,package_name,appid) values
        (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{platform,jdbcType=INTEGER},#{createtime,jdbcType=BIGINT},#{beizhu,jdbcType=VARCHAR},#{packageName,jdbcType=VARCHAR},#{appid,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.System"
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_system
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -49,7 +49,7 @@
            <if test="appid != null">#{appid,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.System">update
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.system.BusinessSystem">update
        yeshi_ec_system set name = #{name,jdbcType=VARCHAR},platform =
        #{platform,jdbcType=INTEGER},createtime =
        #{createtime,jdbcType=BIGINT},beizhu =
@@ -57,7 +57,7 @@
        #{packageName,jdbcType=VARCHAR},appid = #{appid,jdbcType=VARCHAR}
        where id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.System">
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.system.BusinessSystem">
        update yeshi_ec_system
        <set>
            <if test="name != null">name=#{name,jdbcType=VARCHAR},</if>

 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SuperSpecialCardMapper.xml

@@ -11,7 +11,7 @@
    </association>
    
    <association property="system" column="sp_system_id" 
        javaType="com.yeshi.fanli.entity.system.System">
        javaType="com.yeshi.fanli.entity.system.BusinessSystem">
            <id column="sp_system_id" property="id" jdbcType="BIGINT" />
    </association>
  

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

New file
@@ -0,0 +1,67 @@
package com.yeshi.fanli.service.impl.config;



import java.io.Serializable;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;



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

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

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



@Service

public class BusinessSystemServiceImpl implements BusinessSystemService {



    @Resource

    private BusinessSystemDao businessSystemDao;



    private static final String ANDROID = "ANDROID";

    private static final String IOS = "IOS";

    private static final String WEB = "WEB";



    private static final Map<String, Integer> map = new HashMap<String, Integer>();



    static {

        map.put(ANDROID, 1);

        map.put(IOS, 2);

        map.put(WEB, 3);

    }

	
    @Override

    @Cacheable(value = "sysCache", key = "'getBusinessSystem-'+#platform+'-'+#packages")

    public BusinessSystem getBusinessSystem(String platform, String packages) {

        if (platform == null || packages == null) {

            return null;

        }

        platform = platform.toUpperCase();

        Integer platformInt = map.get(platform);



        List<BusinessSystem> list = businessSystemDao.list("from BusinessSystem where platform=? and packageName=?",

                new Serializable[] { platformInt, packages });

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

            return null;

        }

        return list.get(0);

    }



    @Override

    public BusinessSystem getBusinessSystemCache(String platform, String packages) {

        return getBusinessSystem(platform, packages);

    }

	
    @Override

    public BusinessSystem getById(long id) {

        return businessSystemDao.find(BusinessSystem.class, id);

    }



    @Override

    public List<BusinessSystem> getBusinessSystems() {

        return businessSystemDao.list("from BusinessSystem");

    }

	
}


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

@@ -19,10 +19,10 @@
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;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.Utils;

@@ -34,7 +34,7 @@
    private HotSearchDao hotSearchDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private SuperHotSearchService superHotSearchService;

@@ -44,7 +44,7 @@
            String packages, String key) {

        final int strat = index * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

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

        List<HotSearch> hotSearchList=null;

        List<SuperHotSearch> superHotSearchList=null;

        Map<Long,HotSearchAdmin> hotSearchAdminMap=new HashMap<Long, HotSearchAdmin>();

@@ -78,14 +78,14 @@
                hsIdList.add(rs.getId());

            }

            superHotSearchList = superHotSearchService.getSuperHotSearchsByHotSearchs(hsIdList);

            Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId=null;

            List<System> systemList=null;

            List<BusinessSystem> systemList=null;

            for (SuperHotSearch srs : superHotSearchList) {

                rsId = srs.getHotSearch().getId();

                systemList = superMap.get(rsId);

                if(systemList==null){

                    systemList=new ArrayList<System>();

                    systemList=new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId,systemList);

@@ -97,7 +97,7 @@
                if(rsa==null){

                    rsa=new HotSearchAdmin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if(list != null){

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -180,7 +180,7 @@


    public int getCount(String platform, String packages, final String key) {

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

        final System system = systemService.getSystem(platform, packages);

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

        return (Integer) hotSearchDao.excute(new HibernateCallback<Integer>() {

            

            public Integer doInHibernate(Session session)

@@ -258,7 +258,7 @@
        }

        

        

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

        List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();

        

        List<SuperHotSearch> listSuper = superHotSearchService.listSuperHotSearch(listId);

        

@@ -269,11 +269,11 @@
        } else {

            for (HotSearch hotSearch : listObj) {

                Long id = hotSearch.getId();

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

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

            

                // 是否有关联系统选项

                for (System dsystem : systemList) {

                    System newsystem = new System();

                for (BusinessSystem dsystem : systemList) {

                    BusinessSystem newsystem = new BusinessSystem();



                    try {

                        PropertyUtils.copyProperties(newsystem, dsystem);

@@ -287,7 +287,7 @@


                        for (SuperHotSearch superHotSearch : listSuper) {

                            HotSearch search = superHotSearch.getHotSearch();

                            System system = superHotSearch.getSystem();

                            BusinessSystem system = superHotSearch.getSystem();



                            // 当前专题 、当前系统

                            if (search != null && system != null && id == search.getId() && superSystemId == system.getId()) {


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

@@ -17,10 +17,9 @@
import com.yeshi.fanli.dao.goods.SuperHotSearchDao;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.StringUtil;



@Service

public class SuperHotSearchSerivceImpl implements SuperHotSearchService {

@@ -29,7 +28,7 @@
    private SuperHotSearchDao superHotSearchDao;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    public List<SuperHotSearch> getSuperHotSearchBySystemId(long id) {



@@ -89,7 +88,7 @@
        return (Integer) superHotSearchDao.excute(new HibernateCallback<Integer>() {



            public Integer doInHibernate(Session session) throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Transaction transaction = session.beginTransaction();

                Query query = session

                        .createQuery("delete SuperHotSearch shs " + " where shs.hotSearch.id=? and shs.system.id=?");

@@ -103,7 +102,7 @@
    }



    public void addSuperHotSearch(long hsid, String platform, String packageName) {

        System system = systemService.getSystem(platform, packageName);

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

        SuperHotSearch superHotSearch = new SuperHotSearch();

        HotSearch hotSearch = new HotSearch();

        hotSearch.setId(hsid);

@@ -154,7 +153,7 @@
    }

    

    @Override

    public void addSuper(Long id, System system) {

    public void addSuper(Long id, BusinessSystem system) {

        SuperHotSearch superHotSearch = new SuperHotSearch();

        HotSearch hotSearch = new HotSearch();

        hotSearch.setId(id);


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

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


import javax.annotation.Resource;



import org.apache.commons.beanutils.PropertyUtils;

import org.hibernate.HibernateException;

import org.hibernate.Query;

import org.hibernate.Session;

@@ -21,12 +20,12 @@
import com.yeshi.fanli.dao.config.SystemSecondProblemDao;

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



@@ -43,7 +42,7 @@
    private SystemHelpListDao systemHelpListDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private SystemSecondProblemDao systemSecondProblemDao;

@@ -61,7 +60,7 @@
                new Serializable[] { id });

    }



    public List<SystemClientParamsAdmin> getAdminList(System system, String key) {

    public List<SystemClientParamsAdmin> getAdminList(BusinessSystem system, String key) {

        List<SystemClientParams> list;

        List<SystemClientParamsAdmin> adminList = new ArrayList<SystemClientParamsAdmin>();

        if (system == null) {

@@ -105,9 +104,9 @@
    }



    @Transactional

    public void addSystemClientParamsList(SystemClientParams scp, List<System> list) throws Exception {

    public void addSystemClientParamsList(SystemClientParams scp, List<BusinessSystem> list) throws Exception {

        SystemClientParams nscp = null;

        for (System system : list) {

        for (BusinessSystem system : list) {

            nscp = new SystemClientParams();

            nscp.setKey(scp.getKey());

            nscp.setName(scp.getName());

@@ -119,7 +118,7 @@
    }



    @Transactional

    public void deleteSystemClientParams(final SystemClientParams scp, final System system) {

    public void deleteSystemClientParams(final SystemClientParams scp, final BusinessSystem system) {

        systemClientParamsDao.excute(new HibernateCallback() {

            public Object doInHibernate(Session session) throws HibernateException {

                Query query = session.createQuery(

@@ -133,7 +132,7 @@
        });

    }



    public void addSystemClientParams(SystemClientParams scp, System system) {

    public void addSystemClientParams(SystemClientParams scp, BusinessSystem system) {

        scp.setSystem(system);

        systemClientParamsDao.create(scp);

    }

@@ -163,7 +162,7 @@
                List<SystemClientParams> list = query.list();

                SystemClientParamsAdmin scpa = new SystemClientParamsAdmin(scp);

                for (SystemClientParams fscp : list) {

                    System system = fscp.getSystem();

                    BusinessSystem system = fscp.getSystem();

                    if (scpa.getSystemList().contains(system)) {

                        continue;

                    }

@@ -193,7 +192,7 @@
    }



    @Override

    public SystemClientParams getSystemClientParamsBySystemAndKey(System system, String key) {

    public SystemClientParams getSystemClientParamsBySystemAndKey(BusinessSystem system, String key) {

        List<SystemClientParams> list = systemClientParamsDao.list(

                "from SystemClientParams scp where scp.system.id=? and scp.key=?",

                new Serializable[] { system.getId(), key });

@@ -371,7 +370,7 @@
        

        SystemClientParams nscp = null;

        for (Long systemId : listId) {

            System system  = new System(systemId);

            BusinessSystem system  = new BusinessSystem(systemId);

            nscp = new SystemClientParams();

            nscp.setKey(scp.getKey());

            nscp.setName(scp.getName());


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

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



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

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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.Utils;



@@ -26,9 +26,9 @@
    private SystemConfigDao systemConfigDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    public int getCount(System system,String key) {

    public int getCount(BusinessSystem system,String key) {

        Long lcount;

        if(system!=null){

            lcount = systemConfigDao.getCount("select count(sc.id) from SystemConfig sc left join sc.systems s  where s.id=? and sc.name like ?",new Serializable[]{system.getId(),"%"+key+"%"});

@@ -38,7 +38,7 @@
        return lcount.intValue();

    }



    public List<SystemConfig> getSystemConfigList(int index,System system, String key) {

    public List<SystemConfig> getSystemConfigList(int index,BusinessSystem system, String key) {

        

        int start =index * Constant.PAGE_SIZE;

        List<SystemConfig> list;

@@ -65,12 +65,12 @@
    }



    public void addSystemConfig(SystemConfig sc) {

        Set<System> systems = sc.getSystems();

        Set<System> newSystems=new HashSet<System>();

        for (System system : systems) {

        Set<BusinessSystem> systems = sc.getSystems();

        Set<BusinessSystem> newSystems=new HashSet<BusinessSystem>();

        for (BusinessSystem system : systems) {

            String platform = Utils.getMap().get(String.valueOf(system.getPlatform()));

            String packages = system.getPackageName();

            System find = systemService.getSystem(platform, packages);

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

            if(find != null){

                newSystems.add(find);

            }

@@ -80,7 +80,7 @@
        systemConfigDao.save(sc);

    }



    public void deleteSystem(long id, System system) throws NotExistObjectException {

    public void deleteSystem(long id, BusinessSystem system) throws NotExistObjectException {

        SystemConfig find = systemConfigDao.find(SystemConfig.class, id);

        if(find==null){

            throw new NotExistObjectException("不存在该子系统");

@@ -90,7 +90,7 @@
        systemConfigDao.update(find);

    }



    public void addSystem(long id, System system) throws NotExistObjectException {

    public void addSystem(long id, BusinessSystem system) throws NotExistObjectException {

        SystemConfig find = systemConfigDao.find(SystemConfig.class, id);

        if(find==null){

            throw new NotExistObjectException("不存在该子系统");

@@ -111,12 +111,12 @@
            throw new NotExistObjectException("不存在该对象");

        }

        sc.setUpdatetime(java.lang.System.currentTimeMillis());

        Set<System> newSystems=new HashSet<System>();

        Set<System> systems = sc.getSystems();

        for (System system : systems) {

        Set<BusinessSystem> newSystems=new HashSet<BusinessSystem>();

        Set<BusinessSystem> systems = sc.getSystems();

        for (BusinessSystem system : systems) {

            String platform = Utils.getMap().get(String.valueOf(system.getPlatform()));

            String packages = system.getPackageName();

            System sfind = systemService.getSystem(platform, packages);

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

            if(sfind != null){

                newSystems.add(sfind);

            }

@@ -137,7 +137,7 @@
        return list.get(0).getValue();

    }

    @Cacheable(value={"childSystemCache"}, key="#p0+#system.id")

    public String get(String key, System system) {

    public String get(String key, BusinessSystem system) {

        if(system==null || system.getId()==0){

            return "";

        }


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

File was deleted

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

@@ -37,8 +37,8 @@
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

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

import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;

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

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

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

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

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

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

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

@@ -55,7 +55,7 @@
    private GoodsClassDao goodsClassDao;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @Resource

    private SuperGoodsClassService superGoodsClassService;

@@ -114,7 +114,7 @@
    public List<GoodsClassAdmin> getGoodsClassAdmins(int index, String platform, String packages, String key) {

        final int strat = index * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

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

        List<GoodsClass> GoodsClassList = null;

        List<SuperGoodsClass> superGoodsClassList = null;

        Map<Long, GoodsClassAdmin> goodsClassAdminMap = new HashMap<Long, GoodsClassAdmin>();

@@ -135,14 +135,14 @@
                gcIdList.add(rs.getId());

            }

            superGoodsClassList = superGoodsClassService.getSuperGoodsClasss(gcIdList);

            Map<Long, List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long, List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId = null;

            List<System> systemList = null;

            List<BusinessSystem> systemList = null;

            for (SuperGoodsClass srs : superGoodsClassList) {

                rsId = srs.getGoodsClass().getId();

                systemList = superMap.get(rsId);

                if (systemList == null) {

                    systemList = new ArrayList<System>();

                    systemList = new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId, systemList);

@@ -154,7 +154,7 @@
                if (rsa == null) {

                    rsa = new GoodsClassAdmin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if (list != null) {

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -191,7 +191,7 @@


    public int getCount(String platform, String packages, final String key) {

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

        final System system = systemService.getSystem(platform, packages);

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

        return (Integer) goodsClassDao.excute(new HibernateCallback<Integer>() {



            public Integer doInHibernate(Session session) throws HibernateException {

@@ -352,10 +352,10 @@
    @Override

    public List<GoodsClass> queryAll(String platform, String packages) throws Exception{



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

        List<BusinessSystem> defultList = businessSystemService.getBusinessSystems();



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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

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

        

        List<GoodsClass> goodsClassList = new ArrayList<GoodsClass>();

        List<SuperGoodsClass> superGoodsClassList = null;

@@ -422,17 +422,17 @@
                    long rsId = srs.getGoodsClass().getId();

                    

                    if (gclass.getId() == rsId) {

                        System gsystem = srs.getSystem();

                        BusinessSystem gsystem = srs.getSystem();

                        gList.add(gsystem.getId());

                    }

                }

            }

            

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

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

            // 是否有关联系统选项

            for (System dsystem : defultList) {

            for (BusinessSystem dsystem : defultList) {

                

                System newsystem = new System();

                BusinessSystem newsystem = new BusinessSystem();

                

                PropertyUtils.copyProperties(newsystem, dsystem);

                newsystem.setCheck(0);


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

@@ -20,8 +20,8 @@
import com.yeshi.fanli.entity.admin.RecommendBannerAdmin;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -37,7 +37,7 @@
    private SuperRecommendBannerService superRecommendBannerService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    public List<RecommendBanner> getRecommendBanners() {



@@ -55,7 +55,7 @@
            String platform, String packages, String key) {

        final int strat = pageIndex * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

        com.yeshi.fanli.entity.system.BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);

        List<RecommendBanner> recommendBannerList=null;

        List<SuperRecommendBanner> superRecommendBannerList=null;

        Map<Long,RecommendBannerAdmin> recommendBannerAdminMap=new HashMap<Long, RecommendBannerAdmin>();

@@ -89,14 +89,14 @@
                rsIdList.add(rs.getId());

            }

            superRecommendBannerList = superRecommendBannerService.getSuperRecommendBannersByBanners(rsIdList);

            Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId=null;

            List<System> systemList=null;

            List<BusinessSystem> systemList=null;

            for (SuperRecommendBanner srs : superRecommendBannerList) {

                rsId = srs.getRecommendBanner().getId();

                systemList = superMap.get(rsId);

                if(systemList==null){

                    systemList=new ArrayList<System>();

                    systemList=new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId,systemList);

@@ -108,7 +108,7 @@
                if(rsa==null){

                    rsa=new RecommendBannerAdmin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if(list != null){

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -189,7 +189,7 @@
    

    public int getCount(String platform, String packages, final String key) {

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

        final System system = systemService.getSystem(platform, packages);

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

        return (Integer) recommendBannerDao.excute(new HibernateCallback<Integer>() {

            

            public Integer doInHibernate(Session session)


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

@@ -20,9 +20,8 @@
import com.yeshi.fanli.entity.admin.RecommendBannerV2Admin;

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

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

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

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -38,7 +37,7 @@
    private SuperRecommendBannerV2Service superRecommendBannerV2Service;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    



@@ -55,7 +54,7 @@
    public List<RecommendBannerV2Admin> getRecommendBanners(int pageIndex, String platform, String packages, String key) {

        final int strat = pageIndex * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

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

    

        List<RecommendBannerV2> recommendBannerList = null;

        List<SuperRecommendBannerV2> superRecommendBannerList = null;

@@ -95,15 +94,15 @@
            }

            

            superRecommendBannerList = superRecommendBannerV2Service.getSuperRecommendBannersByBanners(rsIdList);

            Map<Long, List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long, List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId = null;

            List<System> systemList = null;

            List<BusinessSystem> systemList = null;

            

            for (SuperRecommendBannerV2 srs : superRecommendBannerList) {

                rsId = srs.getRecommendBanner().getId();

                systemList = superMap.get(rsId);

                if (systemList == null) {

                    systemList = new ArrayList<System>();

                    systemList = new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId, systemList);

@@ -116,7 +115,7 @@
                if (rsa == null) {

                    rsa = new RecommendBannerV2Admin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if (list != null) {

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -203,7 +202,7 @@


    public int getCount(String platform, String packages, final String key) {

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

        final System system = systemService.getSystem(platform, packages);

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

        return (Integer) recommendBannerV2Dao.excute(new HibernateCallback<Integer>() {



            public Integer doInHibernate(Session session) throws HibernateException {


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

@@ -21,8 +21,8 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendSection;

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

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

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

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

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

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

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

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

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

@@ -46,7 +46,7 @@
    private RecommendSectionGoodsService recommendSectionGoodsService;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private RecommendSectionDetailService recommendSectionDetailService;

@@ -76,7 +76,7 @@
            String platform,String packages, String key) {

        final int strat = index * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

        com.yeshi.fanli.entity.system.BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);

        List<RecommendSection> recommendSectionList=null;

        List<SuperRecommendSection> superRecommendSectionList=null;

        Map<Long,RecommendSectionAdmin> recommendSectionAdminMap=new HashMap<Long, RecommendSectionAdmin>();

@@ -110,14 +110,14 @@
                rsIdList.add(rs.getId());

            }

            superRecommendSectionList = superRecommendSectionService.getSuperRecommendSectionsBySections(rsIdList);

            Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId=null;

            List<System> systemList=null;

            List<BusinessSystem> systemList=null;

            for (SuperRecommendSection srs : superRecommendSectionList) {

                rsId = srs.getRecommendSection().getId();

                systemList = superMap.get(rsId);

                if(systemList==null){

                    systemList=new ArrayList<System>();

                    systemList=new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId,systemList);

@@ -129,7 +129,7 @@
                if(rsa==null){

                    rsa=new RecommendSectionAdmin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if(list != null){

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -215,7 +215,7 @@
    public int getCount(String platform, String packages, final String key) {



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

        final System system = systemService.getSystem(platform, packages);

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

        return (Integer) recommendSectionDao.excute(new HibernateCallback<Integer>() {

            

            public Integer doInHibernate(Session session)


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

@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.admin.RecommendSpecialAdmin;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -36,7 +36,7 @@
    private SuperRecommendSpecialService superRecommendSpecialService;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    public void addRecommendSpecial(RecommendSpecial special) {

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

@@ -54,7 +54,7 @@
            String platform, String packages, String key) {

        final int strat = index * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

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

        List<RecommendSpecial> recommendSpecialList=null;

        List<SuperRecommendSpecial> superRecommendSpecialList=null;

        Map<Long,RecommendSpecialAdmin> recommendSpecialAdminMap=new HashMap<Long, RecommendSpecialAdmin>();

@@ -93,14 +93,14 @@
                }

                superRecommendSpecialList = superRecommendSpecialService.getSuperRecommendSpecials(rsIdList);

            }

            Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId=null;

            List<System> systemList=null;

            List<BusinessSystem> systemList=null;

            for (SuperRecommendSpecial srs : superRecommendSpecialList) {

                rsId = srs.getRecommendSpecial().getId();

                systemList = superMap.get(rsId);

                if(systemList==null){

                    systemList=new ArrayList<System>();

                    systemList=new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId,systemList);

@@ -112,7 +112,7 @@
                if(rsa==null){

                    rsa=new RecommendSpecialAdmin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if(list != null){

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -197,7 +197,7 @@
    public int getCount(String platform, String packages, final String key) {



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

        final System system = systemService.getSystem(platform, packages);

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

        return (Integer) recommendSpecialDao.excute(new HibernateCallback<Integer>() {

            

            public Integer doInHibernate(Session session)


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

@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperGoodsClassDao;

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

import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;

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

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

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

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

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



@Service

@@ -28,7 +28,9 @@
    private SuperGoodsClassDao superGoodsClassDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

	
	
    @Cacheable(value="classCache", key="'getSuperGoodsClassBySystemId-'+#id")

    public List<SuperGoodsClass> getSuperGoodsClassBySystemId(long id) {

        

@@ -76,7 +78,7 @@


            public Integer doInHibernate(Session session)

                    throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Transaction transaction = session.beginTransaction();

                Query query = session.createQuery("delete SuperGoodsClass shs "

                            + " where shs.goodsClass.id=? and shs.system.id=?");

@@ -91,7 +93,7 @@


    public void addSuperGoodsClass(long gcid, String platform,

            String packageName) {

        System system = systemService.getSystem(platform,packageName);

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

        SuperGoodsClass superGoodsClass = new SuperGoodsClass();

        GoodsClass goodsClass = new GoodsClass();

        goodsClass.setId(gcid);


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

@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperRecommendBannerDao;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;



@@ -30,10 +30,12 @@
    private SuperRecommendBannerDao superRecommendBannerDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

	
	
    @Cacheable(value={"bannerCache"}, key="#root.methodName+#system.id")

    public List<SuperRecommendBanner> getSuperRecommendBannersBySystem(

            final System system) {

            final BusinessSystem system) {

        List<SuperRecommendBanner> list = superRecommendBannerDao.list(

                "from SuperRecommendBanner srb where srb.system.id=? order by srb.recommendBanner.orderby",

                new Serializable[] { system.getId() });

@@ -78,7 +80,7 @@


            public Integer doInHibernate(Session session)

                    throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Transaction transaction = session.beginTransaction();

                Query query = session.createQuery("delete SuperRecommendBanner srb "

                            + " where srb.recommendBanner.id=? and srb.system.id=?");

@@ -92,7 +94,7 @@
    }



    public void addSuperRecommendBanner(long rbid, String platform,String packageName) {

        System system = systemService.getSystem(platform,packageName);

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

        SuperRecommendBanner superRecommendBanner = new SuperRecommendBanner();

        RecommendBanner recommendBanner = new RecommendBanner();

        recommendBanner.setId(rbid);


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

@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperRecommendBannerV2Dao;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;



@@ -29,11 +29,11 @@
    private SuperRecommendBannerV2Dao superRecommendBannerV2Dao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Cacheable(value = "bannerCache", key = "'getSuperRecommendBannerV2sBySystem-'+#system.id")

    public List<SuperRecommendBannerV2> getSuperRecommendBannerV2sBySystem(

            final System system) {

            final BusinessSystem system) {

        List<SuperRecommendBannerV2> list = superRecommendBannerV2Dao.list(

                "from SuperRecommendBannerV2 srb where srb.system.id=? order by srb.recommendBanner.orderby",

                new Serializable[] { system.getId() });

@@ -78,7 +78,7 @@


            public Integer doInHibernate(Session session)

                    throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Transaction transaction = session.beginTransaction();

                Query query = session.createQuery("delete SuperRecommendBannerV2 srb "

                            + " where srb.recommendBanner.id=? and srb.system.id=?");

@@ -92,7 +92,7 @@
    }



    public void addSuperRecommendBanner(long rbid, String platform,String packageName) {

        System system = systemService.getSystem(platform,packageName);

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

        SuperRecommendBannerV2 superRecommendBanner = new SuperRecommendBannerV2();

        RecommendBannerV2 recommendBanner = new RecommendBannerV2();

        recommendBanner.setId(rbid);


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

@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperRecommendSectionDao;

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

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

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

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

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

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

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



@Service

@@ -28,7 +28,7 @@
    private SuperRecommendSectionDao superRecommendSectionDao;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    public List<SuperRecommendSection> getSuperRecommendSectionBySystemId(long id, int start, int count) {

        return superRecommendSectionDao.list("from SuperRecommendSection srs where srs.system.id=?", start, count,

@@ -74,7 +74,7 @@
        return (Integer) superRecommendSectionDao.excute(new HibernateCallback<Integer>() {



            public Integer doInHibernate(Session session) throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Query query = session.createQuery(

                        "delete SuperRecommendSection srb " + " where srb.recommendSection.id=? and srb.system.id=?");

                query.setLong(0, rsid);

@@ -87,7 +87,7 @@


    public void addSuperRecommendSection(long rbid, String platform, String packageName) {



        System system = systemService.getSystem(platform, packageName);

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

        SuperRecommendSection superRecommendSection = new SuperRecommendSection();

        RecommendSection recommendSection = new RecommendSection();

        recommendSection.setId(rbid);


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

@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperRecommendSpecialDao;

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

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

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

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

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

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

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



@Service

@@ -29,7 +29,8 @@
    private SuperRecommendSpecialDao superRecommendSpecialDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

	
    @Cacheable(value="specialCache",key="#root.methodName+#id")

    public List<SuperRecommendSpecial> getSuperRecommendSpecialBySystemId(

            long id) {

@@ -67,7 +68,7 @@


            public Integer doInHibernate(Session session)

                    throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Transaction transaction = session.beginTransaction();

                Query query = session.createQuery("delete SuperRecommendSpecial srb "

                            + " where srb.recommendSpecial.id=? and srb.system.id=?");

@@ -83,7 +84,7 @@
    public void addSuperRecommendSpecial(long rsid, String platform,

            String packageName) {



        System system = systemService.getSystem(platform,packageName);

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

        SuperRecommendSpecial superRecommendSpecial = new SuperRecommendSpecial();

        RecommendSpecial recommendSpecial = new RecommendSpecial();

        recommendSpecial.setId(rsid);


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

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



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

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

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

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

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



@@ -21,7 +21,7 @@
    @Resource

    private TaoBaoLinkDao dao;

    

    public TaoBaoLink find(long auctionId, System system) {

    public TaoBaoLink find(long auctionId, BusinessSystem system) {

        List<TaoBaoLink> list = dao.list("from TaoBaoLink tbk where tbk.auctionId = ? and tbk.system.id = ? ", new Serializable[]{auctionId,system.getId()});

        if(list.size() >0){

            return list.get(0);


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java

@@ -18,8 +18,8 @@
import com.yeshi.fanli.dao.mybatis.homemodule.SuperHomeNavbarMapper;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.StringUtil;



@@ -28,7 +28,7 @@
public class HomeNavbarServiceImpl implements HomeNavbarService {

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    @Resource

    private HomeNavbarMapper homeNavbarMapper;

    @Resource

@@ -101,7 +101,7 @@
            return null;

        }

        

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

        List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();

        

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

        for (HomeNavbar homeNavbar: listObj) {

@@ -119,12 +119,12 @@
            for (HomeNavbar homeNavbar: listObj) {

                

                Long id = homeNavbar.getId();

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

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

                

                // 是否有关联系统选项

                for (System dsystem : systemList) {

                for (BusinessSystem dsystem : systemList) {

                    

                    System newsystem = new System();

                    BusinessSystem newsystem = new BusinessSystem();

                    try {

                        PropertyUtils.copyProperties(newsystem, dsystem);

                    } catch (Exception e) {

@@ -136,7 +136,7 @@
                        

                        for (SuperHomeNavbar superHomeNavbar : listSuper) {

                            HomeNavbar navbar = superHomeNavbar.getHomeNavbar();

                            System system = superHomeNavbar.getSystem();

                            BusinessSystem system = superHomeNavbar.getSystem();

                            

                            // 当前专题 、当前系统

                            if (navbar != null && system != null && id == navbar.getId() 


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java

@@ -8,18 +8,15 @@


import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Service;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.dao.mybatis.homemodule.SpecialCardMapper;

import com.yeshi.fanli.dao.mybatis.homemodule.SuperSpecialCardMapper;

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.StringUtil;





@Service

@@ -29,7 +26,7 @@
    private SpecialCardMapper specialCardMapper;



    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private SpecialService specialService;

@@ -86,7 +83,7 @@
            return null;

        }

        

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

        List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();

        

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

        for (SpecialCard specialCard: listObj) {

@@ -106,11 +103,11 @@
                

                Long id = specialCard.getId();

                

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

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

                // 是否有关联系统选项

                for (System dsystem : systemList) {

                for (BusinessSystem dsystem : systemList) {

                    

                    System newsystem = new System();

                    BusinessSystem newsystem = new BusinessSystem();

                    

                    try {

                        PropertyUtils.copyProperties(newsystem, dsystem);

@@ -126,7 +123,7 @@
                        

                        for (SuperSpecialCard superSpecialCard : listSuper) {

                            SpecialCard special = superSpecialCard.getSpecialCard();

                            System system = superSpecialCard.getSystem();

                            BusinessSystem system = superSpecialCard.getSystem();

                            

                            // 当前专题 、当前系统

                            if (special != null && system != null && id == special.getId() 


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SuperSpecialCardServiceImpl.java

@@ -8,15 +8,12 @@


import com.yeshi.fanli.dao.mybatis.homemodule.SuperSpecialCardMapper;

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

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

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





@Service

public class SuperSpecialCardServiceImpl implements SuperSpecialCardService {

    

    @Resource

    private SystemService systemService;

    

    @Resource

    private SuperSpecialCardMapper superSpecialCardMapper;


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoActivityServiceImpl.java

@@ -19,9 +19,9 @@
import com.yeshi.fanli.entity.admin.HongBaoActivityAdmin;

import com.yeshi.fanli.entity.bus.su.hongbao.SuperHongBaoActivity;

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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoActivityService;

import com.yeshi.fanli.service.inter.hongbao.SuperHongBaoActivityService;

import com.yeshi.fanli.util.Constant;

@@ -34,7 +34,7 @@
    private HongBaoActivityDao hongBaoActivityDao;

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    @Resource

    private SuperHongBaoActivityService superHongBaoActivityService;

@@ -49,7 +49,7 @@
            String platform, String packages, String key) {

        final int strat = index * Constant.PAGE_SIZE;

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

        com.yeshi.fanli.entity.system.System system = systemService.getSystem(platform, packages);

        com.yeshi.fanli.entity.system.BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);

        List<HongBaoActivity> hongBaoActivityList=null;

        List<SuperHongBaoActivity> superHongBaoActivityList=null;

        Map<Long,HongBaoActivityAdmin> HongBaoActivityAdminMap=new HashMap<Long, HongBaoActivityAdmin>();

@@ -83,14 +83,14 @@
                hbaIdList.add(rs.getId());

            }

            superHongBaoActivityList = superHongBaoActivityService.getSuperHongBaoActivitysByHongBaoActivitys(hbaIdList);

            Map<Long,List<System>> superMap = new HashMap<Long, List<System>>();

            Map<Long,List<BusinessSystem>> superMap = new HashMap<Long, List<BusinessSystem>>();

            Long rsId=null;

            List<System> systemList=null;

            List<BusinessSystem> systemList=null;

            for (SuperHongBaoActivity srs : superHongBaoActivityList) {

                rsId = srs.getHongBaoActivity().getId();

                systemList = superMap.get(rsId);

                if(systemList==null){

                    systemList=new ArrayList<System>();

                    systemList=new ArrayList<BusinessSystem>();

                }

                systemList.add(srs.getSystem());

                superMap.put(rsId,systemList);

@@ -102,7 +102,7 @@
                if(rsa==null){

                    rsa=new HongBaoActivityAdmin();

                }

                List<System> list = superMap.get(id);

                List<BusinessSystem> list = superMap.get(id);

                if(list != null){

                    rsa.getSystemList().addAll(superMap.get(id));

                }

@@ -141,7 +141,7 @@


    public int getCount(String platform, String packages, String key) {

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

        final System system = systemService.getSystem(platform, packages);

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

        Long lcount;

        if(system==null){

            lcount = hongBaoActivityDao.getCount("select count(*) from HongBaoActivity h where h.name like ?",new Serializable[] {"%"+key+"%"});


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/SuperHongBaoActivityServiceImpl.java

@@ -16,8 +16,8 @@
import com.yeshi.fanli.dao.goods.SuperHongBaoActivityDao;

import com.yeshi.fanli.entity.bus.su.hongbao.SuperHongBaoActivity;

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

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

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

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

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

import com.yeshi.fanli.service.inter.hongbao.SuperHongBaoActivityService;



@Service

@@ -28,7 +28,7 @@
    private SuperHongBaoActivityDao superHongBaoActivityDao; 

    

    @Resource

    private SystemService systemService;

    private BusinessSystemService businessSystemService;

    

    public List<SuperHongBaoActivity> getSuperHongBaoActivitysByHongBaoActivitys(

            List<Long> hbaIdList) {

@@ -68,7 +68,7 @@


            public Integer doInHibernate(Session session)

                    throws HibernateException {

                System system = systemService.getSystem(platform, packageName);

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

                Transaction transaction = session.beginTransaction();

                Query query = session.createQuery("delete SuperHongBaoActivity shs "

                            + " where shs.hongBaoActivity.id=? and shs.system.id=?");

@@ -83,7 +83,7 @@


    public void addSuperHongBaoActivity(long id, String platform,

            String packageName) {

        System system = systemService.getSystem(platform,packageName);

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

        SuperHongBaoActivity superHongBaoActivity = new SuperHongBaoActivity();

        HongBaoActivity hongBaoActivity = new HongBaoActivity();

        hongBaoActivity.setId(id);


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

@@ -25,7 +25,6 @@
import com.yeshi.fanli.dao.mybatis.ExtractRecordMapper;

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

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

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

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

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

import com.yeshi.fanli.dao.user.AccountMessageDao;

@@ -109,9 +108,6 @@


    @Resource

    private ExtractRecordMapper extractRecordMapper;



    @Resource

    private SystemMapper systemMapper;



    @Resource

    private HongBaoV2Mapper hongBaoV2Mapper;


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

@@ -22,7 +22,7 @@


import com.yeshi.fanli.dao.user.ScanHistoryDao;

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

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

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

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

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

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

@@ -228,7 +228,7 @@


    }



    public void deleteScanHistory(final String device, final System sys, final long uid) {

    public void deleteScanHistory(final String device, final BusinessSystem sys, final long uid) {

        scanHistoryDao.excute(new HibernateCallback() {



            public Object doInHibernate(Session session) throws HibernateException {

@@ -251,7 +251,7 @@
        });

    }



    public void deleteScanHistory(final String device, final System sys, final long auctionId, final long uid) {

    public void deleteScanHistory(final String device, final BusinessSystem sys, final long auctionId, final long uid) {

        scanHistoryDao.excute(new HibernateCallback() {



            public Object doInHibernate(Session session) throws HibernateException {


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

@@ -38,7 +38,7 @@
import com.yeshi.fanli.entity.bus.user.InviteUser;

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

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

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

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

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.log.LogHelper;

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

@@ -448,7 +448,7 @@
            find.setLoginType(Constant.WEIXIN);

            find.setRank(0);

            find.setWxOpenId(weiXinUser.getOpenid());

            System system = new System(Constant.FANLI);

            BusinessSystem system = new BusinessSystem(Constant.FANLI);

            system.setPlatform(1);

            find.setSystem(system);

        }


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

New file
@@ -0,0 +1,23 @@
package com.yeshi.fanli.service.inter.config;



import java.util.List;



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



public interface BusinessSystemService {

	
    public BusinessSystem getBusinessSystem(String platform, String packages);



	
    public BusinessSystem getBusinessSystemCache(String platform, String packages);



    public List<BusinessSystem> getBusinessSystems();



    /**

     * 通过id查询

     * @param id

     * @return

     */

    public BusinessSystem getById(long id);



}


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

@@ -3,7 +3,7 @@
import java.util.List;



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

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

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



public interface SuperHotSearchService {



@@ -47,6 +47,6 @@
     * @param id

     * @param system

     */

    public void addSuper(Long id, System system);

    public void addSuper(Long id, BusinessSystem system);



}


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

@@ -3,9 +3,9 @@
import java.util.List;



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

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

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

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

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

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



public interface SystemClientParamsService {

@@ -14,13 +14,13 @@
    

    public List<SystemClientParams> getSystemClientParamsBySystemId(long id,int version);



    public List<SystemClientParamsAdmin> getAdminList(System system, String key);

    public List<SystemClientParamsAdmin> getAdminList(BusinessSystem system, String key);



    public void addSystemClientParamsList(SystemClientParams scp, List<System> list) throws Exception;

    public void addSystemClientParamsList(SystemClientParams scp, List<BusinessSystem> list) throws Exception;



    public void deleteSystemClientParams(SystemClientParams scp, System system);

    public void deleteSystemClientParams(SystemClientParams scp, BusinessSystem system);



    public void addSystemClientParams(SystemClientParams scp, System system);

    public void addSystemClientParams(SystemClientParams scp, BusinessSystem system);



    public void deleteSystemClientParams(SystemClientParams scp);



@@ -35,7 +35,7 @@
     * @param key

     * @return

     */

    public SystemClientParams getSystemClientParamsBySystemAndKey(System system, String key);

    public SystemClientParams getSystemClientParamsBySystemAndKey(BusinessSystem system, String key);



    public Integer getCount(int type);




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

@@ -4,21 +4,21 @@


import org.springframework.cache.annotation.CacheEvict;



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

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

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

import com.yeshi.fanli.exception.NotExistObjectException;



public interface SystemConfigService {

    

    public int getCount(System system,String key);

    public int getCount(BusinessSystem system,String key);



    public List<SystemConfig> getSystemConfigList(int index,System system, String key);

    public List<SystemConfig> getSystemConfigList(int index,BusinessSystem system, String key);

    

    public void addSystemConfig(SystemConfig sc);

    @CacheEvict(value="childSystemCache",allEntries=true)

    public void deleteSystem(long id, System system) throws NotExistObjectException;

    public void deleteSystem(long id, BusinessSystem system) throws NotExistObjectException;

    @CacheEvict(value="childSystemCache",allEntries=true)

    public void addSystem(long id, System system)  throws NotExistObjectException;

    public void addSystem(long id, BusinessSystem system)  throws NotExistObjectException;



    public SystemConfig getSystemConfig(long id);



@@ -29,6 +29,6 @@
    

    public String get(String key) throws NotExistObjectException;

    

    public String get(String key, com.yeshi.fanli.entity.system.System system);

    public String get(String key, BusinessSystem system);



}


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

File was deleted

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

@@ -3,13 +3,13 @@
import java.util.List;



import org.springframework.cache.annotation.CacheEvict;

import org.springframework.cache.annotation.Cacheable;



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

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



public interface SuperRecommendBannerService {

    

    public List<SuperRecommendBanner> getSuperRecommendBannersBySystem(com.yeshi.fanli.entity.system.System system);

    public List<SuperRecommendBanner> getSuperRecommendBannersBySystem(BusinessSystem system);



    public List<SuperRecommendBanner> getSuperRecommendBannersByBanners(

            List<Long> rbIdList);


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

@@ -3,10 +3,11 @@
import java.util.List;



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

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



public interface SuperRecommendBannerV2Service {

    

    public List<SuperRecommendBannerV2> getSuperRecommendBannerV2sBySystem(com.yeshi.fanli.entity.system.System system);

    public List<SuperRecommendBannerV2> getSuperRecommendBannerV2sBySystem(BusinessSystem system);



    public List<SuperRecommendBannerV2> getSuperRecommendBannersByBanners(

            List<Long> rbIdList);


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

@@ -1,10 +1,11 @@
package com.yeshi.fanli.service.inter.goods;



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

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



public interface TaoBaoLinkService {



    TaoBaoLink find(long auctionId, com.yeshi.fanli.entity.system.System system);

    TaoBaoLink find(long auctionId, BusinessSystem system);



    void save(TaoBaoLink tbk);




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

@@ -5,7 +5,7 @@
import java.util.Map;



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

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

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

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

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



@@ -34,9 +34,9 @@
    public List<TaoBaoGoodsBriefExtra> getHotTaoBaoGoodsBriefExtras(String key,

            int pageIndex);



    public void deleteScanHistory(String device, System sys, long uid);

    public void deleteScanHistory(String device, BusinessSystem sys, long uid);



    public void deleteScanHistory(String device, System sys, long auctionId,

    public void deleteScanHistory(String device, BusinessSystem sys, long auctionId,

            long uid);



}


 fanli/src/main/java/com/yeshi/fanli/util/push/HWPushUtil.java

@@ -15,14 +15,14 @@
import org.apache.commons.io.IOUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import org.yeshi.utils.annotation.MapUtil;



import com.alibaba.fastjson.JSONObject;

import com.yeshi.fanli.entity.config.push.HWPushConfig;

import com.yeshi.fanli.exception.PushException;

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

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

import com.yeshi.fanli.util.Constant;

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

import org.yeshi.utils.annotation.MapUtil;



import net.sf.json.JSONArray;



@@ -32,12 +32,12 @@
    private static HWPushUtil hWPushUtil;



    @Autowired

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @PostConstruct

    public void init() {

        hWPushUtil = this;

        hWPushUtil.systemService = this.systemService;

        hWPushUtil.businessSystemService = this.businessSystemService;

    }



    private static String appSecret = "";


 fanli/src/main/java/com/yeshi/fanli/util/push/IOSPushUtil.java

@@ -8,19 +8,18 @@


import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import org.yeshi.utils.HttpUtil;



import com.google.gson.Gson;

import com.yeshi.fanli.controller.admin.PushController;

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

import com.yeshi.fanli.entity.xinge.MessageInfo;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.PushLogHelper;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.IOSPushFactory;

import org.yeshi.utils.HttpUtil;



import javapns.devices.Device;

import javapns.devices.implementations.basic.BasicDevice;

@@ -36,12 +35,12 @@
    private static IOSPushUtil iosPushUtil;



    @Autowired

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @PostConstruct

    public void init() {

        iosPushUtil = this;

        iosPushUtil.systemService = this.systemService;

        iosPushUtil.businessSystemService = this.businessSystemService;

    }



    /**


 fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java

@@ -8,15 +8,13 @@
import com.yeshi.fanli.entity.xinge.MessageInfo;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



public class PushUtils {



    private static SystemService systemService;

	
    @Resource

    private PushService pushService;




 fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java

@@ -8,21 +8,20 @@
import org.json.simple.parser.ParseException;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import org.yeshi.utils.JsonUtil;



import com.xiaomi.xmpush.server.Constants;

import com.xiaomi.xmpush.server.Message;

import com.xiaomi.xmpush.server.Message.Builder;

import com.xiaomi.xmpush.server.Result;

import com.xiaomi.xmpush.server.Sender;

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

import com.yeshi.fanli.entity.xinge.MessageInfo;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.PushLogHelper;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.PropertiesUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;



@@ -32,12 +31,12 @@
    private static XiaoMiPushUtil xiaoMiPushUtil;



    @Autowired

    private SystemService systemService;

    private BusinessSystemService businessSystemService;



    @PostConstruct

    public void init() {

        xiaoMiPushUtil = this;

        xiaoMiPushUtil.systemService = this.systemService;

        xiaoMiPushUtil.businessSystemService = this.businessSystemService;

    }



    // AppKey

@@ -203,11 +202,6 @@
        XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), system);

    }



    public static int allFanLiQuanDevice(MessageInfo info, JSONObject json, PushRecord pushRecord) {

        System b_android = xiaoMiPushUtil.systemService.getSystem("ANDROID",

                Constant.systemCommonConfig.getAndroidPackageName());

        return pushApp(info, json, pushRecord, b_android);

    }



    /**

     * 


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