多系统兼容优化

admin

2020-07-04 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4

多系统兼容优化

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

@@ -338,8 +338,9 @@


            ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();

            try {

                for(SystemEnum system:SystemEnum.values())

                goodsEvaluateService.addGoodsEvaluate(itemId + "", imageList, user, doc, null,

                        new Date(startTime - 1000 * 60 * 20L * i), SystemEnum.blks);

                        new Date(startTime - 1000 * 60 * 20L * i),system);

            } catch (GoodsEvaluateException e) {

                e.printStackTrace();

            } catch (Exception e) {


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

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


import javax.annotation.Resource;



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

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -51,7 +52,7 @@
     * @param out

     */

//    @RequestMapping(value = "saveAdd")

    public void saveAdd(String callback, AppPageNotification appPageNotification, PrintWriter out) {

    public void saveAdd(AdminAcceptData acceptData, String callback, AppPageNotification appPageNotification, PrintWriter out) {

        try {

            String content = appPageNotification.getContent();

            if (StringUtil.isNullOrEmpty(content) ) {

@@ -61,7 +62,7 @@
            

            AppPageNotificationTypeEnum type = appPageNotification.getType();

            if (type != null) {

                AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name());

                AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name(),acceptData.getSystem());

                if (old != null) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("已存在此类型"));

                    return;

@@ -208,7 +209,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key,

    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key,

             Integer show, Integer canClose,String version, String platform,  PrintWriter out) {



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

@@ -219,7 +220,7 @@


        try {

            List<AppPageNotification> list = appPageNotificationService.listQuery((pageIndex - 1) * pageSize, 

                    pageSize, key, show, canClose);

                    pageSize, key, show, canClose,acceptData.getSystem());



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

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

@@ -246,7 +247,7 @@
                }

            }

            

            long count = appPageNotificationService.countQuery(key, show, canClose);

            long count = appPageNotificationService.countQuery(key, show, canClose,acceptData.getSystem());

            

            List<AppVersionInfo> versionList = null;

            if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {

@@ -256,7 +257,7 @@
                    if (appVersion != null)

                        versionList.add(appVersion);

                } else {

                    List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);

                    List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());

                    if (appVersionList != null) {

                        versionList.addAll(appVersionList);

                    }

@@ -431,11 +432,9 @@
    

    /**

     * 设置版本

     * 
     * @param callback

     * @param id

     * @param moveType

     * @param sex

     * @param versions

     * @param out

     */

    @RequestMapping(value = "setVersions")


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

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

import javax.servlet.http.HttpServletRequest;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.stereotype.Controller;

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

import org.springframework.web.multipart.MultipartHttpServletRequest;

@@ -54,13 +56,14 @@
     * 保存信息

     * 

     * @param callback

     * @param special

     * @param out

     */

    @RequestMapping(value = "save")

    public void save(String callback, BrandClass brandClass, PrintWriter out) {

    public void save(AdminAcceptData acceptData, String callback, BrandClass brandClass, PrintWriter out) {

        try {

            brandClassService.saveObject(brandClass);

            List<SystemEnum> systemList=new ArrayList<>();

            systemList.add(acceptData.getSystem());

            brandClassService.saveObject(brandClass,systemList);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

        } catch (BrandClassException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -74,13 +77,12 @@
     * 修改排序

     * 

     * @param callback

     * @param goodsClass

     * @param out

     */

    @RequestMapping(value = "updateOrder")

    public void updateOrder(String callback, Long id, Integer moveType, PrintWriter out) {

    public void updateOrder(AdminAcceptData acceptData,String callback, Long id, Integer moveType, PrintWriter out) {

        try {

            brandClassService.updateOrder(id, moveType);

            brandClassService.updateOrder(id, moveType,acceptData.getSystem());

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功"));

        } catch (BrandClassException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -101,7 +103,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,

    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,

            PrintWriter out) {

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

            pageIndex = 1;

@@ -112,13 +114,13 @@
        }



        try {

            List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);

            List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());

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

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

                return;

            }



            long count = brandClassService.countQuery(key, state);

            long count = brandClassService.countQuery(key, state,acceptData.getSystem());



            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -193,9 +195,9 @@
     * @param out

     */

    @RequestMapping(value = "getOptions")

    public void getOptions(String callback, PrintWriter out) {

    public void getOptions(AdminAcceptData acceptData, String callback, PrintWriter out) {

        try {

            List<BrandClass> list = brandClassService.listEffective();

            List<BrandClass> list = brandClassService.listEffective(acceptData.getSystem());

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

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

                return;

@@ -292,7 +294,6 @@
     * 添加店铺入库

     * 

     * @param callback

     * @param special

     * @param out

     */

    @RequestMapping(value = "saveShopInfo")

@@ -376,7 +377,6 @@
     * 保存信息

     * 

     * @param callback

     * @param special

     * @param out

     */

    @RequestMapping(value = "saveClassShop")

@@ -402,7 +402,6 @@
     * 修改排序

     * 

     * @param callback

     * @param goodsClass

     * @param out

     */

    @RequestMapping(value = "updateOrderClassShop")

@@ -531,7 +530,6 @@
     * 修改排序

     * 

     * @param callback

     * @param goodsClass

     * @param out

     */

    @RequestMapping(value = "updateOrderBrand")


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

@@ -609,7 +609,7 @@
     * @param out
     */
    @RequestMapping(value = "query")
    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, String typeEnum, PrintWriter out) {
    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, String typeEnum, PrintWriter out) {
        if (pageIndex == null || pageIndex < 1) {
            pageIndex = 1;
        }
@@ -618,7 +618,7 @@
        }

        try {
            List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 1, typeEnum);
            List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 1, typeEnum,acceptData.getSystem());
            if (list == null || list.size() == 0) {
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));
                return;
@@ -640,7 +640,7 @@
                }
            }

            long count = goodsEvaluateService.count(key, state, 1, typeEnum);
            long count = goodsEvaluateService.count(key, state, 1, typeEnum,acceptData.getSystem());

            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -664,7 +664,7 @@
     * @param out
     */
    @RequestMapping(value = "querySuCai")
    public void querySuCai(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
    public void querySuCai(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
            PrintWriter out) {
        if (pageIndex == null || pageIndex < 1) {
            pageIndex = 1;
@@ -674,7 +674,7 @@
        }

        try {
            List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 2, null);
            List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 2, null,acceptData.getSystem());
            if (list == null || list.size() == 0) {
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));
                return;
@@ -696,7 +696,7 @@
                }
            }

            long count = goodsEvaluateService.count(key, state, 2, null);
            long count = goodsEvaluateService.count(key, state, 2, null,acceptData.getSystem());

            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

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

@@ -175,7 +175,7 @@
            if (pageSize == null)

                pageSize = Constant.PAGE_SIZE;



            List<HelpCenter> list = helpCenterService.query(0, Integer.MAX_VALUE, key, cid, orderMode, state);

            List<HelpCenter> list = helpCenterService.query(0, Integer.MAX_VALUE, key, cid, orderMode, state,acceptData.getSystem());

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

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

                return;

@@ -404,9 +404,9 @@
     * @param out

     */

    @RequestMapping(value = "updateSort")

    public void updateSort(String callback, Integer moveType, Long id, PrintWriter out) {

    public void updateSort(AdminAcceptData acceptData, String callback, Integer moveType, Long id, PrintWriter out) {

        try {

            helpClassService.updateSort(moveType, id);

            helpClassService.updateSort(moveType, id,acceptData.getSystem());

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("操作成功"));

        } catch (HelpClassException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -465,7 +465,7 @@


        pageSize = Integer.MAX_VALUE;

        try {

            List<HelpClass> list = helpClassService.query(0, pageSize, key, showState);

            List<HelpClass> list = helpClassService.query(0, pageSize, key, showState,acceptData.getSystem());

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

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

                return;

@@ -552,7 +552,7 @@
     * @param out

     */

    @RequestMapping(value = "getProvidedClass")

    public void getAllClass(String callback, PrintWriter out) {

    public void getAllClass(AdminAcceptData acceptData, String callback, PrintWriter out) {

        try {



            HelpClass helpClass = new HelpClass();

@@ -562,7 +562,7 @@
            List<HelpClass> reslut_list = new ArrayList<HelpClass>();

            reslut_list.add(helpClass);



            List<HelpClass> list = helpClassService.getProvidedClass();

            List<HelpClass> list = helpClassService.getProvidedClass(acceptData.getSystem());

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

                reslut_list.addAll(list);

            }


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

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


import javax.annotation.Resource;



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

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.HttpUtil;

@@ -75,7 +76,7 @@
     * @throws Exception

     */

    @RequestMapping(value = "newPushUrlAll")

    public void newPushUrlAll(String callback, String url, String title, String content, String uids, 
    public void newPushUrlAll(AdminAcceptData acceptData, String callback, String url, String title, String content, String uids,

            String arrayIOS, String arrayAndroid, PrintWriter out) {



        if (StringUtil.isNullOrEmpty(url) || StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {

@@ -111,12 +112,12 @@
            

            if (listuid == null) {

                // 全推

                pushService.pushUrl(null, title, content, url, listIOS, listAndroid);

                pushService.pushUrl(null, title, content, url, listIOS, listAndroid,acceptData.getSystem());

            } else {

                // 部分推送

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid);

                        pushService.pushUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid,acceptData.getSystem());

                    }

                }

            }

@@ -134,13 +135,12 @@
     * 

     * 方法说明: 站内信推送 -(新后台)

     * 

     * @param uId

     * @param title

     * @param content

     * @throws Exception

     */

    @RequestMapping(value = "newPushFanZNX")

    public void newPushFanZNX(String callback, String uids, String title, String content, String arrayIOS, 
    public void newPushFanZNX(AdminAcceptData acceptData,String callback, String uids, String title, String content, String arrayIOS,

            String arrayAndroid, PrintWriter out) {



        if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {

@@ -171,12 +171,12 @@
            

            if (listuid == null) {

                // 全推

                pushService.pushZNX(null, title, content, listIOS, listAndroid);

                pushService.pushZNX(null, title, content, listIOS, listAndroid,acceptData.getSystem());

            } else {

                // 部分推送

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushZNX(Long.parseLong(str_uid), title, content, listIOS, listAndroid);

                        pushService.pushZNX(Long.parseLong(str_uid), title, content, listIOS, listAndroid,acceptData.getSystem());



                        userSystemMsgService.addUserSystemMsg(Long.parseLong(str_uid), UserSystemMsgTypeEnum.question,

                                title, content, UserSystemMsg.TIME_TAG_EMERGENT, null);

@@ -196,13 +196,12 @@
     * 

     * 方法说明: 百川推送 -(新后台)

     * 

     * @param uId

     * @param title

     * @param content

     * @throws Exception

     */

    @RequestMapping(value = "pushBaiChuan")

    public void pushBaiChuan(String callback, String uids, String title, String content, String url, String arrayIOS,

    public void pushBaiChuan(AdminAcceptData acceptData,String callback, String uids, String title, String content, String url, String arrayIOS,

            String arrayAndroid, PrintWriter out) {



        if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {

@@ -232,12 +231,12 @@
            

            if (listuid == null) {

                // 全推

                pushService.pushBaiChuanUrl(null, title, content, url, listIOS, listAndroid);

                pushService.pushBaiChuanUrl(null, title, content, url, listIOS, listAndroid,acceptData.getSystem());

            } else {

                // 部分推送

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid);

                        pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid,acceptData.getSystem());

                    }

                }

            }


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

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


import javax.annotation.Resource;



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

import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.stereotype.Controller;

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

@@ -143,7 +144,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {

    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {



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

            pageIndex = 1;

@@ -155,7 +156,7 @@


        try {



            List<PushCoupon> list = pushCouponService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);

            List<PushCoupon> list = pushCouponService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());



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

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

@@ -180,7 +181,7 @@
                listVO.add(pushCouponVO);

            }



            long count = pushCouponService.countQuery(key, state);

            long count = pushCouponService.countQuery(key, state,acceptData.getSystem());



            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -204,7 +205,6 @@
    

    /**

     * 推送

     * @param id 推送id

     * @param out

     * @throws Exception

     */

@@ -243,7 +243,6 @@


    /**

     * 版本转换为list

     * @param pushGoods

     */

    public void convertVersionList(PushCouponVO pushCouponVO) {

      String versions = pushCouponVO.getVersions();

@@ -271,7 +270,6 @@


    /**

     * 转换json

     * @param pushGoods

     */

    public void convertVersion(PushCoupon pushCoupon, String arrayIOS, String arrayAndroid) {

        


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

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


import javax.annotation.Resource;



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

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -226,7 +227,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {

    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {



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

            pageIndex = 1;

@@ -238,7 +239,7 @@


        try {



            List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);

            List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());

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

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

                return;

@@ -261,7 +262,7 @@
                convertVersionList(pushGoods);

            }



            long count = pushGoodsService.countQuery(key, state);

            long count = pushGoodsService.countQuery(key, state,acceptData.getSystem());



            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -286,7 +287,6 @@
    /**

     *   商品推送

     * 

     * @param id 推送id

     * @param out

     * @throws Exception

     */


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

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


import javax.annotation.Resource;



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

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;

@@ -27,11 +28,8 @@
@RequestMapping("admin/new/api/v1/pushInfo")

public class PushInfoController {





    @Resource

    private PushInfoService pushInfoService;

	
	


    /**

     * 新增/修改

@@ -63,7 +61,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType,

    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType,

            Integer state, String type, PrintWriter out) {



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

@@ -76,14 +74,14 @@


        try {



            List<PushInfo> list = pushInfoService.listQuery((pageIndex-1) * pageSize, pageSize, key, keyType, state, type);

            List<PushInfo> list = pushInfoService.listQuery((pageIndex-1) * pageSize, pageSize, key, keyType, state, type,acceptData.getSystem());



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

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

                return;

            }



            long count = pushInfoService.countQuery(key, keyType, state, type);

            long count = pushInfoService.countQuery(key, keyType, state, type,acceptData.getSystem());



            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -139,7 +137,6 @@
    

    /**

     * 推送

     * @param id 推送id

     * @param out

     * @throws Exception

     */


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

@@ -7,6 +7,7 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



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

import org.springframework.stereotype.Controller;

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

import org.springframework.web.multipart.MultipartHttpServletRequest;

@@ -36,7 +37,6 @@
     * 保存信息

     * 

     * @param callback

     * @param special

     * @param out

     */

    @RequestMapping(value = "save")

@@ -65,7 +65,6 @@
     * 修改排序

     * 

     * @param callback

     * @param goodsClass

     * @param out

     */

    @RequestMapping(value = "updateOrder")

@@ -92,7 +91,7 @@
     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sex, PrintWriter out) {

    public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer sex, PrintWriter out) {

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

            pageIndex = 1;

        }

@@ -102,13 +101,13 @@
        }



        try {

            List<HomeNavbar> list = homeNavbarService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sex);

            List<HomeNavbar> list = homeNavbarService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sex,acceptData.getSystem());

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

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

                return;

            }

            

            long count = homeNavbarService.countlistQuery(key, sex);

            long count = homeNavbarService.countlistQuery(key, sex,acceptData.getSystem());

            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);




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

@@ -65,7 +65,7 @@
            if (pageId == null)

                pageId = 0L;



            List<HelpCenter> list1 = helpCenterService.listValid(pageId, pageSize, key, cid);

            List<HelpCenter> list1 = helpCenterService.listValid(pageId, pageSize, key, cid,acceptData.getSystem());

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

            if (list1 != null && list1.size() > 0)

                list.addAll(list1);

@@ -158,7 +158,7 @@
        try {

            List<HelpClass> resultList = new ArrayList<>();



            List<HelpClass> list = helpClassService.getClassByState(1);

            List<HelpClass> list = helpClassService.getClassByState(1,acceptData.getSystem());

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

                resultList.addAll(list);

            }


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

@@ -1,23 +1,19 @@
package com.yeshi.fanli.controller.apph5;



import java.io.PrintWriter;

import java.util.List;



import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

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

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.homemodule.BannerVO;

import net.sf.json.JSONObject;

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

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

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONObject;

import javax.annotation.Resource;

import java.io.PrintWriter;

import java.util.List;



/**

 * 动态

@@ -33,7 +29,7 @@
    private SwiperPictureService swiperPictureService;



    @RequestMapping(value = "getpicture")

    public void getDetail(String callback, String card, PrintWriter out) {

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



        if (StringUtil.isNullOrEmpty(card)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("唯一标识为空"));

@@ -41,7 +37,7 @@
        }



            

        List<BannerVO> list = swiperPictureService.getByBannerCard(card, SystemEnum.blks);

        List<BannerVO> list = swiperPictureService.getByBannerCard(card, acceptData.getSystem());

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

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

            return;


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

@@ -84,7 +84,7 @@
    @RequestMapping(value = "getClass", method = RequestMethod.POST)

    public void getClass(AcceptData acceptData, PrintWriter out) {

        try {

            List<BrandClass> list = brandClassService.listBrandClassEffectiveCache();

            List<BrandClass> list = brandClassService.listBrandClassEffectiveCache(acceptData.getSystem());

            if (list == null) {

                list = new ArrayList<BrandClass>();

            }


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

@@ -64,7 +64,7 @@
        String version = acceptData.getVersion();



        AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type, platform,

                Integer.parseInt(version));

                Integer.parseInt(version),acceptData.getSystem());

        if ("home".equalsIgnoreCase(type) && VersionUtil.smallerThan_1_5_1(platform, version) && ap != null) {

            AppPageNotification no = new AppPageNotification();

            no.setContentUrl("");


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

@@ -37,7 +37,7 @@
        

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

        

        List<HomeNavbar> listNavbar = homeNavbarService.listQueryDefaultNavbar(0);

        List<HomeNavbar> listNavbar = homeNavbarService.listQueryDefaultNavbar(0,acceptData.getSystem());

        if (listNavbar != null) {

            list.addAll(listNavbar);

        }


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

@@ -229,10 +229,10 @@


        // 设备注册时间

        Date createTime = deviceActive.getCreateTime();

        count = pushGoodsService.countHistoryByPushTime(uid, createTime);

        count = pushGoodsService.countHistoryByPushTime(uid, createTime,acceptData.getSystem());



        int pageSize = Constant.PAGE_SIZE;

        List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);

        List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime,acceptData.getSystem());

        if (list == null)

            list = new ArrayList<>();




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

@@ -666,8 +666,6 @@
     * 

     * @param acceptData

     * @param uid

     * @param page

     * @param type

     * @param out

     */

    @RequestSerializableByKey(key = "#acceptData.device")

@@ -736,7 +734,7 @@
        if (deviceActive != null) {

            // 设备注册时间

            Date createTime = deviceActive.getCreateTime();

            List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);

            List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime, acceptData.getSystem());

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

                MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(

                        UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),

@@ -1078,6 +1076,7 @@
    

    /**

     * 删除消息

     *

     * @param acceptData

     * @param type

     * @param id


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -188,7 +188,7 @@
        List<FloatAD> listAD = new ArrayList<FloatAD>();

        List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();

        List<FloatAD> list = floatADService.getValidFloatADCache(FloatAD.POSITION_INDEX, null, platform,

                Integer.parseInt(version));

                Integer.parseInt(version),acceptData.getSystem());

        if (list != null && !list.isEmpty())

            listAD.addAll(list);




 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -626,7 +626,7 @@
            List<GoodsEvaluate> listNew = new ArrayList<GoodsEvaluate>();

            List<GoodsEvaluate> list = goodsEvaluateService.queryMaterialsCache((page - 1) * Constant.PAGE_SIZE,
                    Constant.PAGE_SIZE, type);
                    Constant.PAGE_SIZE, type,acceptData.getSystem());

            if (!VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {
                listNew.addAll(list);
@@ -775,7 +775,7 @@
                }
            });
            Gson gson = gsonBuilder.create();
            long count = goodsEvaluateService.countValidMaterials(type);
            long count = goodsEvaluateService.countValidMaterials(type,acceptData.getSystem());

            JSONArray jsonArray = new JSONArray();


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -1383,6 +1383,7 @@
    

    /**

     *     // 云发单文案信息

     *

     * @param goodsDetail

     */

    private void getCloudInfo(AcceptData acceptData,Long uid, GoodsDetailVO goodsDetail, GoodsDetailExtraVO extraVO) {

@@ -1401,7 +1402,7 @@
            return;

        }

        

        GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsDetail.getGoodsId() +"", goodsDetail.getGoodsType());

        GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsDetail.getGoodsId() + "", goodsDetail.getGoodsType(), acceptData.getSystem());

        if (evaluate != null) {

            String cloudText = null;

            List<CommentInfo> comments = evaluate.getComments();

@@ -1610,8 +1611,7 @@
     * @param acceptData

     * @param uid

     * @param id

     * @param couponUrl

     *            -优惠券链接

     * @param couponUrl  -优惠券链接

     * @param source

     * @param out

     */

@@ -1828,10 +1828,8 @@
    /**

     * 是否在参与推广

     * 

     * @param goodsId

     *            -商品ID

     * @param goodsType

     *            -TB/JD

     * @param goodsId   -商品ID

     * @param goodsType -TB/JD

     * @param out

     */

    @RequestMapping(value = "isGoodsExtend")

@@ -1989,14 +1987,14 @@


    /**

     * 京东转链

     * @Title: getJDLink

     * @Description: 
     *

     * @param acceptData

     * @param link

     * @param uid

     * @param out 
     * void 返回类型

     * @param out        void 返回类型

     * @throws

     * @Title: getJDLink

     * @Description:

     */

    @RequestMapping(value = "convertJDLink")

    public void convertJDLink(AcceptData acceptData, String link, Long uid, String callback, PrintWriter out) {


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HomeNavbarControllerV2.java

@@ -109,7 +109,7 @@
            List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();



            // 系统默认导航栏

            List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar();

            List<HomeNavbar> listNavbar = homeNavbarService.listQueryEffectiveNavbar(acceptData.getSystem());

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

                listItems.addAll(listNavbar);

            }

@@ -251,7 +251,7 @@
            List<HomeNavbar> listItems = new ArrayList<HomeNavbar>();

            

            

            List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice());

            List<HomeNavbar> listNavbar = homeNavbarUserService.restoreSystemDefault(uid, acceptData.getDevice(),acceptData.getSystem());

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

                listItems.addAll(listNavbar);

            }


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java

@@ -721,7 +721,7 @@
        try {

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

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

            pushService.pushZNX(remindId, title, content, listIOS, listAndroid);

            pushService.pushZNX(remindId, title, content, listIOS, listAndroid,acceptData.getSystem());



            userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common, title, content,

                    UserSystemMsg.TIME_TAG_COMMON, null);


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java

@@ -492,7 +492,7 @@
            PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(Constant.SOURCE_TYPE_TAOBAO, orderId,

                    BigDecimal.ZERO);

            try {

                pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

                pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null,acceptData.getSystem());

            } catch (NumberFormatException e) {

                e.printStackTrace();

            } catch (PushException e) {


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -560,7 +560,7 @@
        AppPageNotification ap = null;

        if (page == 1) {

            ap = appPageNotificationService.getValidNotificationByTypeCache(notifyType, acceptData.getPlatform(),

                    Integer.parseInt(acceptData.getVersion()));

                    Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());

            // 没有通知

            if (ap == null || !ap.getShow()) {

                ap = null;

@@ -931,16 +931,16 @@
        out.print(JsonUtil.loadTrueResult(buildSearchResult(data, ap)));

    }





    /**

     * 拼多多

     * 
     * @param kw

     * @param acceptData

     * @param key

     * @param page

     * @param filter

     * @param order

     * @param startprice

     * @param endprice

     * @return

     * @param ap

     * @param out

     */

    private void searchPDDGoods(AcceptData acceptData, String key, Integer page, String filter, Integer order,

            AppPageNotification ap, PrintWriter out) {


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java

@@ -810,7 +810,7 @@
        }

        

        try {

            GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsId, goodsType);

            GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsId, goodsType,acceptData.getSystem());

            if (evaluate != null) {

                userCloudService.sendByDynamic(uid, evaluate.getId());

            } else {


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

@@ -153,7 +153,7 @@
        List<FloatAD> listAD = new ArrayList<FloatAD>();

        List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();

        List<FloatAD> list = floatADService.getValidFloatADCache(FloatAD.POSITION_INDEX, null, platform,

                Integer.parseInt(version));

                Integer.parseInt(version),acceptData.getSystem());

        if (list != null && !list.isEmpty())

            listAD.addAll(list);




 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java

@@ -384,7 +384,7 @@
        try {

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

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

            pushService.pushZNX(remindId, title, content, listIOS, listAndroid);

            pushService.pushZNX(remindId, title, content, listIOS, listAndroid,acceptData.getSystem());



            userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common, title, content,

                    UserSystemMsg.TIME_TAG_COMMON, null);


 fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java

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

import javax.annotation.Resource;

import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -37,11 +38,10 @@
        mongoTemplate.save(record);
    }

	
    /**
     * 状态切换
     * 
     * @param record
     * @param id
     * @param state
     */
    public void updateSatate(String id, int state) {
        Query query = new Query();
@@ -99,7 +99,7 @@
     * 
     * @return
     */
    public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum) {
    public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum, SystemEnum system) {
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
        list.add(Criteria.where("dynamicType").is(dynamicType));
@@ -110,6 +110,9 @@
        
        if (!StringUtil.isNullOrEmpty(typeEnum))
            list.add(Criteria.where("type").is(typeEnum));

        if(system!=null)
            list.add(Criteria.where("system").is(system));
        
        if (!StringUtil.isNullOrEmpty(key))
            list.add(new Criteria().orOperator(
@@ -127,7 +130,7 @@
        return mongoTemplate.find(query, GoodsEvaluate.class);
    }

    public long count(String key, Integer state, int dynamicType, String typeEnum) {
    public long count(String key, Integer state, int dynamicType, String typeEnum, SystemEnum system) {
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
        list.add(Criteria.where("dynamicType").is(dynamicType));
@@ -135,6 +138,9 @@
        if (state != null) {
            list.add(Criteria.where("state").is(state));
        }

        if(system!=null)
            list.add(Criteria.where("system").is(system));
        
        if (!StringUtil.isNullOrEmpty(typeEnum))
            list.add(Criteria.where("type").is(typeEnum));
@@ -157,10 +163,9 @@
     * 查询有效
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<GoodsEvaluate> queryValid(int start, int count, int dynamicType) {
    public List<GoodsEvaluate> queryValid(int start, int count, int dynamicType,SystemEnum system) {
        Date now = new Date();
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
@@ -169,6 +174,8 @@
        list.add(Criteria.where("state").is(1));
        list.add(Criteria.where("startTime").lte(now));
        list.add(Criteria.where("endTime").gte(now));
        if(system!=null)
            list.add(Criteria.where("system").is(system));
        
        if (list.size() > 0) {
            Criteria[] cas = new Criteria[list.size()];
@@ -184,10 +191,9 @@

    /**
     * 统计有效
     * @param key
     * @return
     */
    public long countValid(int dynamicType) {
    public long countValid(int dynamicType,SystemEnum system) {
        Date now = new Date();
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
@@ -196,6 +202,8 @@
        list.add(Criteria.where("state").is(1));
        list.add(Criteria.where("startTime").lte(now));
        list.add(Criteria.where("endTime").gte(now));
        if(system!=null)
            list.add(Criteria.where("system").is(system));
        
        if (list.size() > 0) {
            Criteria[] cas = new Criteria[list.size()];
@@ -209,18 +217,17 @@
    
    /**
     * 查询有效
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<GoodsEvaluate> querySingleExist() {
    public List<GoodsEvaluate> querySingleExist(SystemEnum system) {
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
        
        list.add(Criteria.where("dynamicType").is(1));
        list.add(Criteria.where("state").is(1));
        list.add(Criteria.where("goods.goodsType").is(1));
        if(system!=null)
            list.add(Criteria.where("system").is(system));
        
        if (list.size() > 0) {
            Criteria[] cas = new Criteria[list.size()];
@@ -234,16 +241,18 @@
    
    /**
     * 查询有效
     * @param start
     * @param count
     * @param key
     * @param goodsType
     * @param goodsId
     * @param system
     * @return
     */
    public List<GoodsEvaluate> queryExist(int goodsType, String goodsId) {
    public List<GoodsEvaluate> queryExist(int goodsType, String goodsId,SystemEnum system) {
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
        list.add(Criteria.where("dynamicType").is(1));
        list.add(Criteria.where("state").is(1));
        if(system!=null)
            list.add(Criteria.where("system").is(system));
        list.add(Criteria.where("imgList.goods.goodsId").is(goodsId));
        list.add(Criteria.where("imgList.goods.goodsType").is(goodsType));
        
@@ -260,17 +269,16 @@
    
    /**
     * 查询有效
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<GoodsEvaluate> queryExistSingle(int goodsType, String goodsId) {
    public List<GoodsEvaluate> queryExistSingle(int goodsType, String goodsId,SystemEnum system) {
        Query query = new Query();
        List<Criteria> list = new ArrayList<Criteria>();
        list.add(Criteria.where("dynamicType").is(1));
        list.add(Criteria.where("state").is(1));
        list.add(Criteria.where("type").is("single"));
        if(system!=null)
            list.add(Criteria.where("system").is(system));
        list.add(Criteria.where("imgList.goods.goodsId").is(goodsId));
        list.add(Criteria.where("imgList.goods.goodsType").is(goodsType));
        
@@ -287,9 +295,6 @@
    
    /**
     * 查询有效
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<GoodsEvaluate> queryOverdue() {
@@ -302,10 +307,6 @@
    
    
    /**
     * 查询有效
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<GoodsEvaluate> removeDownGoods() {
@@ -355,7 +356,6 @@
     * 查询有效-倒序
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<GoodsEvaluate> queryValidSortASC(int start, int count, EvaluateEnum tyepEnum, boolean sortDesc) {
@@ -388,10 +388,10 @@

    
    /**
     * 查询有效
     * @param start
     * @param count
     * @param key
     *
     * @param goodsType
     * @param goodsId
     * @param limitTime
     * @return
     */
    public List<GoodsEvaluate> queryExistLimitTime(int goodsType, String goodsId, Date limitTime) {

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandClassMapper.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

@@ -13,7 +14,7 @@
     * 查询品牌分类

     * @return

     */

    List<BrandClass> listEffective();

    List<BrandClass> listEffective(@Param("system")SystemEnum system);

    

    /**

     * 排序

@@ -23,7 +24,6 @@
    

    /**

     * 获取相邻序号

     * @param position

     * @param type

     * @return

     */

@@ -47,8 +47,8 @@
     * @return

     */

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

            @Param("state") Integer state);

            @Param("state") Integer state,@Param("system") SystemEnum system);

    

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

    long countQuery(@Param("key") String key, @Param("state") Integer state,@Param("system")SystemEnum system);

        

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/brand/BrandClassSystemMapMapper.java

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

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.brand.BrandClassSystemMap;
import org.apache.ibatis.annotations.Param;

import javax.annotation.Nullable;
import java.util.List;

public interface BrandClassSystemMapMapper extends BaseMapper<BrandClassSystemMap> {
    List<BrandClassSystemMap> listByClassIdsAndSystem(@Nullable @Param("classIdList") List<Long> idList, @Param("system") SystemEnum system);
}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/common/CommonConfigMapper.java

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

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.config.CommonConfig;

public interface CommonConfigMapper extends BaseMapper<CommonConfig> {

    CommonConfig selectByKey(String key);

}

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

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.entity.bus.help.AppPageNotification;

@@ -16,21 +17,6 @@


    AppPageNotification selectByPrimaryKey(Long id);



    /**

     * 通过类型获取通知

     * 
     * @param type

     * @return

     */

    AppPageNotification selectByType(String type);



    /**

     * 通过类型获取有效通知

     * 
     * @param type

     * @return

     */

    List<AppPageNotification> listValidByType(String type);



    int updateByPrimaryKeySelective(AppPageNotification record);



@@ -44,11 +30,27 @@
    int deleteBatchByPrimaryKey(List<Long> list);



    /**

     * 通过类型获取通知

     * 
     * @param type

     * @return

     */

    AppPageNotification selectByType(@Param("type") String type,@Param("system")  SystemEnum system);



    /**

     * 通过类型获取有效通知

     * 
     * @param type

     * @return

     */

    List<AppPageNotification> listValidByType(@Param("type") String type,@Param("system")  SystemEnum system);



    /**

     * 后端列表查询

     * @return

     */

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

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

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



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

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

}

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

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

@@ -19,14 +20,14 @@
     * @return

     */

    List<HelpCenter> listValid(@Param("pageId") Long pageId, @Param("count") int count, 

            @Param("key") String title, @Param("cid") Long cid);

            @Param("key") String title, @Param("cid") Long cid,@Param("system") SystemEnum system);

    

    

    List<HelpCenter> query(@Param("start") int start, @Param("count") int count, 

            @Param("key") String title, @Param("cid") Long cid,

             @Param("orderMode") Integer orderMode,  @Param("state") Integer state);

             @Param("orderMode") Integer orderMode,  @Param("state") Integer state,@Param("system") SystemEnum system);

    

    long countQuery(@Param("key") String title, @Param("cid") Long cid, @Param("state") Integer state);

    long countQuery(@Param("key") String title, @Param("cid") Long cid, @Param("state") Integer state,@Param("system") SystemEnum system);

    

    /**

     * 批量删除


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

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

@@ -24,9 +25,9 @@
     * @return

     */

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

            @Param("key") String key, @Param("state") Integer state);

            @Param("key") String key, @Param("state") Integer state, @Param("system") SystemEnum system );

    

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

    long countQuery(@Param("key") String key, @Param("state") Integer state, @Param("system") SystemEnum system);

    

    

    /**

@@ -41,7 +42,7 @@
     * @param sort 排序值

     * @return

     */

    HelpClass getChangeOrder(@Param("type") Integer type, @Param("sort") Integer sort);

    HelpClass getChangeOrder(@Param("type") Integer type, @Param("sort") Integer sort, @Param("system") SystemEnum system);

    

    

    /**

@@ -49,11 +50,11 @@
     * @param state

     * @return

     */

    List<HelpClass> getClassByState(@Param("state") Integer state);

    List<HelpClass> getClassByState(@Param("state") Integer state, @Param("system") SystemEnum system);

    

    /**

     * 查询所有分类 提供筛选

     * @return

     */

    List<HelpClass> getProvidedClass();

    List<HelpClass> getProvidedClass( @Param("system") SystemEnum system);

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/HomeNavbarMapper.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

@@ -74,29 +75,29 @@
     * @param key

     * @return

     */

    List<HomeNavbar> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key, @Param("sex") Integer sex);

    List<HomeNavbar> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key, @Param("sex") Integer sex, @Param("system") SystemEnum system);

    

    long countListQuery(@Param("key") String key, @Param("sex") Integer sex);

    long countListQuery(@Param("key") String key, @Param("sex") Integer sex, @Param("system") SystemEnum system);

    

    /**

     * 查询有效导航栏

     * @return

     */

    List<HomeNavbar> listQueryEffective();

    List<HomeNavbar> listQueryEffective( @Param("system") SystemEnum system);

    

    

    /**

     * 默认导航栏

     * @return

     */

    List<HomeNavbar> listQueryDefaultNavbar(@Param("sex") Integer sex);

    List<HomeNavbar> listQueryDefaultNavbar(@Param("sex") Integer sex, @Param("system") SystemEnum system);

    

    

    /**

     *  固定导航栏

     * @return

     */

    List<HomeNavbar> listQueryFixedNavbar();

    List<HomeNavbar> listQueryFixedNavbar( @Param("system") SystemEnum system);

    

    

    /**

@@ -104,6 +105,6 @@
     * @param classId

     * @return

     */

    HomeNavbar getEffectiveByClassId(@Param("classId") Long classId);

    HomeNavbar getEffectiveByClassId(@Param("classId") Long classId, @Param("system") SystemEnum system);

    

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponMapper.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

@@ -17,14 +18,14 @@
     * @return

     */

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

            @Param("key") String key, @Param("state") Integer state);

                               @Param("key") String key, @Param("state") Integer state, @Param("system")SystemEnum system);

    

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

    long countQuery(@Param("key") String key, @Param("state") Integer state, @Param("system")SystemEnum system);

    

    

    /**

     * 有效活动

     * @return

     */

    List<PushCoupon> listQueryEffective();

    List<PushCoupon> listQueryEffective(@Param("system")SystemEnum system);

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java

@@ -3,6 +3,7 @@
import java.util.Date;

import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



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

@@ -36,9 +37,9 @@
     * @return

     */

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

            @Param("key") String key, @Param("state") Integer state);

                              @Param("key") String key, @Param("state") Integer state, @Param("system") SystemEnum system);

    

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

    long countQuery(@Param("key") String key, @Param("state") Integer state, @Param("system") SystemEnum system);

    

    

    /**

@@ -49,16 +50,16 @@
     * @return

     */

    List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,

         @Param("uid") Long uid, @Param("pushTime") Date pushTime);

         @Param("uid") Long uid, @Param("pushTime") Date pushTime, @Param("system") SystemEnum system);

    

    /**

     * 统计历史推送商品信息

     * @param start

     * @param count

     * @param uid

     * @param pushTime

     * @param system

     * @return

     */

    long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);

    long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime, @Param("system") SystemEnum system);

    

    /**

     * 查询已推送记录

@@ -72,6 +73,6 @@
     * 需要执行推送的任务

     * @return

     */

    List<PushGoods> listTask();

    List<PushGoods> listTask( @Param("system") SystemEnum system);

    

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushInfoMapper.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

@@ -23,14 +24,14 @@
     */

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

             @Param("key") String key, @Param("keyType") Integer keyType, @Param("state") Integer state

             ,  @Param("type")String type);

             ,  @Param("type")String type, @Param("system") SystemEnum system);

    

    long countQuery(@Param("key") String key, @Param("keyType") Integer keyType,

            @Param("state") Integer state,  @Param("type")String type);

            @Param("state") Integer state,  @Param("type")String type, @Param("system") SystemEnum system);

    

    /**

     * 需要执行推送的任务

     * @return

     */

    List<PushInfo> listTask();

    List<PushInfo> listTask(@Param("system") SystemEnum system);

}

 fanli/src/main/java/com/yeshi/fanli/dto/push/PushBaseContent.java

New file
@@ -0,0 +1,55 @@
package com.yeshi.fanli.dto.push;

import com.yeshi.fanli.entity.SystemEnum;

import java.util.List;

public class PushBaseContent {
    private String title;
    private String content;
    private List<Integer> versionCodeList;
    private SystemEnum system;


    public PushBaseContent() {
    }

    public PushBaseContent(String title, String content, List<Integer> versionCodeList, SystemEnum system) {
        this.title = title;
        this.content = content;
        this.versionCodeList = versionCodeList;
        this.system = system;
    }

    public String getTitle() {
        return title;
    }

    public void setTitle(String title) {
        this.title = title;
    }

    public String getContent() {
        return content;
    }

    public void setContent(String content) {
        this.content = content;
    }

    public List<Integer> getVersionCodeList() {
        return versionCodeList;
    }

    public void setVersionCodeList(List<Integer> versionCodeList) {
        this.versionCodeList = versionCodeList;
    }

    public SystemEnum getSystem() {
        return system;
    }

    public void setSystem(SystemEnum system) {
        this.system = system;
    }
}

 fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandClassSystemMap.java

New file
@@ -0,0 +1,51 @@
package com.yeshi.fanli.entity.brand;

import com.yeshi.fanli.entity.SystemEnum;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;

import java.util.Date;

@Table("yeshi_ec_brand_class_system_map")
public class BrandClassSystemMap {
    @Column(name="sm_id")
    private Long id;
    @Column(name="sm_system")
    private SystemEnum system;
    @Column(name="sm_brand_class_id")
    private BrandClass brandClass;
    @Column(name="sm_create_time")
    private Date createTime;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public SystemEnum getSystem() {
        return system;
    }

    public void setSystem(SystemEnum system) {
        this.system = system;
    }

    public BrandClass getBrandClass() {
        return brandClass;
    }

    public void setBrandClass(BrandClass brandClass) {
        this.brandClass = brandClass;
    }

    public Date getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java

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


import com.google.gson.annotations.Expose;



import com.yeshi.fanli.entity.SystemEnum;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@@ -113,6 +114,17 @@
    

    @Column(name = "an_updatetime")

    private Date updateTime;// 更新时间

    //系统

    @Column(name = "an_system")

    private SystemEnum system;



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }



    @Transient // 页面名称

    private String pageName;


 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpCenter.java

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

import java.util.Date;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.format.annotation.DateTimeFormat;

import org.yeshi.utils.mybatis.Column;



@@ -56,6 +57,16 @@
    @Column(name = "h_updatetime")

    private Date updatetime; // 更新时间（修改时间）

    

    @Column(name = "h_system")

    private SystemEnum system; //系统



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }



    public Long getId() {

        return id;


 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/HelpClass.java

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

import java.util.Date;



import com.yeshi.fanli.entity.SystemEnum;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@@ -62,6 +63,17 @@
    @Column(name = "hc_update_time")

    private Date updateTime;

    

    //系统

    @Column(name = "hc_system")

    private SystemEnum system;



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }

    

    private String startTime_str;

    private String endTime_str;


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

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

import java.util.Date;



import com.yeshi.fanli.entity.SystemEnum;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@@ -111,6 +112,18 @@
    @Column(name = "br_params")

    private String params;

    



    @Column(name = "br_system")

    private SystemEnum system;



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }



    // 起始时间

    private String startTime_str;

    // 结束时间


 fanli/src/main/java/com/yeshi/fanli/entity/config/CommonConfig.java

New file
@@ -0,0 +1,72 @@
package com.yeshi.fanli.entity.config;

import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;

/**
 * 通用配置
 */
@Table("yeshi_ec_common_config")
public class CommonConfig {

    @Column(name = "id")
    private Long id;
    @Column(name = "key")
    private String key;
    @Column(name = "value")
    private String value;
    @Column(name = "name")
    private String name;
    @Column(name = "beizhu")
    private String beizhu;
    @Column(name = "createtime")
    private String createtime;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public String getKey() {
        return key;
    }

    public void setKey(String key) {
        this.key = key;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getBeizhu() {
        return beizhu;
    }

    public void setBeizhu(String beizhu) {
        this.beizhu = beizhu;
    }

    public String getCreatetime() {
        return createtime;
    }

    public void setCreatetime(String createtime) {
        this.createtime = createtime;
    }
}

 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java

@@ -5,6 +5,7 @@
import java.util.Date;
import java.util.List;

import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
@@ -18,7 +19,6 @@
 * 动态商品测评
 * 
 * @author Administrator
 *
 */
@Document(collection = "goods_evaluate")
public class GoodsEvaluate implements Serializable {
@@ -119,6 +119,10 @@
    @Field("zeroPoint")
    private Integer zeroPoint; // 是否0点活动-10点进行发圈     1-是

    @Field("system")
    private SystemEnum system; // 系统


    @Expose
    @Field("jumpLink")
    private String jumpLink;
@@ -133,6 +137,15 @@
    // 备注
    private String remarks;


    public SystemEnum getSystem() {
        return system;
    }

    public void setSystem(SystemEnum system) {
        this.system = system;
    }

    public String getId() {
        return id;
    }

 fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java

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

import java.util.Date;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.format.annotation.DateTimeFormat;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;

@@ -65,6 +66,17 @@
    @Column(name = "pc_update_time")

    private Date updateTime;



    @Column(name = "pc_system")

    private SystemEnum system;



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }



    public PushCoupon() {

    }




 fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java

@@ -3,6 +3,7 @@
import java.util.Date;

import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@@ -79,6 +80,17 @@
    // 浏览次数

    @Column(name = "pg_scan_num")

    private Integer scanNum;

    //系统

    @Column(name = "pg_system")

    private SystemEnum system;



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }

    

    // 定时时间

    private String controlTime_str;


 fanli/src/main/java/com/yeshi/fanli/entity/push/PushInfo.java

@@ -3,6 +3,7 @@
import java.util.Date;

import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



@@ -64,6 +65,17 @@
    @Column(name = "pi_update_time")

    private Date updateTime;



    @Column(name = "pi_system")

    private SystemEnum system;



    public SystemEnum getSystem() {

        return system;

    }



    public void setSystem(SystemEnum system) {

        this.system = system;

    }



    // 推送URL

    private String url;

    // 是否定时


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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.commons.lang.StringEscapeUtils;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

@@ -288,7 +289,6 @@
    }



    /**

     * 
     * @Title: demoJobHandler @Description: 更新小程序动态商品 @param

     * param @return @throws Exception ReturnT<String> 返回类型 @throws

     */

@@ -377,7 +377,8 @@
        }



        try {

            goodsEvaluateService.addRanDomShareCount();

            for (SystemEnum system : SystemEnum.values())

                goodsEvaluateService.addRanDomShareCount(system);

        } catch (Exception e) {

            try {

                LogHelper.errorDetailInfo(e);

@@ -405,6 +406,7 @@
    

    /**

     * 好单库商品加入发圈

     *

     * @return

     */

    private boolean addHDKListSelected () {

@@ -437,7 +439,7 @@
                        List<ActivityRuleUser> ruleList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 1, 20);

                        ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();

                        

                        int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoGoodsFactory.create(hdkGoods), pics, user, showtitle);

                        int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoGoodsFactory.create(hdkGoods), pics, user, showtitle, SystemEnum.blks);

                        if (addProcess == 0) {

                            addResult = true;

                            break;

@@ -458,6 +460,7 @@
    

    /**

     * 大淘客商品加入发圈

     *

     * @return

     */

    private boolean addDTKFriendsFircleList() {

@@ -491,7 +494,7 @@
                            user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();

                        }

                        

                        int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoUtil.convert(tkGoods), null, user, showtitle);

                        int addProcess = goodsEvaluateService.addGoodsEvaluate(TaoBaoUtil.convert(tkGoods), null, user, showtitle, SystemEnum.blks);

                        if (addProcess == 0) {

                            addResult = true;

                            break;


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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



@@ -22,7 +24,6 @@
 * 金币任务

 * 

 * @author Administrator

 *

 */

@Component

public class IntegralTaskJob {

@@ -35,6 +36,9 @@


    @Resource

    private IntegralTaskClassService integralTaskClassService;



    @Resource

    private UserInfoService userInfoService;



    /**

     * 推送签到提醒(每天15点半查询)

@@ -72,9 +76,10 @@
                    long todayCount = integralTaskRecordService.countByCidAndUidAndCreateTime(cid, record.getUid(),

                            todayMinTime, todayMaxTime);

                    if (todayCount <= 0) {// 如果未签到，需要推送信息

                        SystemEnum system = userInfoService.getUserSystem(record.getUid());

                        try {

                            pushService.pushUserSignInNotification(record.getUid(), "今日未签到提醒", "今日还未签到，连续签到金币翻倍哦", null,

                                    null);

                                    null,system);

                        } catch (PushException e) {

                            e.printStackTrace();

                        }


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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



@@ -64,7 +65,6 @@
    }



    

	
    /**

     *  定时消息推送任务 每个30秒爬取

     */

@@ -74,9 +74,11 @@
            return;

        }

        

        for (SystemEnum system : SystemEnum.values()) {



        // 站内信、网页、百川

        try {

            List<PushInfo> listTask = pushInfoService.listTask();

                List<PushInfo> listTask = pushInfoService.listTask(system);

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

                for (PushInfo pushInfo: listTask) {

                    pushInfoService.taskPush(pushInfo);

@@ -92,7 +94,7 @@
        

        //    今日推荐

        try {

            List<PushGoods> listTask = pushGoodsService.listTask();

                List<PushGoods> listTask = pushGoodsService.listTask(system);

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

                for (PushGoods pushGoods: listTask) {

                    pushGoodsService.taskPush(pushGoods);

@@ -107,7 +109,7 @@
        }

        

    }

	
    }

    

    

}


 fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandClassMapper.xml

@@ -19,9 +19,12 @@
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_brand_class where bc_id = #{id,jdbcType=BIGINT}

  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_brand_class where bc_id = #{id,jdbcType=BIGINT}</delete>

  <insert id="insert" parameterType="com.yeshi.fanli.entity.brand.BrandClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_class (bc_id,bc_name,bc_gclass_id,bc_state,bc_orderby,bc_create_time,bc_update_time) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{goodsClass.id,jdbcType=BIGINT},#{state,jdbcType=INTEGER},#{orderBy,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.brand.BrandClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_class

    <delete id="deleteByPrimaryKey"

            parameterType="java.lang.Long">delete from yeshi_ec_brand_class where bc_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.brand.BrandClass" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_brand_class (bc_id,bc_name,bc_gclass_id,bc_state,bc_orderby,bc_create_time,bc_update_time) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{goodsClass.id,jdbcType=BIGINT},#{state,jdbcType=INTEGER},#{orderBy,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.brand.BrandClass" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_brand_class

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">bc_id,</if>

      <if test="name != null">bc_name,</if>

@@ -30,7 +33,8 @@
      <if test="orderBy != null">bc_orderby,</if>

      <if test="createTime != null">bc_create_time,</if>

      <if test="updateTime != null">bc_update_time,</if>

    </trim>values

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="name != null">#{name,jdbcType=VARCHAR},</if>

@@ -41,8 +45,10 @@
      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

    </trim>

  </insert>

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.brand.BrandClass">update yeshi_ec_brand_class set bc_name = #{name,jdbcType=VARCHAR},bc_gclass_id = #{goodsClass.id,jdbcType=BIGINT},bc_state = #{state,jdbcType=INTEGER},bc_orderby = #{orderBy,jdbcType=INTEGER},bc_create_time = #{createTime,jdbcType=TIMESTAMP},bc_update_time = #{updateTime,jdbcType=TIMESTAMP} where bc_id = #{id,jdbcType=BIGINT}</update>

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.brand.BrandClass">update yeshi_ec_brand_class

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.brand.BrandClass">update yeshi_ec_brand_class set bc_name = #{name,jdbcType=VARCHAR},bc_gclass_id = #{goodsClass.id,jdbcType=BIGINT},bc_state = #{state,jdbcType=INTEGER},bc_orderby = #{orderBy,jdbcType=INTEGER},bc_create_time = #{createTime,jdbcType=TIMESTAMP},bc_update_time = #{updateTime,jdbcType=TIMESTAMP} where bc_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.brand.BrandClass">update

        yeshi_ec_brand_class

    <set>

      <if test="name != null">bc_name=#{name,jdbcType=VARCHAR},</if>

      <if test="goodsClass != null">bc_gclass_id=#{goodsClass.id,jdbcType=BIGINT},</if>

@@ -50,18 +56,23 @@
      <if test="orderBy != null">bc_orderby=#{orderBy,jdbcType=INTEGER},</if>

      <if test="createTime != null">bc_create_time=#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">bc_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

    </set> where bc_id = #{id,jdbcType=BIGINT}

        </set>

        where bc_id = #{id,jdbcType=BIGINT}

  </update>

  

  <delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">

        delete from yeshi_ec_brand_class WHERE bc_id in

        <foreach collection="list" item="item" open="(" close=")"

            separator=",">#{item}</foreach>

                 separator=",">#{item}

        </foreach>

   </delete>

  

  <select id="listEffective" resultMap="BaseResultMap">

      SELECT * FROM yeshi_ec_brand_class 
      SELECT * FROM yeshi_ec_brand_class left join  yeshi_ec_brand_class_system_map m on m.sm_brand_class_id=bc_id

    WHERE bc_state = 1

    <if test="system!=null">

        AND sm_system=#{system}

    </if>

    ORDER BY bc_orderby

  </select>

  

@@ -70,7 +81,9 @@
  </select>

  

   <select id="getByAdjoinOrder" resultMap="BaseResultMap">

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

        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_brand_class

        WHERE  1=1

        <if test="type == -1">

            AND bc_orderby <![CDATA[<]]> #{order}  

@@ -85,8 +98,10 @@
   </select>

  

   <select id="listQuery" resultMap="BaseResultMap">

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

      WHERE 1=1 
        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_brand_class left join  yeshi_ec_brand_class_system_map m on m.sm_brand_class_id=bc_id

        WHERE 1=1   AND sm_system=#{system}

          <if test="key != null and key !='' ">

              AND bc_name LIKE '%${key}%'

          </if>

@@ -98,8 +113,8 @@
  </select>

  

  <select id="countQuery" resultType="java.lang.Long">

      SELECT IFNULL(COUNT(bc_id),0) FROM yeshi_ec_brand_class

      WHERE 1=1 
        SELECT IFNULL(COUNT(bc_id),0) FROM yeshi_ec_brand_class  left join  yeshi_ec_brand_class_system_map m on m.sm_brand_class_id=bc_id

        WHERE 1=1    AND sm_system=#{system}

          <if test="key != null and key !='' ">

              AND bc_name LIKE '%${key}%'

          </if>


 fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandClassSystemMapMapper.xml

New file
@@ -0,0 +1,60 @@
<?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.brand.BrandClassSystemMapMapper">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.brand.BrandClassSystemMap">
        <id column="sm_id" property="id" jdbcType="BIGINT"/>
        <result column="sm_system" property="system" jdbcType="VARCHAR"/>
        <result column="sm_create_time" property="createTime" jdbcType="TIMESTAMP"/>
        <association property="brandClass" javaType="com.yeshi.fanli.entity.brand.BrandClass"
                     column="sm_brand_class_id">
            <id column="sm_brand_class_id" property="id" jdbcType="BIGINT"></id>
        </association>
    </resultMap>
    <sql id="Base_Column_List">sm_id,sm_system,sm_brand_class_id,sm_create_time</sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
        <include refid="Base_Column_List"/>from yeshi_ec_brand_class_system_map where sm_id = #{id,jdbcType=BIGINT}
    </select>


    <select id="listByClassIdsAndSystem" resultMap="BaseResultMap" >select
        <include refid="Base_Column_List"/>from yeshi_ec_brand_class_system_map where sm_system = #{system}
        <if test="classIdList!=null">
            <foreach collection="" item="classId" separator=" or " open=" and (" close=")">
                sm_brand_class_id=#{classId}
            </foreach>
        </if>
    </select>

    <delete id="deleteByPrimaryKey"
            parameterType="java.lang.Long">delete from yeshi_ec_brand_class_system_map where sm_id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.brand.BrandClassSystemMap" useGeneratedKeys="true"
            keyProperty="id">insert into yeshi_ec_brand_class_system_map (sm_id,sm_system,sm_brand_class_id,sm_create_time) values (#{id,jdbcType=BIGINT},#{system,jdbcType=VARCHAR},#{brandClass.id,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})</insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.brand.BrandClassSystemMap"
            useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_class_system_map
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">sm_id,</if>
            <if test="system != null">sm_system,</if>
            <if test="brandClass != null">sm_brand_class_id,</if>
            <if test="createTime != null">sm_create_time,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="system != null">#{system,jdbcType=VARCHAR},</if>
            <if test="brandClass != null">#{brandClass.id,jdbcType=BIGINT},</if>
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey"
            parameterType="com.yeshi.fanli.entity.brand.BrandClassSystemMap">update yeshi_ec_brand_class_system_map set sm_system = #{system,jdbcType=VARCHAR},sm_brand_class_id = #{brandClass.id,jdbcType=BIGINT},sm_create_time = #{createTime,jdbcType=TIMESTAMP} where sm_id = #{id,jdbcType=BIGINT}</update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.brand.BrandClassSystemMap">update
        yeshi_ec_brand_class_system_map
        <set>
            <if test="system != null">sm_system=#{system,jdbcType=VARCHAR},</if>
            <if test="brandClass != null">sm_brand_class_id=#{brandClass.id,jdbcType=BIGINT},</if>
            <if test="createTime != null">sm_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
        </set>
        where sm_id = #{id,jdbcType=BIGINT}
    </update>
</mapper>

 fanli/src/main/java/com/yeshi/fanli/mapping/common/CommonConfigMapper.xml

New file
@@ -0,0 +1,59 @@
<?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.common.CommonConfigMapper">
    <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.config.CommonConfig">
        <id column="id" property="id" jdbcType="BIGINT"/>
        <result column="key" property="key" jdbcType="VARCHAR"/>
        <result column="value" property="value" jdbcType="VARCHAR"/>
        <result column="name" property="name" jdbcType="VARCHAR"/>
        <result column="beizhu" property="beizhu" jdbcType="VARCHAR"/>
        <result column="createtime" property="createtime" jdbcType="VARCHAR"/>
    </resultMap>
    <sql id="Base_Column_List">id,key,value,name,beizhu,createtime</sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
        <include refid="Base_Column_List"/>from yeshi_ec_common_config where id = #{id,jdbcType=BIGINT}
    </select>

    <select id="selectByKey" resultMap="BaseResultMap" parameterType="java.lang.String">select
        <include refid="Base_Column_List"/>from yeshi_ec_common_config where `key` = #{0}
    </select>

    <delete id="deleteByPrimaryKey"
            parameterType="java.lang.Long">delete from yeshi_ec_common_config where id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.config.CommonConfig" useGeneratedKeys="true"
            keyProperty="id">insert into yeshi_ec_common_config (id,key,value,name,beizhu,createtime) values (#{id,jdbcType=BIGINT},#{key,jdbcType=VARCHAR},#{value,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},#{beizhu,jdbcType=VARCHAR},#{createtime,jdbcType=VARCHAR})</insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.config.CommonConfig" useGeneratedKeys="true"
            keyProperty="id">insert into yeshi_ec_common_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="key != null">key,</if>
            <if test="value != null">value,</if>
            <if test="name != null">name,</if>
            <if test="beizhu != null">beizhu,</if>
            <if test="createtime != null">createtime,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="key != null">#{key,jdbcType=VARCHAR},</if>
            <if test="value != null">#{value,jdbcType=VARCHAR},</if>
            <if test="name != null">#{name,jdbcType=VARCHAR},</if>
            <if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
            <if test="createtime != null">#{createtime,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey"
            parameterType="com.yeshi.fanli.entity.config.CommonConfig">update yeshi_ec_common_config set key = #{key,jdbcType=VARCHAR},value = #{value,jdbcType=VARCHAR},name = #{name,jdbcType=VARCHAR},beizhu = #{beizhu,jdbcType=VARCHAR},createtime = #{createtime,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT}</update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.config.CommonConfig">update
        yeshi_ec_common_config
        <set>
            <if test="key != null">key=#{key,jdbcType=VARCHAR},</if>
            <if test="value != null">value=#{value,jdbcType=VARCHAR},</if>
            <if test="name != null">name=#{name,jdbcType=VARCHAR},</if>
            <if test="beizhu != null">beizhu=#{beizhu,jdbcType=VARCHAR},</if>
            <if test="createtime != null">createtime=#{createtime,jdbcType=VARCHAR},</if>
        </set>
        where id = #{id,jdbcType=BIGINT}
    </update>
</mapper>

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

@@ -16,8 +16,9 @@
        <result column="an_updatetime" property="updateTime" jdbcType="TIMESTAMP" />

        <result column="an_begin_time" property="beginTime" jdbcType="TIMESTAMP"/>

           <result column="an_end_time" property="endTime" jdbcType="TIMESTAMP"/>

        <result column="an_system" property="system" jdbcType="VARCHAR" />

    </resultMap>

    <sql id="Base_Column_List">an_id,an_type,an_show,an_can_close,an_content,an_content_url,an_md5,an_createtime,an_begin_time,an_end_time,an_updatetime

    <sql id="Base_Column_List">an_id,an_type,an_show,an_can_close,an_content,an_content_url,an_md5,an_createtime,an_begin_time,an_end_time,an_updatetime,an_system

    </sql>

    <select id="selectByPrimaryKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long">

@@ -30,12 +31,12 @@
        parameterType="java.lang.String">

        select

        <include refid="Base_Column_List" />

        from yeshi_ec_apppage_notification where an_type = #{0}

        from yeshi_ec_apppage_notification where an_type = #{type} and an_system=#{system}

    </select>



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

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

        WHERE an_type = #{0} AND an_show = 1 
        WHERE an_type = #{type} AND an_system=#{system} AND an_show = 1

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

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

    </select>

@@ -47,9 +48,9 @@
    <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.AppPageNotification"

        useGeneratedKeys="true" keyProperty="id">insert into

        yeshi_ec_apppage_notification

        (an_id,an_type,an_show,an_can_close,an_content,an_content_url,an_md5,an_createtime,an_begin_time,an_end_time,an_updatetime)

        (an_id,an_type,an_show,an_can_close,an_content,an_content_url,an_md5,an_createtime,an_begin_time,an_end_time,an_updatetime,an_system)

        values

        (#{id,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{show,jdbcType=BOOLEAN},#{canClose,jdbcType=BOOLEAN},#{content,jdbcType=VARCHAR},#{contentUrl,jdbcType=VARCHAR},#{md5,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{beginTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})

        (#{id,jdbcType=BIGINT},#{type,jdbcType=VARCHAR},#{show,jdbcType=BOOLEAN},#{canClose,jdbcType=BOOLEAN},#{content,jdbcType=VARCHAR},#{contentUrl,jdbcType=VARCHAR},#{md5,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{beginTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})

    </insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.AppPageNotification"

        useGeneratedKeys="true" keyProperty="id">

@@ -66,6 +67,7 @@
            <if test="beginTime != null">an_begin_time,</if>

             <if test="endTime != null">an_end_time,</if>

            <if test="updateTime != null">an_updatetime,</if>

            <if test="system != null">an_system,</if>

        </trim>

        values

        <trim prefix="(" suffix=")" suffixOverrides=",">

@@ -80,6 +82,7 @@
            <if test="beginTime != null">#{beginTime,jdbcType=TIMESTAMP},</if>

             <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>

            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

        </trim>

    </insert>

    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.help.AppPageNotification">update

@@ -91,7 +94,8 @@
        #{contentUrl,jdbcType=VARCHAR},an_md5 =

        #{md5,jdbcType=VARCHAR},an_createtime =

        #{createTime,jdbcType=TIMESTAMP},an_begin_time = #{beginTime,jdbcType=TIMESTAMP},an_end_time = #{endTime,jdbcType=TIMESTAMP},an_updatetime =

        #{updateTime,jdbcType=TIMESTAMP} where an_id = #{id,jdbcType=BIGINT}

        #{updateTime,jdbcType=TIMESTAMP},an_system =

        #{system,jdbcType=VARCHAR} where an_id = #{id,jdbcType=BIGINT}

    </update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.AppPageNotification">

        update yeshi_ec_apppage_notification

@@ -106,6 +110,7 @@
            <if test="beginTime != null">an_begin_time=#{beginTime,jdbcType=TIMESTAMP},</if>

             <if test="endTime != null">an_end_time=#{endTime,jdbcType=TIMESTAMP},</if>

            <if test="updateTime != null">an_updatetime=#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">an_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where an_id = #{id,jdbcType=BIGINT}

    </update>

@@ -113,7 +118,7 @@
    

    <select id="listQuery" resultMap="BaseResultMap">

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

        WHERE 1=1

        WHERE 1=1 AND an_system=#{system}

           <if test='key != null and key != ""'>

                  AND (an_type like '%${key}%' or an_content like '%${key}%') 

           </if>

@@ -129,7 +134,7 @@
   

   <select id="countQuery" resultType="java.lang.Long">

        SELECT IFNULL(count(an_id),0)  FROM yeshi_ec_apppage_notification 

        WHERE 1=1

        WHERE 1=1 AND an_system=#{system}

            <if test='key != null and key != ""'>

                  AND (an_type like '%${key}%' or an_content like '%${key}%') 

           </if>


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

@@ -11,6 +11,7 @@
    <result column="h_end_time" property="endTime" jdbcType="TIMESTAMP"/>

    <result column="h_createtime" property="createtime" jdbcType="TIMESTAMP"/>

    <result column="h_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>

        <result column="h_system" property="system" jdbcType="VARCHAR"/>

    <association property="helpClass" column="h_cid"

            javaType="com.yeshi.fanli.entity.bus.help.HelpClass">

            <id column="h_cid" property="id" jdbcType="BIGINT" />

@@ -18,13 +19,16 @@
    </association>

  </resultMap>

  

  <sql id="Base_Column_List">h_id,h_title,h_weight,h_state,h_cid,h_start_time,h_end_time,h_createtime,h_updatetime</sql>

    <sql id="Base_Column_List">h_id,h_title,h_weight,h_state,h_cid,h_start_time,h_end_time,h_createtime,h_updatetime,h_system</sql>

  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}

  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}</delete>

  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_center (h_id,h_title,h_weight,h_state,h_cid,h_start_time,h_end_time,h_createtime,h_updatetime) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{helpClass.id,jdbcType=BIGINT},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_center

    <delete id="deleteByPrimaryKey"

            parameterType="java.lang.Long">delete from yeshi_ec_help_center where h_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_help_center (h_id,h_title,h_weight,h_state,h_cid,h_start_time,h_end_time,h_createtime,h_updatetime,h_system) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{weight,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{helpClass.id,jdbcType=BIGINT},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_help_center

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">h_id,</if>

      <if test="title != null">h_title,</if>

@@ -35,7 +39,9 @@
      <if test="endTime != null">h_end_time,</if>

      <if test="createtime != null">h_createtime,</if>

      <if test="updatetime != null">h_updatetime,</if>

    </trim>values

            <if test="system != null">h_system,</if>

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="title != null">#{title,jdbcType=VARCHAR},</if>

@@ -46,10 +52,13 @@
      <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>

      <if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if>

      <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

    </trim>

  </insert>

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center set h_title = #{title,jdbcType=VARCHAR},h_weight = #{weight,jdbcType=INTEGER},h_state = #{state,jdbcType=INTEGER},h_cid = #{helpClass.id,jdbcType=BIGINT},h_start_time = #{startTime,jdbcType=TIMESTAMP},h_end_time = #{endTime,jdbcType=TIMESTAMP},h_createtime = #{createtime,jdbcType=TIMESTAMP},h_updatetime = #{updatetime,jdbcType=TIMESTAMP} where h_id = #{id,jdbcType=BIGINT}</update>

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update yeshi_ec_help_center set h_title = #{title,jdbcType=VARCHAR},h_weight = #{weight,jdbcType=INTEGER},h_state = #{state,jdbcType=INTEGER},h_cid = #{helpClass.id,jdbcType=BIGINT},h_start_time = #{startTime,jdbcType=TIMESTAMP},h_end_time = #{endTime,jdbcType=TIMESTAMP},h_createtime = #{createtime,jdbcType=TIMESTAMP},h_updatetime = #{updatetime,jdbcType=TIMESTAMP},h_system = #{system,jdbcType=VARCHAR} where h_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpCenter">update

        yeshi_ec_help_center

    <set>

      <if test="title != null">h_title=#{title,jdbcType=VARCHAR},</if>

      <if test="weight != null">h_weight=#{weight,jdbcType=INTEGER},</if>

@@ -59,13 +68,15 @@
      <if test="endTime != null">h_end_time=#{endTime,jdbcType=TIMESTAMP},</if>

      <if test="createtime != null">h_createtime=#{createtime,jdbcType=TIMESTAMP},</if>

      <if test="updatetime != null">h_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>

    </set> where h_id = #{id,jdbcType=BIGINT}

            <if test="system != null">h_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where h_id = #{id,jdbcType=BIGINT}

  </update>

  

   <select id="query" resultMap="BaseResultMap">

    SELECT *  FROM yeshi_ec_help_center     ht

    LEFT JOIN  yeshi_ec_help_class hc ON ht.h_cid = hc.hc_id

        WHERE     <![CDATA[1>0]]>

        WHERE    <![CDATA[1>0]]>  AND h_system=#{system}

       <if test='key != null and key != ""'>

              AND ht.h_title like '%${key}%'

       </if>

@@ -113,11 +124,13 @@
        <if test='state != null'>

              AND ht.h_state = #{state}

       </if>



        AND h_system=#{system}

    </select>

    

   <select id="listValid" resultMap="BaseResultMap">

    SELECT h_id, h_title FROM yeshi_ec_help_center    

    WHERE h_id > #{pageId} AND h_state = 1

        WHERE h_id > #{pageId} AND h_state = 1 AND h_system=#{system}

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

          AND IF(h_end_time IS NULL,TRUE, h_end_time >=NOW())

      <if test='key != null and key != ""'>


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

@@ -12,14 +12,18 @@
    <result column="hc_end_time" property="endTime" jdbcType="TIMESTAMP"/>

    <result column="hc_create_time" property="createTime" jdbcType="TIMESTAMP"/>

    <result column="hc_update_time" property="updateTime" jdbcType="TIMESTAMP"/>

        <result column="hc_system" property="system" jdbcType="VARCHAR"/>

  </resultMap>

  <sql id="Base_Column_List">hc_id,hc_name,hc_picture,hc_sort,hc_show_state,hc_start_time,hc_end_time,hc_create_time,hc_update_time</sql>

    <sql id="Base_Column_List">hc_id,hc_name,hc_picture,hc_sort,hc_show_state,hc_start_time,hc_end_time,hc_create_time,hc_update_time,hc_system</sql>

  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_help_class where hc_id = #{id,jdbcType=BIGINT}

  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_help_class where hc_id = #{id,jdbcType=BIGINT}</delete>

  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_class (hc_id,hc_name,hc_picture,hc_sort,hc_show_state,hc_start_time,hc_end_time,hc_create_time,hc_update_time) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{sort,jdbcType=INTEGER},#{showState,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_help_class

    <delete id="deleteByPrimaryKey"

            parameterType="java.lang.Long">delete from yeshi_ec_help_class where hc_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_help_class (hc_id,hc_name,hc_picture,hc_sort,hc_show_state,hc_start_time,hc_end_time,hc_create_time,hc_update_time,hc_system) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{sort,jdbcType=INTEGER},#{showState,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_help_class

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">hc_id,</if>

      <if test="name != null">hc_name,</if>

@@ -30,7 +34,9 @@
      <if test="endTime != null">hc_end_time,</if>

      <if test="createTime != null">hc_create_time,</if>

      <if test="updateTime != null">hc_update_time,</if>

    </trim>values

            <if test="system != null">hc_system,</if>

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="name != null">#{name,jdbcType=VARCHAR},</if>

@@ -41,10 +47,13 @@
      <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>

      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

    </trim>

  </insert>

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass">update yeshi_ec_help_class set hc_name = #{name,jdbcType=VARCHAR},hc_picture = #{picture,jdbcType=VARCHAR},hc_sort = #{sort,jdbcType=INTEGER},hc_show_state = #{showState,jdbcType=INTEGER},hc_start_time = #{startTime,jdbcType=TIMESTAMP},hc_end_time = #{endTime,jdbcType=TIMESTAMP},hc_create_time = #{createTime,jdbcType=TIMESTAMP},hc_update_time = #{updateTime,jdbcType=TIMESTAMP} where hc_id = #{id,jdbcType=BIGINT}</update>

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass">update yeshi_ec_help_class

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.bus.help.HelpClass">update yeshi_ec_help_class set hc_name = #{name,jdbcType=VARCHAR},hc_picture = #{picture,jdbcType=VARCHAR},hc_sort = #{sort,jdbcType=INTEGER},hc_show_state = #{showState,jdbcType=INTEGER},hc_start_time = #{startTime,jdbcType=TIMESTAMP},hc_end_time = #{endTime,jdbcType=TIMESTAMP},hc_create_time = #{createTime,jdbcType=TIMESTAMP},hc_update_time = #{updateTime,jdbcType=TIMESTAMP},hc_system = #{system,jdbcType=VARCHAR} where hc_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.help.HelpClass">update

        yeshi_ec_help_class

    <set>

      <if test="name != null">hc_name=#{name,jdbcType=VARCHAR},</if>

      <if test="picture != null">hc_picture=#{picture,jdbcType=VARCHAR},</if>

@@ -54,18 +63,23 @@
      <if test="endTime != null">hc_end_time=#{endTime,jdbcType=TIMESTAMP},</if>

      <if test="createTime != null">hc_create_time=#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">hc_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

    </set> where hc_id = #{id,jdbcType=BIGINT}

            <if test="system != null">hc_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where hc_id = #{id,jdbcType=BIGINT}

  </update>

  

   <delete id="deleteByPrimaryKeyBatch" parameterType="java.util.List">

    delete from yeshi_ec_help_class WHERE hc_id in

    <foreach collection="list" item="item" open="(" close=")"

        separator=",">#{item}</foreach>

                 separator=",">#{item}

        </foreach>

   </delete>

  

   <select id="listQuery" resultMap="BaseResultMap">

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

        WHERE 1=1

        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_help_class

        WHERE 1=1 AND hc_system=#{system}

           <if test='key != null and key != ""'>

                  AND (hc_name like '%${key}%') 

           </if>

@@ -78,7 +92,7 @@
   

   <select id="countQuery" resultType="java.lang.Long">

        SELECT IFNULL(count(hc_id),0)  FROM yeshi_ec_help_class 

        WHERE 1=1

        WHERE 1=1 AND hc_system=#{system}

           <if test='key != null and key != ""'>

                  AND (hc_name like '%${key}%') 

           </if>

@@ -92,8 +106,10 @@
   </select>

  

   <select id="getChangeOrder" resultMap="BaseResultMap">

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

        WHERE 1=1

        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_help_class

        WHERE 1=1 AND hc_system=#{system}

        <if test="type == -1">

            <![CDATA[and hc_sort < #{sort}]]>  

            order by hc_sort desc

@@ -108,14 +124,14 @@
   

   <select id="getClassByState" resultMap="BaseResultMap">

        SELECT hc_id,hc_name,hc_picture FROM yeshi_ec_help_class

        WHERE  hc_show_state = #{state}  
        WHERE  hc_show_state = #{state}  AND hc_system=#{system}

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

              AND IF(hc_end_time IS NULL,TRUE, hc_end_time >=NOW())

           ORDER BY hc_sort 

   </select>

   

    <select id="getProvidedClass" resultMap="BaseResultMap">

        SELECT hc_id,hc_name,hc_picture  FROM yeshi_ec_help_class

        SELECT hc_id,hc_name,hc_picture  FROM yeshi_ec_help_class where hc_system=#{system}

           ORDER BY hc_sort 

   </select>

   


 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/HomeNavbarMapper.xml

@@ -21,14 +21,18 @@
    <result column="br_params" property="params" jdbcType="VARCHAR"/>

    <result column="br_createtime" property="createtime" jdbcType="TIMESTAMP"/>

    <result column="br_updatetime" property="updatetime" jdbcType="TIMESTAMP"/>

    <result column="br_type" property="type" typeHandler="com.yeshi.fanli.util.mybatishandler.NavbarTypeEnumHandler"/>

        <result column="br_type" property="type"

                typeHandler="com.yeshi.fanli.util.mybatishandler.NavbarTypeEnumHandler"/>



    

    <result column="sex" property="sex" jdbcType="INTEGER"/>



        <result column="br_system" property="system" jdbcType="VARCHAR"/>

    

  </resultMap>

  

  

  <sql id="Base_Column_List">br_id,br_name,br_picture,br_class_id,br_swiper_banner_id,br_url,br_type,br_orderby,br_order_man,br_order_woman,br_start_time,br_end_time,br_state,br_is_default,br_is_fixed,br_params,br_createtime,br_updatetime</sql>

    <sql id="Base_Column_List">br_id,br_name,br_picture,br_class_id,br_swiper_banner_id,br_url,br_type,br_orderby,br_order_man,br_order_woman,br_start_time,br_end_time,br_state,br_is_default,br_is_fixed,br_params,br_createtime,br_updatetime,br_system</sql>

  

  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_home_navbar where br_id = #{id,jdbcType=BIGINT}

@@ -101,6 +105,7 @@
        SELECT h.*,c.sex AS sex  FROM yeshi_ec_home_navbar h

        LEFT JOIN `yeshi_ec_class` c ON c.`id` = h.`br_class_id`

        WHERE 1=1

        AND br_system=#{system}

           <if test='key != null and key != ""'>

                  AND (h.br_name like '%${key}%') 

           </if>

@@ -126,6 +131,7 @@
        SELECT IFNULL(count(br_id),0)  FROM yeshi_ec_home_navbar h

        LEFT JOIN `yeshi_ec_class` c ON c.`id` = h.`br_class_id`

        WHERE 1=1

        AND br_system=#{system}

           <if test='key != null and key != ""'>

                  AND (h.br_name like '%${key}%') 

           </if>

@@ -149,7 +155,7 @@
   <select id="listQueryEffective" resultMap="BaseResultMap">

      SELECT h.*,c.sex AS sex FROM yeshi_ec_home_navbar h

      LEFT JOIN `yeshi_ec_class` c ON c.`id` = h.`br_class_id`

      WHERE h.br_state = 1

      WHERE h.br_state = 1   AND br_system=#{system}

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

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

            ORDER BY h.br_orderby 

@@ -159,7 +165,7 @@
   <select id="listQueryDefaultNavbar" resultMap="BaseResultMap">

      SELECT h.*,c.sex AS sex FROM    yeshi_ec_home_navbar h

      LEFT JOIN `yeshi_ec_class` c ON c.`id` = h.`br_class_id`

      WHERE h.br_state = 1 AND br_is_default = 1

        WHERE br_system=#{system} AND h.br_state = 1 AND br_is_default = 1

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

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

               <!-- 通用版 -->

@@ -181,7 +187,7 @@
   

   <select id="listQueryFixedNavbar" resultMap="BaseResultMap">

      SELECT * FROM    yeshi_ec_home_navbar 

      WHERE br_state = 1 AND br_is_default = 1 AND br_is_fixed = 1

      WHERE br_state = 1   AND br_system=#{system} AND br_is_default = 1 AND br_is_fixed = 1

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

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

      ORDER BY br_orderby

@@ -189,23 +195,26 @@
   

   <select id="getEffectiveByClassId" resultMap="BaseResultMap">

      SELECT * FROM    yeshi_ec_home_navbar 

      WHERE br_state = 1  AND br_class_id = #{classId}

      WHERE br_state = 1   AND br_system=#{system} AND br_class_id = #{classId}

      LIMIT 1

   </select>

      

   <delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">

        delete from yeshi_ec_home_navbar WHERE br_id in

        <foreach collection="list" item="item" open="(" close=")"

            separator=",">#{item}</foreach>

                 separator=",">#{item}

        </foreach>

   </delete>

  

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

      delete from yeshi_ec_home_navbar where br_id = #{id,jdbcType=BIGINT}

  </delete>

  

  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_home_navbar (br_id,br_name,br_picture,br_class_id,br_swiper_banner_id,br_url,br_type,br_orderby,br_order_man,br_order_woman,br_start_time,br_end_time,br_state,br_is_default,br_is_fixed,br_params,br_createtime,br_updatetime) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{classId,jdbcType=BIGINT},#{swiperBannerId,jdbcType=BIGINT},#{url,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{orderMan,jdbcType=INTEGER},#{orderWoman,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER},#{isDefault,jdbcType=VARCHAR},#{isFixed,jdbcType=VARCHAR},#{params,jdbcType=VARCHAR},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP})</insert>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_home_navbar (br_id,br_name,br_picture,br_class_id,br_swiper_banner_id,br_url,br_type,br_orderby,br_order_man,br_order_woman,br_start_time,br_end_time,br_state,br_is_default,br_is_fixed,br_params,br_createtime,br_updatetime,br_system) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{classId,jdbcType=BIGINT},#{swiperBannerId,jdbcType=BIGINT},#{url,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{orderby,jdbcType=INTEGER},#{orderMan,jdbcType=INTEGER},#{orderWoman,jdbcType=INTEGER},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER},#{isDefault,jdbcType=VARCHAR},#{isFixed,jdbcType=VARCHAR},#{params,jdbcType=VARCHAR},#{createtime,jdbcType=TIMESTAMP},#{updatetime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})</insert>

  

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_home_navbar

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar"

            useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_home_navbar

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">br_id,</if>

      <if test="name != null">br_name,</if>

@@ -225,7 +234,9 @@
      <if test="params != null">br_params,</if>

      <if test="createtime != null">br_createtime,</if>

      <if test="updatetime != null">br_updatetime,</if>

    </trim>values

            <if test="system != null">br_system,</if>

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="name != null">#{name,jdbcType=VARCHAR},</if>

@@ -245,12 +256,15 @@
      <if test="params != null">#{params,jdbcType=VARCHAR},</if>

      <if test="createtime != null">#{createtime,jdbcType=TIMESTAMP},</if>

      <if test="updatetime != null">#{updatetime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

    </trim>

  </insert>

  

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar">update yeshi_ec_home_navbar set br_name = #{name,jdbcType=VARCHAR},br_picture = #{picture,jdbcType=VARCHAR},br_class_id = #{classId,jdbcType=BIGINT},br_swiper_banner_id = #{swiperBannerId,jdbcType=BIGINT},br_url = #{url,jdbcType=VARCHAR},br_type = #{type,jdbcType=VARCHAR},br_orderby = #{orderby,jdbcType=INTEGER},br_order_man = #{orderMan,jdbcType=INTEGER},br_order_woman = #{orderWoman,jdbcType=INTEGER},br_start_time = #{startTime,jdbcType=TIMESTAMP},br_end_time = #{endTime,jdbcType=TIMESTAMP},br_state = #{state,jdbcType=INTEGER},br_is_default = #{isDefault,jdbcType=VARCHAR},br_is_fixed = #{isFixed,jdbcType=VARCHAR},br_params = #{params,jdbcType=VARCHAR},br_createtime = #{createtime,jdbcType=TIMESTAMP},br_updatetime = #{updatetime,jdbcType=TIMESTAMP} where br_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar">update yeshi_ec_home_navbar set br_name = #{name,jdbcType=VARCHAR},br_picture = #{picture,jdbcType=VARCHAR},br_class_id = #{classId,jdbcType=BIGINT},br_swiper_banner_id = #{swiperBannerId,jdbcType=BIGINT},br_url = #{url,jdbcType=VARCHAR},br_type = #{type,jdbcType=VARCHAR},br_orderby = #{orderby,jdbcType=INTEGER},br_order_man = #{orderMan,jdbcType=INTEGER},br_order_woman = #{orderWoman,jdbcType=INTEGER},br_start_time = #{startTime,jdbcType=TIMESTAMP},br_end_time = #{endTime,jdbcType=TIMESTAMP},br_state = #{state,jdbcType=INTEGER},br_is_default = #{isDefault,jdbcType=VARCHAR},br_is_fixed = #{isFixed,jdbcType=VARCHAR},br_params = #{params,jdbcType=VARCHAR},br_createtime = #{createtime,jdbcType=TIMESTAMP},br_updatetime = #{updatetime,jdbcType=TIMESTAMP} ,br_system = #{system,jdbcType=VARCHAR} where br_id = #{id,jdbcType=BIGINT}</update>

 

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar">update yeshi_ec_home_navbar

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.homemodule.HomeNavbar">update

        yeshi_ec_home_navbar

    <set>

      <if test="name != null">br_name=#{name,jdbcType=VARCHAR},</if>

      <if test="picture != null">br_picture=#{picture,jdbcType=VARCHAR},</if>

@@ -269,6 +283,8 @@
      <if test="params != null">br_params=#{params,jdbcType=VARCHAR},</if>

      <if test="createtime != null">br_createtime=#{createtime,jdbcType=TIMESTAMP},</if>

      <if test="updatetime != null">br_updatetime=#{updatetime,jdbcType=TIMESTAMP},</if>

    </set> where br_id = #{id,jdbcType=BIGINT}

            <if test="system != null">br_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where br_id = #{id,jdbcType=BIGINT}

  </update>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/mapping/push/PushCouponMapper.xml

@@ -17,14 +17,18 @@
    <result column="pc_push_time" property="pushTime" jdbcType="TIMESTAMP"/>

    <result column="pc_create_time" property="createTime" jdbcType="TIMESTAMP"/>

    <result column="pc_update_time" property="updateTime" jdbcType="TIMESTAMP"/>

        <result column="pc_system" property="system" jdbcType="VARCHAR"/>

  </resultMap>

  <sql id="Base_Column_List">pc_id,pc_title,pc_content,pc_amount,pc_percent,pc_uids,pc_versions,pc_remark,pc_start_time,pc_end_time,pc_pushed,pc_push_time,pc_create_time,pc_update_time</sql>

    <sql id="Base_Column_List">pc_id,pc_title,pc_content,pc_amount,pc_percent,pc_uids,pc_versions,pc_remark,pc_start_time,pc_end_time,pc_pushed,pc_push_time,pc_create_time,pc_update_time,pc_system</sql>

  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_push_coupon where pc_id = #{id,jdbcType=BIGINT}

  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_push_coupon where pc_id = #{id,jdbcType=BIGINT}</delete>

  <insert id="insert" parameterType="com.yeshi.fanli.entity.push.PushCoupon" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_push_coupon (pc_id,pc_title,pc_content,pc_amount,pc_percent,pc_uids,pc_versions,pc_remark,pc_start_time,pc_end_time,pc_pushed,pc_push_time,pc_create_time,pc_update_time) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{amount,jdbcType=INTEGER},#{percent,jdbcType=DECIMAL},#{uids,jdbcType=VARCHAR},#{versions,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{pushed,jdbcType=VARCHAR},#{pushTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.PushCoupon" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_push_coupon

    <delete id="deleteByPrimaryKey"

            parameterType="java.lang.Long">delete from yeshi_ec_push_coupon where pc_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.push.PushCoupon" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_push_coupon (pc_id,pc_title,pc_content,pc_amount,pc_percent,pc_uids,pc_versions,pc_remark,pc_start_time,pc_end_time,pc_pushed,pc_push_time,pc_create_time,pc_update_time,pc_system) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{amount,jdbcType=INTEGER},#{percent,jdbcType=DECIMAL},#{uids,jdbcType=VARCHAR},#{versions,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{pushed,jdbcType=VARCHAR},#{pushTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.PushCoupon" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_push_coupon

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">pc_id,</if>

      <if test="title != null">pc_title,</if>

@@ -40,7 +44,9 @@
      <if test="pushTime != null">pc_push_time,</if>

      <if test="createTime != null">pc_create_time,</if>

      <if test="updateTime != null">pc_update_time,</if>

    </trim>values

            <if test="system != null">pc_system,</if>

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="title != null">#{title,jdbcType=VARCHAR},</if>

@@ -56,10 +62,13 @@
      <if test="pushTime != null">#{pushTime,jdbcType=TIMESTAMP},</if>

      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

    </trim>

  </insert>

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.PushCoupon">update yeshi_ec_push_coupon set pc_title = #{title,jdbcType=VARCHAR},pc_content = #{content,jdbcType=VARCHAR},pc_amount = #{amount,jdbcType=INTEGER},pc_percent = #{percent,jdbcType=DECIMAL},pc_uids = #{uids,jdbcType=VARCHAR},pc_versions = #{versions,jdbcType=VARCHAR},pc_remark = #{remark,jdbcType=VARCHAR},pc_start_time = #{startTime,jdbcType=TIMESTAMP},pc_end_time = #{endTime,jdbcType=TIMESTAMP},pc_pushed = #{pushed,jdbcType=VARCHAR},pc_push_time = #{pushTime,jdbcType=TIMESTAMP},pc_create_time = #{createTime,jdbcType=TIMESTAMP},pc_update_time = #{updateTime,jdbcType=TIMESTAMP} where pc_id = #{id,jdbcType=BIGINT}</update>

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.PushCoupon">update yeshi_ec_push_coupon

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.push.PushCoupon">update yeshi_ec_push_coupon set pc_title = #{title,jdbcType=VARCHAR},pc_content = #{content,jdbcType=VARCHAR},pc_amount = #{amount,jdbcType=INTEGER},pc_percent = #{percent,jdbcType=DECIMAL},pc_uids = #{uids,jdbcType=VARCHAR},pc_versions = #{versions,jdbcType=VARCHAR},pc_remark = #{remark,jdbcType=VARCHAR},pc_start_time = #{startTime,jdbcType=TIMESTAMP},pc_end_time = #{endTime,jdbcType=TIMESTAMP},pc_pushed = #{pushed,jdbcType=VARCHAR},pc_push_time = #{pushTime,jdbcType=TIMESTAMP},pc_create_time = #{createTime,jdbcType=TIMESTAMP},pc_update_time = #{updateTime,jdbcType=TIMESTAMP},pc_system = #{system,jdbcType=VARCHAR} where pc_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.PushCoupon">update

        yeshi_ec_push_coupon

    <set>

      <if test="title != null">pc_title=#{title,jdbcType=VARCHAR},</if>

      <if test="content != null">pc_content=#{content,jdbcType=VARCHAR},</if>

@@ -74,11 +83,15 @@
      <if test="pushTime != null">pc_push_time=#{pushTime,jdbcType=TIMESTAMP},</if>

      <if test="createTime != null">pc_create_time=#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">pc_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

    </set> where pc_id = #{id,jdbcType=BIGINT}

            <if test="system != null">pc_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where pc_id = #{id,jdbcType=BIGINT}

  </update>

  <select id="listQuery" resultMap="BaseResultMap">

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

        WHERE 1=1

        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_push_coupon

        WHERE 1=1 AND pc_system=#{system}

           <if test='key != null and key != ""'>

                  AND pc_uids like '%${key}%'

           </if>

@@ -88,7 +101,7 @@
   

   <select id="countQuery" resultType="java.lang.Long">

        SELECT IFNULL(count(pc_id),0)  FROM yeshi_ec_push_coupon 

        WHERE 1=1

        WHERE 1=1 AND pc_system=#{system}

           <if test='key != null and key != ""'>

                   AND pc_uids like '%${key}%'

           </if>

@@ -96,7 +109,7 @@
    

    <select id="listQueryEffective" resultMap="BaseResultMap">

        SELECT * FROM yeshi_ec_push_coupon 

        WHERE pc_pushed = 1	
        WHERE pc_pushed = 1     AND pc_system=#{system}

            AND DATE_FORMAT(CURDATE(),'%Y%m%d') <![CDATA[ <= ]]>DATE_FORMAT(pc_end_time,'%Y%m%d');

    </select>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml

@@ -20,14 +20,18 @@
    <result column="pg_type" property="type" jdbcType="INTEGER"/>

    <result column="pg_other_id" property="otherId" jdbcType="VARCHAR"/>

    <result column="pg_scan_num" property="scanNum" jdbcType="INTEGER"/>

        <result column="pg_system" property="system" jdbcType="VARCHAR"/>

  </resultMap>

  <sql id="Base_Column_List">pg_id,pg_alert_title,pg_alert_content,pg_title,pg_content,pg_picture,pg_uid,pg_versions,pg_remark,pg_is_push,pg_control_time,pg_push_time,pg_createtime,pg_updatetime,pg_type,pg_other_id,pg_scan_num</sql>

    <sql id="Base_Column_List">pg_id,pg_alert_title,pg_alert_content,pg_title,pg_content,pg_picture,pg_uid,pg_versions,pg_remark,pg_is_push,pg_control_time,pg_push_time,pg_createtime,pg_updatetime,pg_type,pg_other_id,pg_scan_num,pg_system</sql>

  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_push_goods where pg_id = #{id,jdbcType=BIGINT}

  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_push_goods where pg_id = #{id,jdbcType=BIGINT}</delete>

  <insert id="insert" parameterType="com.yeshi.fanli.entity.push.PushGoods" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_push_goods (pg_id,pg_alert_title,pg_alert_content,pg_title,pg_content,pg_picture,pg_uid,pg_versions,pg_remark,pg_is_push,pg_control_time,pg_push_time,pg_createtime,pg_updatetime,pg_type,pg_other_id,pg_scan_num) values (#{id,jdbcType=BIGINT},#{alertTitle,jdbcType=VARCHAR},#{alertContent,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{uid,jdbcType=BIGINT},#{versions,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{isPush,jdbcType=INTEGER},#{controlTime,jdbcType=TIMESTAMP},#{pushTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{type,jdbcType=INTEGER},#{otherId,jdbcType=VARCHAR},#{scanNum,jdbcType=INTEGER})</insert>

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.PushGoods" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_push_goods

    <delete id="deleteByPrimaryKey"

            parameterType="java.lang.Long">delete from yeshi_ec_push_goods where pg_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.push.PushGoods" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_push_goods (pg_id,pg_alert_title,pg_alert_content,pg_title,pg_content,pg_picture,pg_uid,pg_versions,pg_remark,pg_is_push,pg_control_time,pg_push_time,pg_createtime,pg_updatetime,pg_type,pg_other_id,pg_scan_num,pg_system) values (#{id,jdbcType=BIGINT},#{alertTitle,jdbcType=VARCHAR},#{alertContent,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{picture,jdbcType=VARCHAR},#{uid,jdbcType=BIGINT},#{versions,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},#{isPush,jdbcType=INTEGER},#{controlTime,jdbcType=TIMESTAMP},#{pushTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{type,jdbcType=INTEGER},#{otherId,jdbcType=VARCHAR},#{scanNum,jdbcType=INTEGER},#{system,jdbcType=VARCHAR})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.PushGoods" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_push_goods

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">pg_id,</if>

      <if test="alertTitle != null">pg_alert_title,</if>

@@ -46,7 +50,9 @@
      <if test="type != null">pg_type,</if>

      <if test="otherId != null">pg_other_id,</if>

      <if test="scanNum != null">pg_scan_num,</if>

    </trim>values

            <if test="system != null">pg_system,</if>

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="alertTitle != null">#{alertTitle,jdbcType=VARCHAR},</if>

@@ -65,10 +71,13 @@
      <if test="type != null">#{type,jdbcType=INTEGER},</if>

      <if test="otherId != null">#{otherId,jdbcType=VARCHAR},</if>

      <if test="scanNum != null">#{scanNum,jdbcType=INTEGER},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

    </trim>

  </insert>

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.PushGoods">update yeshi_ec_push_goods set pg_alert_title = #{alertTitle,jdbcType=VARCHAR},pg_alert_content = #{alertContent,jdbcType=VARCHAR},pg_title = #{title,jdbcType=VARCHAR},pg_content = #{content,jdbcType=VARCHAR},pg_picture = #{picture,jdbcType=VARCHAR},pg_uid = #{uid,jdbcType=BIGINT},pg_versions = #{versions,jdbcType=VARCHAR},pg_remark = #{remark,jdbcType=VARCHAR},pg_is_push = #{isPush,jdbcType=INTEGER},pg_control_time = #{controlTime,jdbcType=TIMESTAMP},pg_push_time = #{pushTime,jdbcType=TIMESTAMP},pg_createtime = #{createTime,jdbcType=TIMESTAMP},pg_updatetime = #{updateTime,jdbcType=TIMESTAMP},pg_type = #{type,jdbcType=INTEGER},pg_other_id = #{otherId,jdbcType=VARCHAR},pg_scan_num = #{scanNum,jdbcType=INTEGER} where pg_id = #{id,jdbcType=BIGINT}</update>

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.PushGoods">update yeshi_ec_push_goods

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.push.PushGoods">update yeshi_ec_push_goods set pg_alert_title = #{alertTitle,jdbcType=VARCHAR},pg_alert_content = #{alertContent,jdbcType=VARCHAR},pg_title = #{title,jdbcType=VARCHAR},pg_content = #{content,jdbcType=VARCHAR},pg_picture = #{picture,jdbcType=VARCHAR},pg_uid = #{uid,jdbcType=BIGINT},pg_versions = #{versions,jdbcType=VARCHAR},pg_remark = #{remark,jdbcType=VARCHAR},pg_is_push = #{isPush,jdbcType=INTEGER},pg_control_time = #{controlTime,jdbcType=TIMESTAMP},pg_push_time = #{pushTime,jdbcType=TIMESTAMP},pg_createtime = #{createTime,jdbcType=TIMESTAMP},pg_updatetime = #{updateTime,jdbcType=TIMESTAMP},pg_type = #{type,jdbcType=INTEGER},pg_other_id = #{otherId,jdbcType=VARCHAR},pg_scan_num = #{scanNum,jdbcType=INTEGER},pg_system = #{system,jdbcType=VARCHAR} where pg_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.PushGoods">update

        yeshi_ec_push_goods

    <set>

      <if test="alertTitle != null">pg_alert_title=#{alertTitle,jdbcType=VARCHAR},</if>

      <if test="alertContent != null">pg_alert_content=#{alertContent,jdbcType=VARCHAR},</if>

@@ -86,23 +95,31 @@
      <if test="type != null">pg_type=#{type,jdbcType=INTEGER},</if>

      <if test="otherId != null">pg_other_id=#{otherId,jdbcType=VARCHAR},</if>

      <if test="scanNum != null">pg_scan_num=#{scanNum,jdbcType=INTEGER},</if>

    </set> where pg_id = #{id,jdbcType=BIGINT}

            <if test="system != null">pg_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where pg_id = #{id,jdbcType=BIGINT}

  </update>

  <delete id="deleteBatchByPrimaryKey"  parameterType="java.util.List">

        delete from yeshi_ec_push_goods where pg_id in

        <foreach item="item" collection="list" open="(" separator=","

            close=")">#{item}</foreach>

                 close=")">#{item}

        </foreach>

   </delete>

  

   <select id="listQuery" resultMap="BaseResultMap">

        SELECT <include refid="Base_Column_List" />,IF(`pg_control_time` IS NOT NULL,pg_control_time,`pg_createtime`) AS orderyTime  FROM yeshi_ec_push_goods

        SELECT<include refid="Base_Column_List"/>,IF(`pg_control_time` IS NOT NULL,pg_control_time,`pg_createtime`) AS

        orderyTime FROM yeshi_ec_push_goods

        WHERE 1=1

        AND pg_system=#{system}

           <if test='key != null and key != ""'>

                  AND (pg_alert_title like '%${key}%' or pg_alert_content like '%${key}%') 

           </if>

           <if test='state != null'>

                  AND pg_is_push = #{state}

           </if>







           ORDER BY orderyTime DESC

        LIMIT ${start},${count}

   </select>

@@ -110,6 +127,7 @@
   <select id="countQuery" resultType="java.lang.Long">

        SELECT IFNULL(count(pg_id),0)  FROM yeshi_ec_push_goods 

        WHERE 1=1

        AND pg_system=#{system}

           <if test='key != null and key != ""'>

                  AND (pg_alert_title like '%${key}%' or pg_alert_content like '%${key}%') 

           </if>

@@ -119,8 +137,10 @@
    </select>

    

   <select id="listHistoryByPushTime" resultMap="BaseResultMap">

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

        WHERE pg_is_push = 1   AND <![CDATA[pg_push_time >= #{pushTime}]]>

        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_push_goods

        WHERE pg_is_push = 1   AND pg_system=#{system} AND <![CDATA[pg_push_time >= #{pushTime}]]>

              AND (pg_uid is null <if test='uid != null'>or pg_uid = #{uid} </if>)

           ORDER BY pg_push_time desc 

        LIMIT ${start},${count}

@@ -128,20 +148,23 @@
   

   <select id="countHistoryByPushTime" resultType="java.lang.Long">

        SELECT IFNULL(count(pg_id),0)  FROM yeshi_ec_push_goods

        WHERE pg_is_push = 1   AND <![CDATA[pg_push_time >= #{pushTime}]]>

        WHERE pg_is_push = 1   AND pg_system=#{system} AND <![CDATA[pg_push_time >= #{pushTime}]]>

              AND (pg_uid is null <if test='uid != null'>or pg_uid = #{uid} </if>)

   </select>

   

    <select id="listByPushState" resultMap="BaseResultMap" parameterType="java.util.List">

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

        SELECT

        <include refid="Base_Column_List"/>

        FROM yeshi_ec_push_goods

        WHERE  pg_is_push = 1 AND  pg_id in

        <foreach item="item" collection="list" open="(" separator=","

            close=")">#{item}</foreach>

                 close=")">#{item}

        </foreach>

   </select>

   

   <select id="listTask" resultMap="BaseResultMap">

          SELECT * FROM `yeshi_ec_push_goods` p

        WHERE p.`pg_is_push` = 0 AND p.`pg_control_time` IS NOT NULL 
        WHERE p.`pg_is_push` = 0   AND pg_system=#{system} AND p.`pg_control_time` IS NOT NULL

              AND p.`pg_control_time` <![CDATA[<=]]> NOW()

  </select>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/mapping/push/PushInfoMapper.xml

@@ -15,15 +15,19 @@
    <result column="pi_create_time" property="createTime" jdbcType="TIMESTAMP"/>

    <result column="pi_update_time" property="updateTime" jdbcType="TIMESTAMP"/>

    <result column="pi_type" property="type" typeHandler="com.yeshi.fanli.util.mybatishandler.PushTypeEnumHandler" />

        <result column="pi_system" property="system" jdbcType="VARCHAR"/>

  </resultMap>

  

  <sql id="Base_Column_List">pi_id,pi_title,pi_content,pi_uids,pi_json_data,pi_type,pi_control_time,pi_remark,pi_state,pi_push_time,pi_create_time,pi_update_time</sql>

    <sql id="Base_Column_List">pi_id,pi_title,pi_content,pi_uids,pi_json_data,pi_type,pi_control_time,pi_remark,pi_state,pi_push_time,pi_create_time,pi_update_time,pi_system</sql>

  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select

    <include refid="Base_Column_List"/>from yeshi_ec_push_info where pi_id = #{id,jdbcType=BIGINT}

  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_push_info where pi_id = #{id,jdbcType=BIGINT}</delete>

  <insert id="insert" parameterType="com.yeshi.fanli.entity.push.PushInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_push_info (pi_id,pi_title,pi_content,pi_uids,pi_json_data,pi_type,pi_control_time,pi_remark,pi_state,pi_push_time,pi_create_time,pi_update_time) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{uids,jdbcType=VARCHAR},#{jsonData,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{controlTime,jdbcType=TIMESTAMP},#{remark,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{pushTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>

  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.PushInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_push_info

    <delete id="deleteByPrimaryKey"

            parameterType="java.lang.Long">delete from yeshi_ec_push_info where pi_id = #{id,jdbcType=BIGINT}</delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.push.PushInfo" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_push_info (pi_id,pi_title,pi_content,pi_uids,pi_json_data,pi_type,pi_control_time,pi_remark,pi_state,pi_push_time,pi_create_time,pi_update_time,pi_system) values (#{id,jdbcType=BIGINT},#{title,jdbcType=VARCHAR},#{content,jdbcType=VARCHAR},#{uids,jdbcType=VARCHAR},#{jsonData,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{controlTime,jdbcType=TIMESTAMP},#{remark,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{pushTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{system,jdbcType=VARCHAR})</insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.push.PushInfo" useGeneratedKeys="true"

            keyProperty="id">insert into yeshi_ec_push_info

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">pi_id,</if>

      <if test="title != null">pi_title,</if>

@@ -37,7 +41,9 @@
      <if test="pushTime != null">pi_push_time,</if>

      <if test="createTime != null">pi_create_time,</if>

      <if test="updateTime != null">pi_update_time,</if>

    </trim>values

            <if test="system != null">pi_system,</if>

        </trim>

        values

    <trim prefix="(" suffix=")" suffixOverrides=",">

      <if test="id != null">#{id,jdbcType=BIGINT},</if>

      <if test="title != null">#{title,jdbcType=VARCHAR},</if>

@@ -51,10 +57,13 @@
      <if test="pushTime != null">#{pushTime,jdbcType=TIMESTAMP},</if>

      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="system != null">#{system,jdbcType=VARCHAR},</if>

    </trim>

  </insert>

  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.push.PushInfo">update yeshi_ec_push_info set pi_title = #{title,jdbcType=VARCHAR},pi_content = #{content,jdbcType=VARCHAR},pi_uids = #{uids,jdbcType=VARCHAR},pi_json_data = #{jsonData,jdbcType=VARCHAR},pi_type = #{type,jdbcType=VARCHAR},pi_control_time = #{controlTime,jdbcType=TIMESTAMP},pi_remark = #{remark,jdbcType=VARCHAR},pi_state = #{state,jdbcType=INTEGER},pi_push_time = #{pushTime,jdbcType=TIMESTAMP},pi_create_time = #{createTime,jdbcType=TIMESTAMP},pi_update_time = #{updateTime,jdbcType=TIMESTAMP} where pi_id = #{id,jdbcType=BIGINT}</update>

  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.PushInfo">update yeshi_ec_push_info

    <update id="updateByPrimaryKey"

            parameterType="com.yeshi.fanli.entity.push.PushInfo">update yeshi_ec_push_info set pi_title = #{title,jdbcType=VARCHAR},pi_content = #{content,jdbcType=VARCHAR},pi_uids = #{uids,jdbcType=VARCHAR},pi_json_data = #{jsonData,jdbcType=VARCHAR},pi_type = #{type,jdbcType=VARCHAR},pi_control_time = #{controlTime,jdbcType=TIMESTAMP},pi_remark = #{remark,jdbcType=VARCHAR},pi_state = #{state,jdbcType=INTEGER},pi_push_time = #{pushTime,jdbcType=TIMESTAMP},pi_create_time = #{createTime,jdbcType=TIMESTAMP},pi_update_time = #{updateTime,jdbcType=TIMESTAMP},pi_system = #{system,jdbcType=VARCHAR} where pi_id = #{id,jdbcType=BIGINT}</update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.push.PushInfo">update

        yeshi_ec_push_info

    <set>

      <if test="title != null">pi_title=#{title,jdbcType=VARCHAR},</if>

      <if test="content != null">pi_content=#{content,jdbcType=VARCHAR},</if>

@@ -67,18 +76,22 @@
      <if test="pushTime != null">pi_push_time=#{pushTime,jdbcType=TIMESTAMP},</if>

      <if test="createTime != null">pi_create_time=#{createTime,jdbcType=TIMESTAMP},</if>

      <if test="updateTime != null">pi_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

    </set> where pi_id = #{id,jdbcType=BIGINT}

            <if test="system != null">pi_system=#{system,jdbcType=VARCHAR},</if>

        </set>

        where pi_id = #{id,jdbcType=BIGINT}

  </update>

  

   <delete id="deleteBatchByPrimaryKey"  parameterType="java.util.List">

        delete from yeshi_ec_push_info where pi_push_time is null AND pi_id in

        <foreach item="item" collection="list" open="(" separator=","

            close=")">#{item}</foreach>

                 close=")">#{item}

        </foreach>

   </delete>

  

  <select id="listQuery" resultMap="BaseResultMap">

      SELECT p.*,IF(`pi_control_time` IS NOT NULL,pi_control_time,`pi_create_time`) AS orderyTime FROM  yeshi_ec_push_info p

    WHERE pi_type = #{type}

        SELECT p.*,IF(`pi_control_time` IS NOT NULL,pi_control_time,`pi_create_time`) AS orderyTime FROM

        yeshi_ec_push_info p

        WHERE pi_type = #{type} AND pi_system=#{system}

        <if test="key != null and key !='' ">

            <if test="keyType == 1">AND pi_title like '%#{key}%'</if>

            <if test="keyType == 2">AND pi_content like '%#{key}%'</if>

@@ -93,7 +106,7 @@
  

  <select id="countQuery" resultType="java.lang.Long">

      SELECT IFNULL(COUNT(pi_id),0) FROM  yeshi_ec_push_info

    WHERE pi_type = #{type}

        WHERE pi_type = #{type} AND pi_system=#{system}

        <if test="key != null and key !='' ">

            <if test="keyType == 1">AND pi_title like '%#{key}%'</if>

            <if test="keyType == 2">AND pi_content like '%#{key}%'</if>

@@ -106,7 +119,7 @@
  

  <select id="listTask" resultMap="BaseResultMap">

      SELECT * FROM `yeshi_ec_push_info` p

    WHERE p.`pi_state` = 0 AND p.`pi_control_time` IS NOT NULL 
    WHERE p.`pi_state` = 0 AND pi_system=#{system} AND p.`pi_control_time` IS NOT NULL

          AND p.`pi_control_time` <![CDATA[<=]]> NOW()

  </select>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassServiceImpl.java

@@ -5,6 +5,9 @@


import javax.annotation.Resource;



import com.yeshi.fanli.dao.mybatis.brand.BrandClassSystemMapMapper;

import com.yeshi.fanli.entity.SystemEnum;

import com.yeshi.fanli.entity.brand.BrandClassSystemMap;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;



@@ -26,7 +29,7 @@
    private GoodsClassService goodsClassService;



    @Resource

    private BrandClassShopService brandClassShopService;

    private BrandClassSystemMapMapper brandClassSystemMapMapper;

    

    

    @Override

@@ -36,20 +39,20 @@
    

    

    @Override

    public List<BrandClass> listEffective() {

        return brandClassMapper.listEffective();

    public List<BrandClass> listEffective(SystemEnum system) {

        return brandClassMapper.listEffective(system);

    }



    

    @Override

    @Cacheable(value = "brandCache", key = "'listBrandClassEffectiveCache'")

    public List<BrandClass> listBrandClassEffectiveCache() {

        return brandClassMapper.listEffective();

    @Cacheable(value = "brandCache", key = "'listBrandClassEffectiveCache-'+#system")

    public List<BrandClass> listBrandClassEffectiveCache(SystemEnum system) {

        return listEffective(system);

    }



    

    @Override

    public void saveObject(BrandClass record) throws BrandClassException, Exception{

    public void saveObject(BrandClass record, List<SystemEnum> systemList) throws BrandClassException, Exception {

        Long gcid = record.getGcid();

        if (gcid != null) 

            record.setGoodsClass(new GoodsClass(gcid));

@@ -69,6 +72,15 @@
            record.setOrderBy(brandClassMapper.getMaxOrder() + 1);

            record.setCreateTime(new Date());

            brandClassMapper.insert(record);

            //添加映射

            if (systemList != null)

                for (SystemEnum system : systemList) {

                    BrandClassSystemMap map=new BrandClassSystemMap();

                    map.setBrandClass(record);

                    map.setCreateTime(new Date());

                    map.setSystem(system);

                    brandClassSystemMapMapper.insertSelective(map);

                }

        } else {

            BrandClass resultObj = brandClassMapper.selectByPrimaryKey(id);

            if (resultObj == null)

@@ -104,9 +116,8 @@
    }

    

    

	
    @Override

    public void updateOrder(Long id, Integer moveType) throws BrandClassException, Exception{

    public void updateOrder(Long id, Integer moveType, SystemEnum system) throws BrandClassException, Exception {

        if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1)))

            throw new BrandClassException(1, "传递的类型不正确");

        

@@ -137,10 +148,19 @@
        return brandClassMapper.deleteBatchByPrimaryKey(list);

    }



    @Override

    public void deleteSystemMapBatch(List<Long> list, SystemEnum system) {

        List<BrandClassSystemMap> mapList = brandClassSystemMapMapper.listByClassIdsAndSystem(list, system);

        if (mapList != null) {

            for (BrandClassSystemMap map : mapList)

                brandClassSystemMapMapper.deleteByPrimaryKey(map.getId());

        }

    }



    

    @Override

    public List<BrandClass> listQuery(long start, int count, String key, Integer state) {

        List<BrandClass> listQuery = brandClassMapper.listQuery(start, count, key, state);

    public List<BrandClass> listQuery(long start, int count, String key, Integer state, SystemEnum system) {

        List<BrandClass> listQuery = brandClassMapper.listQuery(start, count, key, state,system);

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

            return listQuery;

        }

@@ -160,12 +180,9 @@




    @Override

    public long countQuery(String key, Integer state) {

        return brandClassMapper.countQuery(key, state);

    public long countQuery(String key, Integer state, SystemEnum system) {

        return brandClassMapper.countQuery(key, state,system);

    }

	
	
	
    

    

}


 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

@@ -186,7 +187,7 @@
            executor.execute(new Runnable() {

                @Override

                public void run() {

                    BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(record);

                    BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(record, SystemEnum.blks);



                    BrandInfo update = new BrandInfo();

                    update.setId(record.getId());

@@ -413,7 +414,7 @@
                if (StringUtil.isNullOrEmpty(name) && StringUtil.isNullOrEmpty(searchKey))

                    continue;

                // 添加商品

                BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(brandInfo);

                BrandInfo numInfo = brandGoodsCaheService.addBrandGoods(brandInfo, SystemEnum.blks);



                BrandInfo updateInfo = new BrandInfo();

                updateInfo.setId(brandInfo.getId());


 fanli/src/main/java/com/yeshi/fanli/service/impl/common/CommonConfigServiceImpl.java

New file
@@ -0,0 +1,30 @@
package com.yeshi.fanli.service.impl.common;

import com.yeshi.fanli.dao.mybatis.common.CommonConfigMapper;
import com.yeshi.fanli.entity.config.CommonConfig;
import com.yeshi.fanli.service.inter.common.CommonConfigService;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

@Service
public class CommonConfigServiceImpl implements CommonConfigService {

    @Resource
    private CommonConfigMapper commonConfigMapper;

    @Override
    public String getValue(String key) {
        CommonConfig config = commonConfigMapper.selectByKey(key);
        if (config == null)
            return null;
        return config.getValue();
    }

    @Cacheable(value = "config", key = "'Common-getValue-'+#key")
    @Override
    public String getValueCache(String key) {
        return getValue(key);
    }
}

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java

@@ -1447,7 +1447,6 @@
    }
    
    
	
    @Override
    public void saveComment(String pid, CommentInfo commentInfo) throws GoodsEvaluateException {
        GoodsEvaluate goodsEvaluate = goodsEvaluateDao.getById(pid);
@@ -1565,20 +1564,20 @@

    @Override
    public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType,
            String typeEnum) {
        return goodsEvaluateDao.query(start, count, key, state, dynamicType, typeEnum);
                                     String typeEnum, SystemEnum system) {
        return goodsEvaluateDao.query(start, count, key, state, dynamicType, typeEnum, system);
    }

    @Override
    public long count(String key, Integer state, int dynamicType, String typeEnum) {
        return goodsEvaluateDao.count(key, state, dynamicType, typeEnum);
    public long count(String key, Integer state, int dynamicType, String typeEnum, SystemEnum system) {
        return goodsEvaluateDao.count(key, state, dynamicType, typeEnum, system);
    }

    @Override
    public void addRanDomShareCount() {
    public void addRanDomShareCount(SystemEnum system) {
        // 发圈
        try {
            List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 1);
            List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 1, system);
            if (list != null) {
                for (GoodsEvaluate goodsEvaluate : list) {
                    Integer shareNum = goodsEvaluate.getShareNum();
@@ -1595,7 +1594,7 @@

        // 素材
        try {
            List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 2);
            List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(0, Integer.MAX_VALUE, 2, system);
            if (list != null) {
                for (GoodsEvaluate goodsEvaluate : list) {
                    Integer shareNum = goodsEvaluate.getShareNum();
@@ -1613,8 +1612,8 @@

    @Override
    @Cacheable(value = "dynamicCache", key = "'queryValidEvaluateCache-'+#start")
    public List<GoodsEvaluate> queryValidEvaluateCache(int start, int count) {
        List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, 1);
    public List<GoodsEvaluate> queryValidEvaluateCache(int start, int count, SystemEnum system) {
        List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, 1, system);

        // 更新商品信息
        executor.execute(new Runnable() {
@@ -1634,14 +1633,14 @@
    }

    @Override
    public long countValid() {
        return goodsEvaluateDao.countValid(1);
    public long countValid(SystemEnum system) {
        return goodsEvaluateDao.countValid(1, system);
    }

    @Override
    @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
    public List<GoodsEvaluate> queryMaterialsCache(int start, int count, int type) throws Exception {
        List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, type);
    public List<GoodsEvaluate> queryMaterialsCache(int start, int count, int type, SystemEnum system) throws Exception {
        List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, type, system);
        if (list == null) {
            list = new ArrayList<>();
        }
@@ -1803,8 +1802,8 @@
    }

    @Override
    public long countValidMaterials(int type) {
        return goodsEvaluateDao.countValid(type);
    public long countValidMaterials(int type, SystemEnum system) {
        return goodsEvaluateDao.countValid(type, system);
    }

    /**
@@ -2081,7 +2080,6 @@
    }


	
    @Override
    public int addGoodsEvaluate(TaoBaoGoodsBrief goodsBrief, List<String> imgs, ActivityUser user, String title,SystemEnum system) throws GoodsEvaluateException {
        if (goodsBrief == null || user == null || StringUtil.isNullOrEmpty(title)) {
@@ -2239,7 +2237,7 @@
    @Override
    public void addGoodsEvaluateByDaTaoKe(SystemEnum system) {
        List<Long> listId = null;
        List<GoodsEvaluate> listExist = goodsEvaluateDao.querySingleExist();
        List<GoodsEvaluate> listExist = goodsEvaluateDao.querySingleExist(system);
        if (listExist != null && listExist.size() > 0) {
            listId = new ArrayList<Long>();
            for (GoodsEvaluate goodsEvaluate : listExist) {
@@ -2466,6 +2464,7 @@

    /**
     * 发圈标题 加入表情
     *
     * @param desc
     * @return
     */
@@ -2510,16 +2509,17 @@
            if (goods == null) {
                return;
            }
            for (SystemEnum system : SystemEnum.values()) {
            List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO,
                    goods.getAuctionId()+"");
                        goods.getAuctionId() + "", system);
            if (queryExist == null || queryExist.size() == 0) {
                return;
                    continue;
            }

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
            paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
            GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
            updateGoods(queryExist, goodsNew);
            }

        } catch (Exception e) {
            e.printStackTrace();
@@ -2531,9 +2531,10 @@
        if (jdGoods == null) {
            return;
        }
        List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_JD, jdGoods.getSkuId()+"");
        for (SystemEnum system : SystemEnum.values()) {
            List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_JD, jdGoods.getSkuId() + "", system);
        if (queryExist == null || queryExist.size() == 0) {
            return;
                continue;
        }

        ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
@@ -2542,15 +2543,17 @@

        updateGoods(queryExist, goodsNew);
    }
    }

    @Override
    public void updatePDDGoods(PDDGoodsDetail pddGoods) {
        if (pddGoods == null) {
            return;
        }
        List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_PDD, pddGoods.getGoodsId()+"");
        for (SystemEnum system : SystemEnum.values()) {
            List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_PDD, pddGoods.getGoodsId() + "", system);
        if (queryExist == null || queryExist.size() == 0) {
            return;
                continue;
        }

        ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
@@ -2558,16 +2561,18 @@
        GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
        updateGoods(queryExist, goodsNew);
    }
    }

    @Override
    public void updateVIPGoods(VIPGoodsInfo goods) {
        if (goods == null) {
            return;
        }
        for (SystemEnum system : SystemEnum.values()) {
        List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_VIP,
                goods.getGoodsId());
                    goods.getGoodsId(), system);
        if (queryExist == null || queryExist.size() == 0) {
            return;
                continue;
        }

        ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
@@ -2575,22 +2580,25 @@
        GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO);
        updateGoods(queryExist, goodsNew);
    }
    }

    @Override
    public void updateSuningGoods(SuningGoodsInfo goods) {
        if (goods == null) {
            return;
        }
        for (SystemEnum system : SystemEnum.values()) {
        List<GoodsEvaluate> queryExist = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_SUNING,
                goods.getCommodityInfo().getCommodityCode());
                    goods.getCommodityInfo().getCommodityCode(), system);
        if (queryExist == null || queryExist.size() == 0) {
            return;
                continue;
        }

        ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55");
        paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate());
        GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
        updateGoods(queryExist, goodsNew);
        }
    }

    private void updateGoods(List<GoodsEvaluate> listExist, GoodsDetailVO goodsNew) {
@@ -2642,13 +2650,15 @@
            if (goodsId == null) {
                return;
            }
            List<GoodsEvaluate> list = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO,goodsId);
            if (list == null || list.size() == 0) {
                return;
            }

            for (SystemEnum system : SystemEnum.values()) {
                List<GoodsEvaluate> list = goodsEvaluateDao.queryExist(Constant.SOURCE_TYPE_TAOBAO, goodsId, system);
                if (list == null || list.size() == 0) {
                    continue;
                }
            // 下架商品
            offlineGoods(list, Constant.SOURCE_TYPE_TAOBAO, goodsId);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -2738,8 +2748,8 @@

    
    @Override
    public GoodsEvaluate queryExistSingle(String goodsId, int goodsType) {
        List<GoodsEvaluate> list = goodsEvaluateDao.queryExistSingle(goodsType, goodsId);
    public GoodsEvaluate queryExistSingle(String goodsId, int goodsType,SystemEnum system) {
        List<GoodsEvaluate> list = goodsEvaluateDao.queryExistSingle(goodsType, goodsId,system);
        if (list != null && list.size() > 0)
            return list.get(0);
        return null;

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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -38,20 +39,20 @@
    private AdActivityVersionControlService adActivityVersionControlService;



    @Override

    public AppPageNotification getAppPageNotificationByType(String type) {

    public AppPageNotification getAppPageNotificationByType(String type, SystemEnum system) {



        return appPageNotificationMapper.selectByType(type);

        return appPageNotificationMapper.selectByType(type,system);

    }



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

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

    @Override

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

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

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

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

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

            return null;



        // 过滤版本

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

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

        if (app == null) {

            return null;

        }

@@ -80,7 +81,7 @@
            return;

        if (apn.getType() == null)

            throw new Exception("类型为空");

        AppPageNotification old = getAppPageNotificationByType(apn.getType().name());

        AppPageNotification old = getAppPageNotificationByType(apn.getType().name(),apn.getSystem());



        if (old != null)

            throw new Exception("已存在改类型");

@@ -117,13 +118,13 @@
    }



    @Override

    public List<AppPageNotification> listQuery(long start, int count, String key, Integer show, Integer canClose) {

        return appPageNotificationMapper.listQuery(start, count, key, show, canClose);

    public List<AppPageNotification> listQuery(long start, int count, String key, Integer show, Integer canClose, SystemEnum system) {

        return appPageNotificationMapper.listQuery(start, count, key, show, canClose,system);

    }



    @Override

    public long countQuery(String key, Integer show, Integer canClose) {

        return appPageNotificationMapper.countQuery(key, show, canClose);

    public long countQuery(String key, Integer show, Integer canClose, SystemEnum system) {

        return appPageNotificationMapper.countQuery(key, show, canClose,system);

    }



    @Transactional(rollbackFor = Exception.class)


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

@@ -11,6 +11,7 @@


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -260,19 +261,19 @@
    }



    @Override

    public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode, Integer state) {

        return helpCenterMapper.query(pageIndex, pageSize, key, cid, orderMode, state);

    public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode, Integer state, SystemEnum system) {

        return helpCenterMapper.query(pageIndex, pageSize, key, cid, orderMode, state,system);

    }



    @Override

    public long countQuery(String key, Long cid, Integer state) {

        return helpCenterMapper.countQuery(key, cid, state);

    public long countQuery(String key, Long cid, Integer state, SystemEnum system) {

        return helpCenterMapper.countQuery(key, cid, state,system);

    }



    @Override

    @Cacheable(value = "helpCenterCache", key = "'queryIdAndTitle-'+#pageId+'-'+#key+'-'+#cid")

    public List<HelpCenter> listValid(long pageId, int pageSize, String key, Long cid) {

        return helpCenterMapper.listValid(pageId, pageSize, key, cid);

    @Cacheable(value = "helpCenterCache", key = "'queryIdAndTitle-'+#pageId+'-'+#key+'-'+#cid+'-'+#system")

    public List<HelpCenter> listValid(long pageId, int pageSize, String key, Long cid, SystemEnum system) {

        return helpCenterMapper.listValid(pageId, pageSize, key, cid,system);

    }



    @Override


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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.multipart.MultipartFile;

@@ -174,7 +175,7 @@
    

    

    @Override

    public void updateSort(Integer moveType, Long id) throws HelpClassException {

    public void updateSort(Integer moveType, Long id, SystemEnum system) throws HelpClassException {

        

        if (id == null || moveType == null) {

            throw new HelpClassException(1, "传递参数不能为空");

@@ -185,7 +186,7 @@
            throw new HelpClassException(1, "更新数据已不存在");

        }

        

        HelpClass changeObjct = helpClassMapper.getChangeOrder(moveType, helpClass.getSort());

        HelpClass changeObjct = helpClassMapper.getChangeOrder(moveType, helpClass.getSort(),system);

        

        if (changeObjct == null) {

            throw new HelpClassException(1, "已经是最边缘位置");

@@ -237,24 +238,24 @@
    

    

    @Override

    public List<HelpClass> query(int start, int count, String key, Integer state)

    public List<HelpClass> query(int start, int count, String key, Integer state, SystemEnum system)

            throws HelpClassException {

        return helpClassMapper.listQuery(start, count, key, state);

        return helpClassMapper.listQuery(start, count, key, state,system);

    }



    @Override

    public long countQuery(String key, Integer state) {

        return helpClassMapper.countQuery(key, state);

    public long countQuery(String key, Integer state, SystemEnum system) {

        return helpClassMapper.countQuery(key, state,system);

    }

    

    @Override

    public List<HelpClass> getClassByState(Integer state) throws HelpClassException {

        return helpClassMapper.getClassByState(state);

    public List<HelpClass> getClassByState(Integer state, SystemEnum system) throws HelpClassException {

        return helpClassMapper.getClassByState(state,system);

    }

    

    @Override

    public List<HelpClass> getProvidedClass() throws HelpClassException {

        return helpClassMapper.getProvidedClass();

    public List<HelpClass> getProvidedClass(SystemEnum system) throws HelpClassException {

        return helpClassMapper.getProvidedClass(system);

    }

    

    


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -187,7 +188,7 @@


    /**

     * 删除图片-不更新数据库

     * @param record

     * @param picture

     * @throws Exception

     */

    public void removePicture(String picture) throws Exception {

@@ -283,9 +284,9 @@


    

    @Override

    public List<HomeNavbar> listQuery(long start, int count, String key, Integer sex) {

    public List<HomeNavbar> listQuery(long start, int count, String key, Integer sex, SystemEnum system) {

        

        List<HomeNavbar> listObj = homeNavbarMapper.listQuery(start, count, key, sex);

        List<HomeNavbar> listObj = homeNavbarMapper.listQuery(start, count, key, sex,system);

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

            return null;

        }

@@ -330,33 +331,33 @@
    }

    

    @Override

    public long countlistQuery(String key, Integer sex) {

        return homeNavbarMapper.countListQuery(key, sex);

    public long countlistQuery(String key, Integer sex, SystemEnum system) {

        return homeNavbarMapper.countListQuery(key, sex,system);

    }



    @Override

    @Cacheable(value = "configCache", key = "'listQueryEffectiveNavbar'")

    public List<HomeNavbar> listQueryEffectiveNavbar() {

        return homeNavbarMapper.listQueryEffective();

    public List<HomeNavbar> listQueryEffectiveNavbar(SystemEnum system) {

        return homeNavbarMapper.listQueryEffective(system);

    }

    

    

    @Override

    @Cacheable(value = "configCache", key = "'listQueryDefaultNavbar-'+#sex")

    public List<HomeNavbar> listQueryDefaultNavbar(Integer sex) {

        return homeNavbarMapper.listQueryDefaultNavbar(sex);

    public List<HomeNavbar> listQueryDefaultNavbar(Integer sex, SystemEnum system) {

        return homeNavbarMapper.listQueryDefaultNavbar(sex,system);

    }

    

    

    @Override

    @Cacheable(value = "configCache", key = "'listQueryFixedNavbar'")

    public List<HomeNavbar> listQueryFixedNavbar() {

        return homeNavbarMapper.listQueryFixedNavbar();

    public List<HomeNavbar> listQueryFixedNavbar(SystemEnum system) {

        return homeNavbarMapper.listQueryFixedNavbar(system);

    }



    @Override

    public HomeNavbar getEffectiveByClassId(Long classId) {

        return homeNavbarMapper.getEffectiveByClassId(classId);

    public HomeNavbar getEffectiveByClassId(Long classId, SystemEnum system) {

        return homeNavbarMapper.getEffectiveByClassId(classId,system);

    }



    


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarUserServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.homemodule.HomeNavbarUserMapper;

@@ -31,10 +33,15 @@
    @Resource

    private UserInfoExtraService userInfoExtraService;

    

    @Resource

    private UserInfoService userInfoService;





    @Override

    public List<HomeNavbar> listEffectiveNavbar(Long uid, String device, Integer sex) {

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



        SystemEnum system = userInfoService.getUserSystem(uid);



        if (sex == null || sex == 0) {

            if (uid != null || !StringUtil.isNullOrEmpty(device)) {

@@ -46,7 +53,7 @@
                

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

                    // 固定导航

                    List<HomeNavbar> listFixed = homeNavbarService.listQueryFixedNavbar();

                    List<HomeNavbar> listFixed = homeNavbarService.listQueryFixedNavbar(system);

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

                        list.addAll(listFixed);

                    }

@@ -81,13 +88,13 @@
            }

            

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

                List<HomeNavbar> listDefault = homeNavbarService.listQueryDefaultNavbar(sex);

                List<HomeNavbar> listDefault = homeNavbarService.listQueryDefaultNavbar(sex, system);

                if (listDefault != null) {

                    list.addAll(listDefault);

                }

            }

        } else {

            List<HomeNavbar> listDefault = homeNavbarService.listQueryDefaultNavbar(sex);

            List<HomeNavbar> listDefault = homeNavbarService.listQueryDefaultNavbar(sex, system);

            if (listDefault != null) {

                list.addAll(listDefault);

            }

@@ -215,7 +222,7 @@
    }



    @Override

    public List<HomeNavbar> restoreSystemDefault(Long uid, String device) throws HomeNavbarUserException {

    public List<HomeNavbar> restoreSystemDefault(Long uid, String device,SystemEnum system) throws HomeNavbarUserException {

        if (uid == null && StringUtil.isNullOrEmpty(device)) {

            throw new HomeNavbarUserException(1, "参数不正确");

        }

@@ -227,7 +234,7 @@
            homeNavbarUserMapper.deleteByDevice(device);

        }

        // 返回有效的

        return homeNavbarService.listQueryEffectiveNavbar();

        return homeNavbarService.listQueryEffectiveNavbar(system);

    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SuperHomeNavbarServiceImpl.java

@@ -50,38 +50,4 @@
    }

    

    

    @Override

    public List<SuperHomeNavbar> listBySystem(Long systemId) {

        return superHomeNavbarMapper.listBySystem(systemId);

    }



    @Cacheable(value = "configCache", key = "'listBySystemCache-'+#systemId")

    @Override

    public List<SuperHomeNavbar> listBySystemCache(Long systemId) {

        return listBySystem(systemId);

    }

	
	
    @Override

    public List<SuperHomeNavbar> listByNavbarIds(List<Long> list) {

        return superHomeNavbarMapper.listByNavbarIds(list);

    }

	
    @Override

    public void deleteBatchByNavbarIds(List<Long> list) {

         superHomeNavbarMapper.deleteBatchByNavbarIds(list);

    }

	
    @Override

    public List<SuperHomeNavbar> querybyNavbarId(Long navbarId, Long systemId) {

        return superHomeNavbarMapper.querybyNavbarId(navbarId, systemId);

    }

	
    @Override

    public int deletebyNavbarId(Long navbarId, Long systemId) {

        return superHomeNavbarMapper.deletebyNavbarId(navbarId, systemId);

    }

	
	
	
}


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dto.push.PushContentDTO;

@@ -33,6 +35,9 @@


    @Resource

    private MsgExtraService msgExtraService;



    @Resource

    private UserInfoService userInfoService;



    @Override

    public void extractApplay(Extract extract) {

@@ -66,10 +71,12 @@
            e.printStackTrace();

        }

        

        SystemEnum system = userInfoService.getUserSystem(extract.getUserInfo().getId());



        PushContentDTO dto = PushMsgFactory.createMoneyExtractSuccess(new Date(extract.getExtractTime()),

                extract.getMoney(), extract.getAccount());

        try {

            pushService.pushZNX(extract.getUserInfo().getId(), dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(extract.getUserInfo().getId(), dto.getTitle(), dto.getContent(), null, null,system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

@@ -110,9 +117,11 @@
            e.printStackTrace();

        }



        SystemEnum system = userInfoService.getUserSystem(uid);



        PushContentDTO dto = PushMsgFactory.createMoneyFanliRecieved(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null,system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

@@ -131,9 +140,11 @@
            e.printStackTrace();

        }



        SystemEnum system = userInfoService.getUserSystem(uid);



        PushContentDTO dto = PushMsgFactory.createMoneyFanliRecieved(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null,system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

@@ -163,9 +174,11 @@
            e.printStackTrace();

        }



        SystemEnum system = userInfoService.getUserSystem(uid);



        PushContentDTO dto = PushMsgFactory.createMoneyShareRecieved(orderType, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null,system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

@@ -256,10 +269,12 @@
            e.printStackTrace();

        }



        SystemEnum system = userInfoService.getUserSystem(uid);



        // 推送消息

        PushContentDTO dto = PushMsgFactory.createMoneyTeamDividents(money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null,system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/msg/UserOrderMsgNotificationServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -28,6 +30,9 @@
    @Resource

    private PushService pushService;

    

    @Resource

    private UserInfoService userInfoService;





    @Override

    public void orderFanLiStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,

@@ -37,10 +42,12 @@
        // 保存消息明细消息

        addOrderStatistics(uid, orderId, orderType, Constant.TYPE_REBATE, goodsCount, payMoney, money, downTime, null, needNotify);

        

        SystemEnum system = userInfoService.getUserSystem(uid);



        if (needNotify) {

            PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(orderType, orderId, money);

            try {

                pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

                pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null, system);

            } catch (NumberFormatException e) {

                e.printStackTrace();

            } catch (PushException e) {

@@ -58,10 +65,11 @@
        // 保存消息明细消息

        addOrderStatistics(uid, orderId, orderType, Constant.TYPE_SHAER, goodsCount, payMoney, money, downTime, null, needNotify);

        

        SystemEnum system = userInfoService.getUserSystem(uid);



        PushContentDTO dto = PushMsgFactory.createShareOrderStatisticed(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null, system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

@@ -86,12 +94,14 @@
            return;

        }

        

        SystemEnum system = userInfoService.getUserSystem(uid);



        // 保存消息明细消息

        addOrderStatistics(uid, orderId, orderType, Constant.TYPE_INVITE, goodsCount, payMoney, totalMoney, downTime, null, true);



        PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null, system);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

@@ -101,6 +111,7 @@
    

    /**

     * 创建订单被统计消息

     *

     * @param uid

     * @param orderId 订单号

     * @param source  订单来源：淘宝、京东、天猫

@@ -123,7 +134,6 @@
            e.printStackTrace();

        }

    }







    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.dto.push.PushBaseContent;

import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



@@ -37,10 +39,10 @@
    @Resource

    private UserCustomSettingsService userCustomSettingsService;



    private List<Integer> getVersionCodeList(List<Integer> versionCodeList) {

    private List<Integer> getVersionCodeList(List<Integer> versionCodeList, SystemEnum system) {

        List<Integer> versionList = new ArrayList<>();

        if (versionCodeList == null) {// 全推

            List<AppVersionInfo> appInfoList = appVersionService.listByPlatformAndMinVersionCode("android", 46);

            List<AppVersionInfo> appInfoList = appVersionService.listByPlatformAndMinVersionCode("android", 46,system);

            if (appInfoList != null)

                for (AppVersionInfo version : appInfoList) {

                    versionList.add(version.getVersionCode());

@@ -58,50 +60,50 @@


    @Async("pushExecutor")

    @Override

    public void pushGoods(Long uid, Long auctionId, String title, String content, List<Integer> versionCodeList)

    public void pushGoods(Long uid, Long auctionId, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.goodsdetail, uid, title, content, null, null, auctionId, versionCodeList);

        push(PushTypeEnum.goodsdetail, uid, null, null, auctionId, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushUrl(Long uid, String url, String title, String content, List<Integer> versionCodeList)

    public void pushUrl(Long uid, String url, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.url, uid, title, content, null, url, null, versionCodeList);

        push(PushTypeEnum.url, uid, null, url, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushZNX(Long uid, String title, String content, List<Integer> versionCodeList) throws PushException {

        push(PushTypeEnum.ZNX, uid, title, content, null, null, null, versionCodeList);

    public void pushZNX(Long uid, PushBaseContent baseContent) throws PushException {

        push(PushTypeEnum.ZNX, uid, null, null, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushWEEX(Long uid, String title, String content, String weexUrl, List<Integer> versionCodeList)

    public void pushWEEX(Long uid, String weexUrl, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.weex, uid, title, content, weexUrl, null, null, versionCodeList);

        push(PushTypeEnum.weex, uid, weexUrl, null, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<Integer> versionCodeList)

    public void pushBaiChuanUrl(Long uid, String url, PushBaseContent baseContent)

            throws PushException {



        push(PushTypeEnum.baichuan, uid, title, content, null, url, null, versionCodeList);

        push(PushTypeEnum.baichuan, uid, null, url, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushWelfareCenter(Long uid, String title, String content, List<Integer> versionCodeList)

    public void pushWelfareCenter(Long uid, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.welfare, uid, title, content, null, null, null, versionCodeList);

        push(PushTypeEnum.welfare, uid, null, null, null, baseContent);

    }



    @Override

    public void pushUserSignInNotification(Long uid, String title, String content, List<Integer> versionCodeList)

    public void pushUserSignInNotification(Long uid, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.signin, uid, title, content, null, null, null, versionCodeList);

        push(PushTypeEnum.signin, uid, null, null, null, baseContent);

    }



    private List<DeviceTokenHW> filterDeviceToken(List<DeviceTokenHW> hwDeviceList, int hour) {

@@ -139,16 +141,14 @@
     * 

     * @param type

     * @param uid

     * @param title

     * @param content

     * @param url

     * @param webUrl

     * @param versionCodeList

     */

    private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl,

            Long goodsId, List<Integer> versionCodeList) throws PushException {

    private void push(PushTypeEnum type, Long uid, String url, String webUrl,

                      Long goodsId, PushBaseContent content) throws PushException {

        int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);

        List<Integer> newVersionList = getVersionCodeList(versionCodeList);

        List<Integer> newVersionList = getVersionCodeList(content.getVersionCodeList(),content.getSystem());

        // 1.6.5后开始推送

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

            if (newVersionList.get(i) < 47)

@@ -169,25 +169,25 @@
                    if (type == PushTypeEnum.goodsdetail) {// 商品详情

                        if (goodsId == null)

                            throw new PushException(2, "参数不完整");

                        HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

                        HWPushUtil.pushGoods(tokenList, content.getTitle(), content.getContent(), 1, goodsId);

                    } else if (type == PushTypeEnum.url) {// 链接

                        if (StringUtil.isNullOrEmpty(webUrl))

                            throw new PushException(2, "参数不完整");

                        HWPushUtil.pushUrl(tokenList, title, content, webUrl);

                        HWPushUtil.pushUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                    } else if (type == PushTypeEnum.ZNX) {// 站内信

                        HWPushUtil.pushZNX(tokenList, title, content);

                        HWPushUtil.pushZNX(tokenList, content.getTitle(), content.getContent());

                    } else if (type == PushTypeEnum.weex) {// weex

                        if (StringUtil.isNullOrEmpty(url))

                            throw new PushException(2, "参数不完整");

                        HWPushUtil.pushWEEX(tokenList, title, content, url);

                        HWPushUtil.pushWEEX(tokenList, content.getTitle(), content.getContent(), url);

                    } else if (type == PushTypeEnum.baichuan) {// 百川链接

                        if (StringUtil.isNullOrEmpty(webUrl))

                            throw new PushException(2, "参数不完整");

                        HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

                        HWPushUtil.pushBaiChuanUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                    } else if (type == PushTypeEnum.welfare) {// 福利中心

                        HWPushUtil.pushWelfareCenter(tokenList, title, content);

                        HWPushUtil.pushWelfareCenter(tokenList, content.getTitle(), content.getContent());

                    } else if (type == PushTypeEnum.signin) {// 签到

                        HWPushUtil.pushUserSignInNotification(tokenList, title, content);

                        HWPushUtil.pushUserSignInNotification(tokenList, content.getTitle(), content.getContent());

                    }

                } catch (Exception e) {

                    PushLogHelper.hwError(e);

@@ -210,25 +210,25 @@
                if (type == PushTypeEnum.goodsdetail) {// 商品详情

                    if (goodsId == null)

                        throw new PushException(2, "参数不完整");

                    HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

                    HWPushUtil.pushGoods(tokenList, content.getTitle(), content.getContent(), 1, goodsId);

                } else if (type == PushTypeEnum.url) {// 链接

                    if (StringUtil.isNullOrEmpty(webUrl))

                        throw new PushException(2, "参数不完整");

                    HWPushUtil.pushUrl(tokenList, title, content, webUrl);

                    HWPushUtil.pushUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                } else if (type == PushTypeEnum.ZNX) {// 站内信

                    HWPushUtil.pushZNX(tokenList, title, content);

                    HWPushUtil.pushZNX(tokenList, content.getTitle(), content.getContent());

                } else if (type == PushTypeEnum.weex) {// weex

                    if (StringUtil.isNullOrEmpty(url))

                        throw new PushException(2, "参数不完整");

                    HWPushUtil.pushWEEX(tokenList, title, content, url);

                    HWPushUtil.pushWEEX(tokenList, content.getTitle(), content.getContent(), url);

                } else if (type == PushTypeEnum.baichuan) {// 百川链接

                    if (StringUtil.isNullOrEmpty(webUrl))

                        throw new PushException(2, "参数不完整");

                    HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

                    HWPushUtil.pushBaiChuanUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                } else if (type == PushTypeEnum.welfare) {// 福利中心

                    HWPushUtil.pushWelfareCenter(tokenList, title, content);

                    HWPushUtil.pushWelfareCenter(tokenList, content.getTitle(), content.getContent());

                } else if (type == PushTypeEnum.signin) {// 签到

                    HWPushUtil.pushUserSignInNotification(tokenList, title, content);

                    HWPushUtil.pushUserSignInNotification(tokenList, content.getTitle(), content.getContent());

                }

            } catch (Exception e) {

                PushLogHelper.hwError(e);


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/OPPOPushServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.dto.push.PushBaseContent;

import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



@@ -37,10 +39,10 @@
    @Resource

    private UserCustomSettingsService userCustomSettingsService;



    private List<Integer> getVersionCodeList(List<Integer> versionCodeList) {

    private List<Integer> getVersionCodeList(List<Integer> versionCodeList,SystemEnum system) {

        List<Integer> versionList = new ArrayList<>();

        if (versionCodeList == null) {// 全推

            List<AppVersionInfo> appInfoList = appVersionService.listByPlatformAndMinVersionCode("android", 51);

            List<AppVersionInfo> appInfoList = appVersionService.listByPlatformAndMinVersionCode("android", 51,system);

            if (appInfoList != null)

                for (AppVersionInfo version : appInfoList) {

                    versionList.add(version.getVersionCode());

@@ -58,50 +60,49 @@


    @Async("pushExecutor")

    @Override

    public void pushGoods(Long uid, Long auctionId, String title, String content, List<Integer> versionCodeList)

    public void pushGoods(Long uid, Long auctionId, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.goodsdetail, uid, title, content, null, null, auctionId, versionCodeList);

        push(PushTypeEnum.goodsdetail, uid, null, null, auctionId, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushUrl(Long uid, String url, String title, String content, List<Integer> versionCodeList)

    public void pushUrl(Long uid, String url,  PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.url, uid, title, content, null, url, null, versionCodeList);

        push(PushTypeEnum.url, uid, null, url, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushZNX(Long uid, String title, String content, List<Integer> versionCodeList) throws PushException {

        push(PushTypeEnum.ZNX, uid, title, content, null, null, null, versionCodeList);

    public void pushZNX(Long uid,  PushBaseContent baseContent) throws PushException {

        push(PushTypeEnum.ZNX, uid,  null, null, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushWEEX(Long uid, String title, String content, String weexUrl, List<Integer> versionCodeList)

    public void pushWEEX(Long uid,String weexUrl, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.weex, uid, title, content, weexUrl, null, null, versionCodeList);

        push(PushTypeEnum.weex, uid,  weexUrl, null, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<Integer> versionCodeList)

    public void pushBaiChuanUrl(Long uid,String url, PushBaseContent baseContent)

            throws PushException {



        push(PushTypeEnum.baichuan, uid, title, content, null, url, null, versionCodeList);

        push(PushTypeEnum.baichuan, uid, null, url, null, baseContent);

    }



    @Async("pushExecutor")

    @Override

    public void pushWelfareCenter(Long uid, String title, String content, List<Integer> versionCodeList)

    public void pushWelfareCenter(Long uid, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.welfare, uid, title, content, null, null, null, versionCodeList);

        push(PushTypeEnum.welfare, uid, null, null, null, baseContent);

    }



    @Override

    public void pushUserSignInNotification(Long uid, String title, String content, List<Integer> versionCodeList)

    public void pushUserSignInNotification(Long uid, PushBaseContent baseContent)

            throws PushException {

        push(PushTypeEnum.signin, uid, title, content, null, null, null, versionCodeList);

        push(PushTypeEnum.signin, uid,  null, null, null, baseContent);

    }



    private List<DeviceTokenOPPO> filterDeviceToken(List<DeviceTokenOPPO> deviceList, int hour) {

@@ -140,16 +141,14 @@
     * 

     * @param type

     * @param uid

     * @param title

     * @param content

     * @param url

     * @param webUrl

     * @param versionCodeList

     */

    private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl,

            Long goodsId, List<Integer> versionCodeList) throws PushException {

    private void push(PushTypeEnum type, Long uid, String url, String webUrl,

                      Long goodsId,PushBaseContent content) throws PushException {

        int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);

        List<Integer> newVersionList = getVersionCodeList(versionCodeList);

        List<Integer> newVersionList = getVersionCodeList(content.getVersionCodeList(),content.getSystem());

        // 1.6.5后开始推送

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

            if (newVersionList.get(i) < 47)

@@ -171,25 +170,25 @@
                    if (type == PushTypeEnum.goodsdetail) {// 商品详情

                        if (goodsId == null)

                            throw new PushException(2, "参数不完整");

                        OPPOPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

                        OPPOPushUtil.pushGoods(tokenList, content.getTitle(), content.getContent(), 1, goodsId);

                    } else if (type == PushTypeEnum.url) {// 链接

                        if (StringUtil.isNullOrEmpty(webUrl))

                            throw new PushException(2, "参数不完整");

                        OPPOPushUtil.pushUrl(tokenList, title, content, webUrl);

                        OPPOPushUtil.pushUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                    } else if (type == PushTypeEnum.ZNX) {// 站内信

                        OPPOPushUtil.pushZNX(tokenList, title, content);

                        OPPOPushUtil.pushZNX(tokenList, content.getTitle(), content.getContent());

                    } else if (type == PushTypeEnum.weex) {// weex

                        if (StringUtil.isNullOrEmpty(url))

                            throw new PushException(2, "参数不完整");

                        OPPOPushUtil.pushWEEX(tokenList, title, content, url);

                        OPPOPushUtil.pushWEEX(tokenList,content.getTitle(), content.getContent(), url);

                    } else if (type == PushTypeEnum.baichuan) {// 百川链接

                        if (StringUtil.isNullOrEmpty(webUrl))

                            throw new PushException(2, "参数不完整");

                        OPPOPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

                        OPPOPushUtil.pushBaiChuanUrl(tokenList,content.getTitle(), content.getContent(), webUrl);

                    } else if (type == PushTypeEnum.welfare) {// 福利中心

                        OPPOPushUtil.pushWelfareCenter(tokenList, title, content);

                        OPPOPushUtil.pushWelfareCenter(tokenList,content.getTitle(), content.getContent());

                    } else if (type == PushTypeEnum.signin) {// 签到

                        OPPOPushUtil.pushUserSignInNotification(tokenList, title, content);

                        OPPOPushUtil.pushUserSignInNotification(tokenList, content.getTitle(), content.getContent());

                    }

                } catch (Exception e) {

                    PushLogHelper.hwError(e);

@@ -212,25 +211,25 @@
                if (type == PushTypeEnum.goodsdetail) {// 商品详情

                    if (goodsId == null)

                        throw new PushException(2, "参数不完整");

                    OPPOPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

                    OPPOPushUtil.pushGoods(tokenList, content.getTitle(), content.getContent(), 1, goodsId);

                } else if (type == PushTypeEnum.url) {// 链接

                    if (StringUtil.isNullOrEmpty(webUrl))

                        throw new PushException(2, "参数不完整");

                    OPPOPushUtil.pushUrl(tokenList, title, content, webUrl);

                    OPPOPushUtil.pushUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                } else if (type == PushTypeEnum.ZNX) {// 站内信

                    OPPOPushUtil.pushZNX(tokenList, title, content);

                    OPPOPushUtil.pushZNX(tokenList, content.getTitle(), content.getContent());

                } else if (type == PushTypeEnum.weex) {// weex

                    if (StringUtil.isNullOrEmpty(url))

                        throw new PushException(2, "参数不完整");

                    OPPOPushUtil.pushWEEX(tokenList, title, content, url);

                    OPPOPushUtil.pushWEEX(tokenList, content.getTitle(), content.getContent(), url);

                } else if (type == PushTypeEnum.baichuan) {// 百川链接

                    if (StringUtil.isNullOrEmpty(webUrl))

                        throw new PushException(2, "参数不完整");

                    OPPOPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

                    OPPOPushUtil.pushBaiChuanUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                } else if (type == PushTypeEnum.welfare) {// 福利中心

                    OPPOPushUtil.pushWelfareCenter(tokenList, title, content);

                    OPPOPushUtil.pushWelfareCenter(tokenList, content.getTitle(), content.getContent());

                } else if (type == PushTypeEnum.signin) {// 签到

                    OPPOPushUtil.pushUserSignInNotification(tokenList, title, content);

                    OPPOPushUtil.pushUserSignInNotification(tokenList, content.getTitle(), content.getContent());

                }

            } catch (Exception e) {

                PushLogHelper.oppoError(e);


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -32,16 +33,10 @@
    private PushService pushService;



    @Resource

    private ConfigService configService;



    @Resource

    private PushCouponMapper pushCouponMapper;

    

    @Resource

    private PushCouponRecordService pushCouponRecordService;

	
    @Resource

    private UserSystemCouponService userSystemCouponService;

    

    @Override

    public int deleteByPrimaryKey(Long id) {

@@ -75,13 +70,13 @@




    @Override

    public List<PushCoupon> listQuery(long start, int count, String key, Integer state) {

        return pushCouponMapper.listQuery(start, count, key, state);

    public List<PushCoupon> listQuery(long start, int count, String key, Integer state, SystemEnum system) {

        return pushCouponMapper.listQuery(start, count, key, state, system);

    }



    @Override

    public long countQuery(String key, Integer state) {

        return pushCouponMapper.countQuery(key, state);

    public long countQuery(String key, Integer state, SystemEnum system) {

        return pushCouponMapper.countQuery(key, state, system);

    }



    @Override

@@ -210,13 +205,13 @@
        

        if (listuid == null) {

            // 全推

            pushService.pushWelfareCenter(null, title, content, listIOS, listAndroid);

            pushService.pushWelfareCenter(null, title, content, listIOS, listAndroid, pushCoupon.getSystem());

            

        } else {

            // 指定用户推送

            for (String str_uid: listuid) {

                if (str_uid != null && str_uid.trim().length() > 0) {

                    pushService.pushWelfareCenter(Long.parseLong(str_uid), title, content, listIOS, listAndroid);

                    pushService.pushWelfareCenter(Long.parseLong(str_uid), title, content, listIOS, listAndroid, pushCoupon.getSystem());

                }

            }

        }

@@ -251,8 +246,8 @@
    }



    @Override

    public List<PushCoupon> listQueryEffective() {

        return pushCouponMapper.listQueryEffective();

    public List<PushCoupon> listQueryEffective(SystemEnum system) {

        return pushCouponMapper.listQueryEffective(system);

    }

    

}


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -297,29 +298,29 @@
    }



    @Override

    public List<PushGoods> listQuery(long start, int count, String key, Integer state) {

        return pushGoodsMapper.listQuery(start, count, key, state);

    public List<PushGoods> listQuery(long start, int count, String key, Integer state, SystemEnum system) {

        return pushGoodsMapper.listQuery(start, count, key, state,system);

    }



    @Override

    public long countQuery(String key, Integer state) {

        return pushGoodsMapper.countQuery(key, state);

    public long countQuery(String key, Integer state, SystemEnum system) {

        return pushGoodsMapper.countQuery(key, state,system);

    }



    @Override

    public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime) {

        return pushGoodsMapper.listHistoryByPushTime(start, count, uid, pushTime);

    public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime, SystemEnum system) {

        return pushGoodsMapper.listHistoryByPushTime(start, count, uid, pushTime,system);

    }



    @Override

    public long countHistoryByPushTime(Long uid, Date pushTime) {

        return pushGoodsMapper.countHistoryByPushTime(uid, pushTime);

    public long countHistoryByPushTime(Long uid, Date pushTime, SystemEnum system) {

        return pushGoodsMapper.countHistoryByPushTime(uid, pushTime,system);

    }



    

    @Override

    public List<PushGoods> listTask() {

        return pushGoodsMapper.listTask();

    public List<PushGoods> listTask( SystemEnum system) {

        return pushGoodsMapper.listTask(system);

    }

    

    

@@ -441,13 +442,13 @@
            }

        }

        

        String url = configService.get(ConfigKeyEnum.pushActivityLink.getKey());

        String url = configService.getValue(ConfigKeyEnum.pushActivityLink.getKey(),pushGoods.getSystem());

        if (StringUtil.isNullOrEmpty(url)) {

            throw new PushGoodsException(1, "推送页面链接不存在");

        }

        url = url + "?id=" + pushGoods.getId();

        // h活动全推

        pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);

        pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid,pushGoods.getSystem());

    }

    

    

@@ -501,16 +502,16 @@


            Long goodsId = commonGoods.getGoodsId();

            String url = "https://item.taobao.com/item.htm?id=" + goodsId;

            pushService.pushGoods(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url,listIOS, listAndroid);

            pushService.pushGoods(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url,listIOS, listAndroid,pushGoods.getSystem());

        } else {

            /*   多个商品推送    */

            String url = configService.get(ConfigKeyEnum.pushGoodsDetails.getKey());

            String url = configService.getValue(ConfigKeyEnum.pushGoodsDetails.getKey(),pushGoods.getSystem());

            if (StringUtil.isNullOrEmpty(url)) {

                throw new PushGoodsException(1, "推送页面链接不存在");

            }

            // 生成链接

            url = url + "?id=" + id;

            pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);

            pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid,pushGoods.getSystem());

        }

    }

    


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -36,9 +37,6 @@


    @Resource

    private UserSystemMsgService userSystemMsgService;



    @Resource

    private ConfigService configService;



    @Resource

    private PushInfoMapper pushInfoMapper;

@@ -125,11 +123,8 @@
    }



    

	
    /**

     * 转换json

     * 
     * @param pushGoods

     */

    public void convertJson(PushInfo record) {

        JSONObject json = new JSONObject();

@@ -145,8 +140,6 @@


    /**

     * 转换list

     * 
     * @param pushGoods

     */

    public String convertVersion(String array) {

        String versions = "";

@@ -174,9 +167,9 @@
    }



    @Override

    public List<PushInfo> listQuery(long start, int count, String key, Integer keyType, Integer state, String type) {

    public List<PushInfo> listQuery(long start, int count, String key, Integer keyType, Integer state, String type, SystemEnum system) {

        

        List<PushInfo> list = pushInfoMapper.listQuery(start, count, key, keyType, state, type);

        List<PushInfo> list = pushInfoMapper.listQuery(start, count, key, keyType, state, type, system);

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

            return list;

        }

@@ -216,13 +209,13 @@
    }



    @Override

    public long countQuery(String key, Integer keyType, Integer state, String type) {

        return pushInfoMapper.countQuery(key, keyType, state, type);

    public long countQuery(String key, Integer keyType, Integer state, String type, SystemEnum system) {

        return pushInfoMapper.countQuery(key, keyType, state, type, system);

    }



    @Override

    public List<PushInfo> listTask() {

        return pushInfoMapper.listTask();

    public List<PushInfo> listTask(SystemEnum system) {

        return pushInfoMapper.listTask(system);

    }

    

    @Override

@@ -261,7 +254,6 @@
        record.setUpdateTime(new Date());

        pushInfoMapper.updateByPrimaryKey(record);

    }

	
    

    

    @Override

@@ -337,13 +329,13 @@
        if (listuid == null) { // 全推

            switch (pushWay) {

            case 1: // 站内信

                pushService.pushZNX(null, title, content, listIOS, listAndroid);

                    pushService.pushZNX(null, title, content, listIOS, listAndroid, record.getSystem());

                break;

            case 2: // 网页推送

                pushService.pushUrl(null, title, content, url, listIOS, listAndroid);

                    pushService.pushUrl(null, title, content, url, listIOS, listAndroid, record.getSystem());

                break;

            case 3: // 百川

                pushService.pushBaiChuanUrl(null, title, content, url, listIOS, listAndroid);

                    pushService.pushBaiChuanUrl(null, title, content, url, listIOS, listAndroid, record.getSystem());

                break;

            default:

                throw new PushInfoException(1, "推送类型不匹配");

@@ -355,15 +347,15 @@
                    long uid = Long.parseLong(str_uid);

                    switch (pushWay) {

                    case 1: // 站内信

                        pushService.pushZNX(uid, title, content, listIOS, listAndroid);

                            pushService.pushZNX(uid, title, content, listIOS, listAndroid, record.getSystem());

                        userSystemMsgService.addUserSystemMsg(uid, UserSystemMsgTypeEnum.question, title, content,

                                UserSystemMsg.TIME_TAG_COMMON, null);

                        break;

                    case 2: // 网页推送

                        pushService.pushUrl(uid, title, content, url, listIOS, listAndroid);

                            pushService.pushUrl(uid, title, content, url, listIOS, listAndroid, record.getSystem());

                        break;

                    case 3: // 百川

                        pushService.pushBaiChuanUrl(uid, title, content, url, listIOS, listAndroid);

                            pushService.pushBaiChuanUrl(uid, title, content, url, listIOS, listAndroid, record.getSystem());

                        break;

                    default:

                        throw new PushInfoException(1, "推送类型不匹配");


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -1,33 +1,25 @@
package com.yeshi.fanli.service.impl.push;



import java.util.List;



import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.push.PushRecordMapper;

import com.yeshi.fanli.dto.push.PushBaseContent;

import com.yeshi.fanli.dto.push.PushTypeEnum;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.SystemEnum;

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

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

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

import com.yeshi.fanli.entity.xinge.PushRecord;

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

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

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

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import org.springframework.stereotype.Service;



import javax.annotation.Resource;

import java.util.List;



@Service

public class PushServiceImpl implements PushService {

@@ -106,7 +98,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                hwPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);

                hwPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));

            }



            // OPPO推送

@@ -114,14 +106,14 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                oPPOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);

                oPPOPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));

            }

            // VIVO推送

            if (listAndroid == null || listAndroid.size() > 0) {

                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                vIVOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);

                vIVOPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));

            }



        }

@@ -171,7 +163,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                hwPushService.pushUrl(uid, url, title, content, versionCodeList);

                hwPushService.pushUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));

            }



            // OPPO推送

@@ -179,7 +171,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                oPPOPushService.pushUrl(uid, url, title, content, versionCodeList);

                oPPOPushService.pushUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));

            }



            // VIVO推送

@@ -187,7 +179,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                vIVOPushService.pushUrl(uid, url, title, content, versionCodeList);

                vIVOPushService.pushUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));

            }



        }

@@ -254,7 +246,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                hwPushService.pushZNX(uId, title, content, versionCodeList);

                hwPushService.pushZNX(uId, new PushBaseContent(title, content, versionCodeList, system));

            }



            // OPPO推送

@@ -262,7 +254,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                oPPOPushService.pushZNX(uId, title, content, versionCodeList);

                oPPOPushService.pushZNX(uId, new PushBaseContent(title, content, versionCodeList, system));

            }



            // VIVO推送

@@ -270,7 +262,7 @@
                List<Integer> versionCodeList = null;

                if (listAndroid != null)

                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

                vIVOPushService.pushZNX(uId, title, content, versionCodeList);

                vIVOPushService.pushZNX(uId, new PushBaseContent(title, content, versionCodeList, system));

            }

        }



@@ -318,7 +310,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            hwPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);

            hwPushService.pushWEEX(uid, weexUrl, new PushBaseContent(title, content, versionCodeList, system));

        }



        // OPPO推送

@@ -326,7 +318,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            oPPOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);

            oPPOPushService.pushWEEX(uid, weexUrl, new PushBaseContent(title, content, versionCodeList, system));

        }



        // VIVO推送

@@ -334,7 +326,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            vIVOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);

            vIVOPushService.pushWEEX(uid, weexUrl, new PushBaseContent(title, content, versionCodeList, system));

        }



        // 插入推送记录

@@ -382,7 +374,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            hwPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);

            hwPushService.pushBaiChuanUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));

        }



        // OPPO推送

@@ -390,7 +382,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            oPPOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);

            oPPOPushService.pushBaiChuanUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));

        }



        // VIVO推送

@@ -398,7 +390,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            vIVOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);

            vIVOPushService.pushBaiChuanUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));

        }



        // 插入推送记录

@@ -445,7 +437,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            hwPushService.pushWelfareCenter(uid, title, content, versionCodeList);

            hwPushService.pushWelfareCenter(uid, new PushBaseContent(title, content, versionCodeList, system));

        }



        // OPPO推送

@@ -453,7 +445,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            oPPOPushService.pushWelfareCenter(uid, title, content, versionCodeList);

            oPPOPushService.pushWelfareCenter(uid, new PushBaseContent(title, content, versionCodeList, system));

        }



        // VIVO推送

@@ -461,7 +453,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            vIVOPushService.pushWelfareCenter(uid, title, content, versionCodeList);

            vIVOPushService.pushWelfareCenter(uid, new PushBaseContent(title, content, versionCodeList, system));

        }



        // 插入推送记录

@@ -584,7 +576,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            hwPushService.pushUserSignInNotification(uid, title, content, versionCodeList);

            hwPushService.pushUserSignInNotification(uid, new PushBaseContent(title, content, versionCodeList, system));

        }



        // OPPO推送

@@ -592,7 +584,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            oPPOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);

            oPPOPushService.pushUserSignInNotification(uid, new PushBaseContent(title, content, versionCodeList, system));

        }



        // VIVO推送

@@ -600,7 +592,7 @@
            List<Integer> versionCodeList = null;

            if (listAndroid != null)

                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);

            vIVOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);

            vIVOPushService.pushUserSignInNotification(uid, new PushBaseContent(title, content, versionCodeList, system));

        }



        // 插入推送记录


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/VIVOPushServiceImpl.java

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


import javax.annotation.Resource;



import com.yeshi.fanli.dto.push.PushBaseContent;

import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



@@ -37,10 +39,10 @@
    @Resource

    private UserCustomSettingsService userCustomSettingsService;



    private List<Integer> getVersionCodeList(List<Integer> versionCodeList) {

    private List<Integer> getVersionCodeList(List<Integer> versionCodeList, SystemEnum system) {

        List<Integer> versionList = new ArrayList<>();

        if (versionCodeList == null) {// 全推

            List<AppVersionInfo> appInfoList = appVersionService.listByPlatformAndMinVersionCode("android", 51);

            List<AppVersionInfo> appInfoList = appVersionService.listByPlatformAndMinVersionCode("android", 51,system);

            if (appInfoList != null)

                for (AppVersionInfo version : appInfoList) {

                    versionList.add(version.getVersionCode());

@@ -58,50 +60,50 @@


    @Async("pushExecutor")

    @Override

    public void pushGoods(Long uid, Long auctionId, String title, String content, List<Integer> versionCodeList)

    public void pushGoods(Long uid, Long auctionId, PushBaseContent content)

            throws PushException {

        push(PushTypeEnum.goodsdetail, uid, title, content, null, null, auctionId, versionCodeList);

        push(PushTypeEnum.goodsdetail, uid,  null, null, auctionId, content);

    }



    @Async("pushExecutor")

    @Override

    public void pushUrl(Long uid, String url, String title, String content, List<Integer> versionCodeList)

    public void pushUrl(Long uid, String url, PushBaseContent content)

            throws PushException {

        push(PushTypeEnum.url, uid, title, content, null, url, null, versionCodeList);

        push(PushTypeEnum.url, uid, null, url, null, content);

    }



    @Async("pushExecutor")

    @Override

    public void pushZNX(Long uid, String title, String content, List<Integer> versionCodeList) throws PushException {

        push(PushTypeEnum.ZNX, uid, title, content, null, null, null, versionCodeList);

    public void pushZNX(Long uid, PushBaseContent content) throws PushException {

        push(PushTypeEnum.ZNX, uid,  null, null, null, content);

    }



    @Async("pushExecutor")

    @Override

    public void pushWEEX(Long uid, String title, String content, String weexUrl, List<Integer> versionCodeList)

    public void pushWEEX(Long uid,  String weexUrl, PushBaseContent content)

            throws PushException {

        push(PushTypeEnum.weex, uid, title, content, weexUrl, null, null, versionCodeList);

        push(PushTypeEnum.weex, uid,  weexUrl, null, null, content);

    }



    @Async("pushExecutor")

    @Override

    public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<Integer> versionCodeList)

    public void pushBaiChuanUrl(Long uid, String url, PushBaseContent content)

            throws PushException {



        push(PushTypeEnum.baichuan, uid, title, content, null, url, null, versionCodeList);

        push(PushTypeEnum.baichuan, uid,  null, url, null, content);

    }



    @Async("pushExecutor")

    @Override

    public void pushWelfareCenter(Long uid, String title, String content, List<Integer> versionCodeList)

    public void pushWelfareCenter(Long uid, PushBaseContent content)

            throws PushException {

        push(PushTypeEnum.welfare, uid, title, content, null, null, null, versionCodeList);

        push(PushTypeEnum.welfare, uid,  null, null, null, content);

    }



    @Override

    public void pushUserSignInNotification(Long uid, String title, String content, List<Integer> versionCodeList)

    public void pushUserSignInNotification(Long uid, PushBaseContent content)

            throws PushException {

        push(PushTypeEnum.signin, uid, title, content, null, null, null, versionCodeList);

        push(PushTypeEnum.signin, uid, null, null, null, content);

    }



    private List<DeviceTokenVIVO> filterDeviceToken(List<DeviceTokenVIVO> deviceList, int hour) {

@@ -138,16 +140,14 @@
     * 

     * @param type

     * @param uid

     * @param title

     * @param content

     * @param url

     * @param webUrl

     * @param versionCodeList

     */

    private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl,

            Long goodsId, List<Integer> versionCodeList) throws PushException {

    private void push(PushTypeEnum type, Long uid, String url, String webUrl,

            Long goodsId, PushBaseContent content) throws PushException {

        int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);

        List<Integer> newVersionList = getVersionCodeList(versionCodeList);

        List<Integer> newVersionList = getVersionCodeList(content.getVersionCodeList(),content.getSystem());

        // 2.0.1后开始推送

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

            if (newVersionList.get(i) < 51)

@@ -169,25 +169,25 @@
                    if (type == PushTypeEnum.goodsdetail) {// 商品详情

                        if (goodsId == null)

                            throw new PushException(2, "参数不完整");

                        VIVOPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

                        VIVOPushUtil.pushGoods(tokenList, content.getTitle(),content.getContent(), 1, goodsId);

                    } else if (type == PushTypeEnum.url) {// 链接

                        if (StringUtil.isNullOrEmpty(webUrl))

                            throw new PushException(2, "参数不完整");

                        VIVOPushUtil.pushUrl(tokenList, title, content, webUrl);

                        VIVOPushUtil.pushUrl(tokenList,  content.getTitle(),content.getContent(),  webUrl);

                    } else if (type == PushTypeEnum.ZNX) {// 站内信

                        VIVOPushUtil.pushZNX(tokenList, title, content);

                        VIVOPushUtil.pushZNX(tokenList,  content.getTitle(),content.getContent());

                    } else if (type == PushTypeEnum.weex) {// weex

                        if (StringUtil.isNullOrEmpty(url))

                            throw new PushException(2, "参数不完整");

                        VIVOPushUtil.pushWEEX(tokenList, title, content, url);

                        VIVOPushUtil.pushWEEX(tokenList,  content.getTitle(),content.getContent(),  url);

                    } else if (type == PushTypeEnum.baichuan) {// 百川链接

                        if (StringUtil.isNullOrEmpty(webUrl))

                            throw new PushException(2, "参数不完整");

                        VIVOPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

                        VIVOPushUtil.pushBaiChuanUrl(tokenList,  content.getTitle(),content.getContent(),  webUrl);

                    } else if (type == PushTypeEnum.welfare) {// 福利中心

                        VIVOPushUtil.pushWelfareCenter(tokenList, title, content);

                        VIVOPushUtil.pushWelfareCenter(tokenList,  content.getTitle(),content.getContent());

                    } else if (type == PushTypeEnum.signin) {// 签到

                        VIVOPushUtil.pushUserSignInNotification(tokenList, title, content);

                        VIVOPushUtil.pushUserSignInNotification(tokenList,  content.getTitle(),content.getContent());

                    }

                } catch (Exception e) {

                    PushLogHelper.hwError(e);

@@ -210,25 +210,25 @@
                if (type == PushTypeEnum.goodsdetail) {// 商品详情

                    if (goodsId == null)

                        throw new PushException(2, "参数不完整");

                    VIVOPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

                    VIVOPushUtil.pushGoods(tokenList, content.getTitle(), content.getContent(), 1, goodsId);

                } else if (type == PushTypeEnum.url) {// 链接

                    if (StringUtil.isNullOrEmpty(webUrl))

                        throw new PushException(2, "参数不完整");

                    VIVOPushUtil.pushUrl(tokenList, title, content, webUrl);

                    VIVOPushUtil.pushUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                } else if (type == PushTypeEnum.ZNX) {// 站内信

                    VIVOPushUtil.pushZNX(tokenList, title, content);

                    VIVOPushUtil.pushZNX(tokenList, content.getTitle(), content.getContent());

                } else if (type == PushTypeEnum.weex) {// weex

                    if (StringUtil.isNullOrEmpty(url))

                        throw new PushException(2, "参数不完整");

                    VIVOPushUtil.pushWEEX(tokenList, title, content, url);

                    VIVOPushUtil.pushWEEX(tokenList, content.getTitle(), content.getContent(), url);

                } else if (type == PushTypeEnum.baichuan) {// 百川链接

                    if (StringUtil.isNullOrEmpty(webUrl))

                        throw new PushException(2, "参数不完整");

                    VIVOPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

                    VIVOPushUtil.pushBaiChuanUrl(tokenList, content.getTitle(), content.getContent(), webUrl);

                } else if (type == PushTypeEnum.welfare) {// 福利中心

                    VIVOPushUtil.pushWelfareCenter(tokenList, title, content);

                    VIVOPushUtil.pushWelfareCenter(tokenList, content.getTitle(), content.getContent());

                } else if (type == PushTypeEnum.signin) {// 签到

                    VIVOPushUtil.pushUserSignInNotification(tokenList, title, content);

                    VIVOPushUtil.pushUserSignInNotification(tokenList,content.getTitle(), content.getContent());

                }

            } catch (Exception e) {

                PushLogHelper.vivoError(e);


 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java

@@ -6,6 +6,7 @@
import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.NumberUtil;

@@ -84,6 +85,9 @@


    @Resource

    private RocketMQManager rocketMQManager;



    @Resource

    private UserInfoService userInfoService;



    @Transactional(rollbackFor = Exception.class)

    @Override

@@ -181,8 +185,9 @@


            @Override

            public void run() {

                SystemEnum system = userInfoService.getUserSystem(order.getUid());

                long[] targetUids = new long[] { 3L, 4L };

                Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey(), SystemEnum.blks);

                Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey(),system);

                String[] sts = config.getValue().split(",");

                String account = sts[0];

                String pwd = sts[1];


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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -27,6 +29,8 @@


    @Resource

    private ConfigService configService;

    @Resource

    private CommonConfigService commonConfigService;



    @Transactional

    public void addShamUser(ShamUser shamUser) {

@@ -123,7 +127,7 @@
        }



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

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

        String value = commonConfigService.getValue(ConfigKeyEnum.shareBonusPicture.getKey());



        if (!StringUtil.isNullOrEmpty(value)) {

            JSONArray array = JSONArray.fromObject(value);

@@ -194,6 +198,7 @@
    

    /**

     * 随机名称

     *

     * @return

     */

    public String randomName() {


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

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


import javax.annotation.Resource;



import com.yeshi.fanli.entity.SystemEnum;

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

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -44,10 +46,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

@@ -76,7 +74,7 @@
    private RedisManager redisManager;



    @Resource

    private UserInfoMapper userInfoMapper;

    private UserInfoService userInfoService;



    @Resource

    private UserAccountService userAccountService;

@@ -329,7 +327,6 @@
    /**

     * 多个商品分享生成记录

     * 

     * @param userShareGoodsRecord

     * @param listGoods

     */

    @Transactional(rollbackFor = Exception.class)

@@ -426,12 +423,6 @@
    /**

     * 生成分享图

     * 

     * @param uid

     *            用户id

     * @param shareId

     *            分享记录id

     * @param source

     *            来源

     * @param listGoods

     * @return

     * @throws UserShareGoodsRecordException

@@ -443,8 +434,10 @@
        Long shareId = shareRecord.getId();

        String source = shareRecord.getSource().name();



        SystemEnum system = userInfoService.getUserSystem(uid);



        String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s",

                configService.getH5Host(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "",

                configService.getH5Host(system), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "",

                source + "");



        String shortLink = HttpUtil.getShortLink(url);

@@ -461,7 +454,7 @@
        }



        // 获取到用户的头像

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid);

        if (user == null) {

            throw new UserShareGoodsRecordException(1, "用户信息不存在");

        }

@@ -948,8 +941,10 @@
        Long shareId = shareRecord.getId();

        String source = shareRecord.getSource().name();



        SystemEnum system = userInfoService.getUserSystem(uid);



        String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s",

                configService.getH5Host(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareId + "", source + "");

                configService.getH5Host(system), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareId + "", source + "");



        String shortLink = HttpUtil.getShortLink(url);

        if (!StringUtil.isNullOrEmpty(shortLink)) {

@@ -967,8 +962,8 @@
    public String getShareUrlV2(UserShareGoodsRecord shareRecord) {

        Long uid = shareRecord.getUid();

        Long shareId = shareRecord.getId();



        String url = String.format("http://%s/share_mushGoods_1.6.0.html?uid=%s&shareId=%s", configService.getH5Host(),

        SystemEnum system = userInfoService.getUserSystem(uid);

        String url = String.format("http://%s/share_mushGoods_1.6.0.html?uid=%s&shareId=%s", configService.getH5Host(system),

                AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareId + "");



        String shortLink = HttpUtil.getShortLink(url);

@@ -981,12 +976,8 @@
    /**

     * 生成分享图

     * 

     * @param uid

     *            用户id

     * @param shareId

     *            分享记录id

     * @param source

     *            来源

     * @param uid       用户id

     * @param shareId   分享记录id

     * @param listGoods

     * @return

     * @throws UserShareGoodsRecordException

@@ -1003,7 +994,7 @@
        }



        // 获取到用户的头像

        UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

        UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid);

        if (user == null) {

            throw new UserShareGoodsRecordException(1, "用户信息不存在");

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudServiceImpl.java

@@ -139,7 +139,6 @@
    private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;







    @Resource

    private RedisManager redisManager;



@@ -552,7 +551,6 @@
        }





		
        String wxId = userCloud.getWxId();

        Integer robotId = userCloud.getRobotId();

        // 保存发送记录

@@ -660,7 +658,6 @@
            userCloudSendContentService.save(sendContent);

        }

    }

	
    

    

    @Override

@@ -1355,8 +1352,10 @@
            return;

        }



        SystemEnum system = userInfoService.getUserSystem(uid);



        try {

            pushService.pushZNX(uid, "【重要通知】你的云发单微信已掉线。", "需要你重新扫描二维码登录", null, null);

            pushService.pushZNX(uid, "【重要通知】你的云发单微信已掉线。", "需要你重新扫描二维码登录", null, null, system);

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

        }


 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassService.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import com.yeshi.fanli.entity.brand.BrandClass;

import com.yeshi.fanli.exception.brand.BrandClassException;



@@ -17,13 +18,13 @@
     * 查询有效分类

     * @return

     */

    public List<BrandClass> listEffective();

    public List<BrandClass> listEffective(SystemEnum system);

    

    /**

     * 查询有效分类

     * @return

     */

    public List<BrandClass> listBrandClassEffectiveCache();

    public List<BrandClass> listBrandClassEffectiveCache(SystemEnum system);



    /**

     * 保存品牌信息

@@ -31,7 +32,7 @@
     * @throws BrandClassException

     * @throws Exception

     */

    public void saveObject(BrandClass record) throws BrandClassException, Exception;

    public void saveObject(BrandClass record,List<SystemEnum> systemList) throws BrandClassException, Exception;



    /**

     * 查询列表

@@ -41,9 +42,9 @@
     * @param state

     * @return

     */

    public List<BrandClass> listQuery(long start, int count, String key, Integer state);

    public List<BrandClass> listQuery(long start, int count, String key, Integer state,SystemEnum system);



    public long countQuery(String key, Integer state);

    public long countQuery(String key, Integer state,SystemEnum system);



    /**

     * 修改排序

@@ -52,7 +53,7 @@
     * @throws BrandClassException

     * @throws Exception

     */

    public void updateOrder(Long id, Integer moveType) throws BrandClassException, Exception;

    public void updateOrder(Long id, Integer moveType,SystemEnum system) throws BrandClassException, Exception;



    /**

     * 批量删除

@@ -62,6 +63,13 @@
    public int deleteBatchByPrimaryKey(List<Long> list);



    /**

     * 批量删除映射

     * @param list

     * @param system

     */

    public void deleteSystemMapBatch(List<Long> list,SystemEnum system);



    /**

     * 

     * @param id

     * @return


 fanli/src/main/java/com/yeshi/fanli/service/inter/common/CommonConfigService.java

New file
@@ -0,0 +1,12 @@
package com.yeshi.fanli.service.inter.common;

/**
 * 常用配置
 */
public interface CommonConfigService {

    public String getValue(String key);

    public String getValueCache(String key);

}

 fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java

@@ -36,9 +36,9 @@
     * @param count
     * @return
     */
    public List<GoodsEvaluate> queryValidEvaluateCache(int start, int count);
    public List<GoodsEvaluate> queryValidEvaluateCache(int start, int count,SystemEnum system);

    public long countValid();
    public long countValid(SystemEnum system);

    /**
     * 查询
@@ -48,9 +48,9 @@
     * @param state
     * @return
     */
    public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum);
    public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum,SystemEnum system);

    public long count(String key, Integer state,int dynamicType, String typeEnum);
    public long count(String key, Integer state,int dynamicType, String typeEnum,SystemEnum system);

    
    /**
@@ -133,9 +133,9 @@
     * @param count
     * @return
     */
    public List<GoodsEvaluate> queryMaterialsCache(int start, int count,int type) throws Exception;
    public List<GoodsEvaluate> queryMaterialsCache(int start, int count,int type,SystemEnum system) throws Exception;

    public long countValidMaterials(int type);
    public long countValidMaterials(int type,SystemEnum system);



@@ -165,7 +165,7 @@
    public void updateSuningGoods(SuningGoodsInfo goods);


    public void addRanDomShareCount();
    public void addRanDomShareCount(SystemEnum system);

    /**
     *  添加发圈内容
@@ -204,7 +204,7 @@
     * @param goodsType
     * @return
     */
    public GoodsEvaluate queryExistSingle(String goodsId, int goodsType);
    public GoodsEvaluate queryExistSingle(String goodsId, int goodsType,SystemEnum system);

    /**
     * 查询倒序

 fanli/src/main/java/com/yeshi/fanli/service/inter/help/AppPageNotificationService.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import com.yeshi.fanli.entity.bus.help.AppPageNotification;



/**

@@ -18,7 +19,7 @@
     * @param type

     * @return

     */

    public AppPageNotification getAppPageNotificationByType(String type);

    public AppPageNotification getAppPageNotificationByType(String type, SystemEnum system);





    /**

@@ -58,11 +59,11 @@
     * 后端列表查询

     * @return

     */

    public List<AppPageNotification> listQuery(long start, int count,String key, Integer show, Integer canClose);

    public List<AppPageNotification> listQuery(long start, int count,String key, Integer show, Integer canClose, SystemEnum system);

    

    public long countQuery(String key, Integer show, Integer canClose);

    public long countQuery(String key, Integer show, Integer canClose, SystemEnum system);



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

    public AppPageNotification getValidNotificationByTypeCache(String type, String platform, Integer versionCode, SystemEnum system);





    public void updateByPrimaryKey(AppPageNotification record);


 fanli/src/main/java/com/yeshi/fanli/service/inter/help/HelpCenterService.java

@@ -3,6 +3,7 @@


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.cache.annotation.Cacheable;



import com.yeshi.fanli.entity.bus.help.HelpCenter;

@@ -47,13 +48,11 @@
     * @param pageIndex 页码

     * @param pageSize  页面条数

     * @param key        搜索条件

     * @param startTime 起始时间

     * @param endTime   结束时间

     * @return

     */

    public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode,Integer state) ;

    public List<HelpCenter> query(int pageIndex, int pageSize, String key, Long cid, Integer orderMode, Integer state, SystemEnum system) ;

    

    public long countQuery(String key, Long cid,Integer state);

    public long countQuery(String key, Long cid,Integer state, SystemEnum system);



    

    /**

@@ -85,13 +84,12 @@


    /**

     * 查询 只返回id、title

     * @param pageIndex

     * @param pageSize

     * @param key

     * @return

     * @throws HelpCenterException

     */

    public List<HelpCenter> listValid(long pageId, int pageSize, String key, Long cid);

    public List<HelpCenter> listValid(long pageId, int pageSize, String key, Long cid, SystemEnum system);



    

    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/help/HelpClassService.java

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

import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.springframework.web.multipart.MultipartFile;



import com.yeshi.fanli.entity.bus.help.HelpClass;

@@ -37,9 +38,9 @@
     * @param endTime   结束时间

     * @return

     */

    public List<HelpClass> query(int start, int count, String key, Integer state) throws HelpClassException;

    public List<HelpClass> query(int start, int count, String key, Integer state, SystemEnum system) throws HelpClassException;

    

    public long countQuery(String key, Integer state);

    public long countQuery(String key, Integer state, SystemEnum system);





    /**

@@ -64,7 +65,7 @@
     * @param id

     * @throws HelpClassException

     */

    public void updateSort(Integer moveType, Long id) throws HelpClassException;

    public void updateSort(Integer moveType, Long id, SystemEnum system) throws HelpClassException;



    /**

     * 上传图片

@@ -80,14 +81,14 @@
     * @return

     * @throws HelpClassException

     */

    public List<HelpClass> getClassByState(Integer state) throws HelpClassException;

    public List<HelpClass> getClassByState(Integer state, SystemEnum system) throws HelpClassException;



    /**

     * 查询所有选项提供选择

     * @return

     * @throws HelpClassException

     */

    public List<HelpClass> getProvidedClass() throws HelpClassException;

    public List<HelpClass> getProvidedClass( SystemEnum system) throws HelpClassException;





    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarService.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

import org.apache.ibatis.annotations.Param;

import org.springframework.web.multipart.MultipartFile;



@@ -29,7 +30,6 @@
     * 保存

     * @param file

     * @param record

     * @param jumpType

     * @throws HomeNavbarException

     * @throws Exception

     */

@@ -52,36 +52,36 @@
     * @param key

     * @return

     */

    public List<HomeNavbar> listQuery(long start, int count, String key,  Integer sex);

    public List<HomeNavbar> listQuery(long start, int count, String key,  Integer sex, SystemEnum system);

    

    public long countlistQuery(String key,  Integer sex);

    public long countlistQuery(String key,  Integer sex, SystemEnum system);

    

    

    /**

     * 查询有效导航栏

     * @return

     */

    public List<HomeNavbar> listQueryEffectiveNavbar();

    public List<HomeNavbar> listQueryEffectiveNavbar(SystemEnum system);

    

    /**

     * 根据分类查询有效导航栏

     * @param classId

     * @return

     */

    public HomeNavbar getEffectiveByClassId(@Param("classId") Long classId);

    public HomeNavbar getEffectiveByClassId(@Param("classId") Long classId, SystemEnum system);





    /**

     * 默认导航栏

     * @return

     */

    public List<HomeNavbar> listQueryDefaultNavbar(Integer sex);

    public List<HomeNavbar> listQueryDefaultNavbar(Integer sex, SystemEnum system);



    /**

     *  固定的导航栏

     * @return

     */

    public List<HomeNavbar> listQueryFixedNavbar();

    public List<HomeNavbar> listQueryFixedNavbar(SystemEnum system);



    /**

     * 改变状态


 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/HomeNavbarUserService.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

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

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

import com.yeshi.fanli.exception.homemodule.HomeNavbarUserException;

@@ -29,7 +30,7 @@
     * @param device

     * @throws HomeNavbarUserException

     */

    public List<HomeNavbar> restoreSystemDefault(Long uid, String device) throws HomeNavbarUserException;

    public List<HomeNavbar> restoreSystemDefault(Long uid, String device, SystemEnum system) throws HomeNavbarUserException;



    /**

     * 查询用户已选导航栏


 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SuperHomeNavbarService.java

@@ -24,50 +24,5 @@


    public int updateByPrimaryKey(SuperHomeNavbar record);



    /**

     * 根据系统id获取导航

     * @param systemId 系统id

     * @return

     */

    public List<SuperHomeNavbar> listBySystem(Long systemId);



	
    /**

     * 根据系统id获取导航 +缓存

     * @param systemId 系统id

     * @return

     */

    List<SuperHomeNavbar> listBySystemCache(Long systemId);

	
	
    /**

     * 根据导航栏id 批量查询

     * @param list

     * @return

     */

    List<SuperHomeNavbar> listByNavbarIds(List<Long> list);

	
	
    /**

     * 根据导航栏id 批量删除

     * @param list

     * @return

     */

    void deleteBatchByNavbarIds(List<Long> list);

	
    /**

     * 根据系统id+导航id查询

     * @param systemId 系统id

     * @return

     */

    List<SuperHomeNavbar> querybyNavbarId(Long navbarId, Long systemId);

	
    /**

     * 根据系统id+导航id 删除

     * @param systemId 系统id

     * @return

     */

    int deletebyNavbarId(Long navbarId, Long systemId);

	


}


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/HWPushService.java

@@ -1,8 +1,9 @@
package com.yeshi.fanli.service.inter.push;



import java.util.List;



import com.yeshi.fanli.dto.push.PushBaseContent;

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



import java.util.List;



/**

 * 华为推送服务

@@ -16,12 +17,9 @@
     * 推送商品

     * 

     * @param uid

     * @param url

     * @param title

     * @param content

     * @throws PushException

     */

    void pushGoods(Long uid, Long auctionId, String title, String content, List<Integer> versionCodeList)

    void pushGoods(Long uid, Long auctionId, PushBaseContent baseContent)

            throws PushException;



    /**

@@ -29,66 +27,55 @@
     * 

     * @param uid

     * @param url

     * @param title

     * @param content

     * @throws PushException

     */

    void pushUrl(Long uid, String url, String title, String content, List<Integer> versionCodeList)

    void pushUrl(Long uid, String url,PushBaseContent baseContent)

            throws PushException;



    /**

     * 推送站内信

     * 

     * @param uId

     * @param title

     * @param content

     * @throws PushException

     */

    void pushZNX(Long uId, String title, String content, List<Integer> versionCodeList) throws PushException;

    void pushZNX(Long uId,PushBaseContent baseContent) throws PushException;



    /**

     * 适用版本 1.4.8及以后 推送weex页面

     * 

     * @param uid

     * @param title

     * @param content

     * @param weexUrl

     * @throws PushException

     */

    void pushWEEX(Long uid, String title, String content, String weexUrl, List<Integer> versionCodeList)

    void pushWEEX(Long uid, String weexUrl,PushBaseContent baseContent)

            throws PushException;



    /**

     * 适用版本 1.4.8及以后 推送百川网页

     * 

     * @param uid

     * @param title

     * @param content

     * @param url

     * @throws PushException

     */

    void pushBaiChuanUrl(Long uid, String title, String content, String url, List<Integer> versionCodeList)

    void pushBaiChuanUrl(Long uid, String url,PushBaseContent baseContent)

            throws PushException;



    /**

     * 推送福利中心（版本号:1.5.1后）

     * 

     * @param uid

     * @param title

     * @param content



     * @throws PushException

     */

    void pushWelfareCenter(Long uid, String title, String content, List<Integer> versionCodeList) throws PushException;

    void pushWelfareCenter(Long uid,PushBaseContent baseContent) throws PushException;



    /**

     * 推送签到提醒

     * 

     * @param uid

     * @param title

     * @param content

     * @param versions



     * @throws PushException

     */

    void pushUserSignInNotification(Long uid, String title, String content,  List<Integer> versionCodeList) throws PushException;

    void pushUserSignInNotification(Long uid, PushBaseContent baseContent) throws PushException;



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/OPPOPushService.java

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


import java.util.List;



import com.yeshi.fanli.dto.push.PushBaseContent;

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



/**

@@ -16,12 +17,10 @@
     * 推送商品

     * 

     * @param uid

     * @param url

     * @param title

     * @param content



     * @throws PushException

     */

    void pushGoods(Long uid, Long auctionId, String title, String content, List<Integer> versionCodeList)

    void pushGoods(Long uid, Long auctionId, PushBaseContent baseContent)

            throws PushException;



    /**

@@ -29,66 +28,51 @@
     * 

     * @param uid

     * @param url

     * @param title

     * @param content

     * @throws PushException

     */

    void pushUrl(Long uid, String url, String title, String content, List<Integer> versionCodeList)

    void pushUrl(Long uid, String url, PushBaseContent baseContent)

            throws PushException;



    /**

     * 推送站内信

     * 

     * @param uId

     * @param title

     * @param content

     * @throws PushException

     */

    void pushZNX(Long uId, String title, String content, List<Integer> versionCodeList) throws PushException;

    void pushZNX(Long uId, PushBaseContent baseContent) throws PushException;



    /**

     * 适用版本 1.4.8及以后 推送weex页面

     * 

     * @param uid

     * @param title

     * @param content

     * @param weexUrl

     * @throws PushException

     */

    void pushWEEX(Long uid, String title, String content, String weexUrl, List<Integer> versionCodeList)

    void pushWEEX(Long uid,String weexUrl, PushBaseContent baseContent)

            throws PushException;



    /**

     * 适用版本 1.4.8及以后 推送百川网页

     * 

     * @param uid

     * @param title

     * @param content

     * @param url

     * @throws PushException

     */

    void pushBaiChuanUrl(Long uid, String title, String content, String url, List<Integer> versionCodeList)

    void pushBaiChuanUrl(Long uid,String url, PushBaseContent baseContent)

            throws PushException;



    /**

     * 推送福利中心（版本号:1.5.1后）

     * 

     * @param uid

     * @param title

     * @param content

     * @throws PushException

     */

    void pushWelfareCenter(Long uid, String title, String content, List<Integer> versionCodeList) throws PushException;

    void pushWelfareCenter(Long uid,  PushBaseContent baseContent) throws PushException;



    /**

     * 推送签到提醒

     * 

     * @param uid

     * @param title

     * @param content

     * @param versions

     * @throws PushException

     */

    void pushUserSignInNotification(Long uid, String title, String content,  List<Integer> versionCodeList) throws PushException;

    void pushUserSignInNotification(Long uid, PushBaseContent baseContent) throws PushException;



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

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

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

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

@@ -29,9 +30,9 @@
     * @param key

     * @return

     */

    public List<PushCoupon> listQuery(long start, int count, String key, Integer state);

    public List<PushCoupon> listQuery(long start, int count, String key, Integer state, SystemEnum system);

    

    public long countQuery(String key, Integer state) throws PushCouponException;

    public long countQuery(String key, Integer state, SystemEnum system) throws PushCouponException;

    



    public void save(PushCoupon record) throws PushCouponException, Exception;

@@ -50,7 +51,7 @@
     *  有效活动

     * @return

     */

    public List<PushCoupon> listQueryEffective();

    public List<PushCoupon> listQueryEffective( SystemEnum system);



    

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushGoodsService.java

@@ -3,6 +3,7 @@
import java.util.Date;

import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

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

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

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

@@ -38,9 +39,9 @@
     * @param key

     * @return

     */

    public List<PushGoods> listQuery(long start, int count, String key, Integer state);

    public List<PushGoods> listQuery(long start, int count, String key, Integer state, SystemEnum system);

    

    public long countQuery(String key, Integer state);

    public long countQuery(String key, Integer state, SystemEnum system);



    /**

     * 获取历史推送商品信息

@@ -49,9 +50,9 @@
     * @param pushTime

     * @return

     */

    public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime);

    public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime, SystemEnum system);



    public long countHistoryByPushTime(Long uid, Date pushTime);

    public long countHistoryByPushTime(Long uid, Date pushTime, SystemEnum system);



    

    /**

@@ -67,7 +68,7 @@
     * 定时推送任务

     * @return

     */

    public List<PushGoods> listTask();

    public List<PushGoods> listTask(SystemEnum system);



    /**

     * 定时推送处理


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushInfoService.java

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


import java.util.List;



import com.yeshi.fanli.entity.SystemEnum;

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

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

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

@@ -17,6 +18,7 @@
    

    /**

     * 后端查询

     *

     * @param start

     * @param count

     * @param key

@@ -24,13 +26,14 @@
     * @param state

     * @return

     */

    public List<PushInfo> listQuery(long start, int count, String key, Integer keyType, Integer state, String type);

    public List<PushInfo> listQuery(long start, int count, String key, Integer keyType, Integer state, String type, SystemEnum system);



    public long countQuery(String key, Integer keyType, Integer state, String type);

    public long countQuery(String key, Integer keyType, Integer state, String type, SystemEnum system);





    /**

     * 后端手动推送

     *

     * @param id

     * @throws Exception

     * @throws PushInfoException

@@ -41,6 +44,7 @@
    

    /**

     * 执行推送

     *

     * @param id

     * @throws Exception

     * @throws PushCouponException

@@ -51,13 +55,15 @@
    

    /**

     * 需要推送的任务

     *

     * @return

     */

    public List<PushInfo> listTask();

    public List<PushInfo> listTask(SystemEnum system);





    /**

     *定时任务推送

     *

     * @param record

     */

    public void taskPush(PushInfo record);


 fanli/src/main/java/com/yeshi/fanli/service/inter/push/VIVOPushService.java

@@ -2,13 +2,13 @@


import java.util.List;



import com.yeshi.fanli.dto.push.PushBaseContent;

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



/**

 * 华为推送服务

 * 

 * @author Administrator

 *

 */

public interface VIVOPushService {



@@ -16,12 +16,10 @@
     * 推送商品

     * 

     * @param uid

     * @param url

     * @param title

     * @param content

     * @throws PushException

     */

    void pushGoods(Long uid, Long auctionId, String title, String content, List<Integer> versionCodeList)

    void pushGoods(Long uid, Long auctionId, PushBaseContent content)

            throws PushException;



    /**

@@ -29,66 +27,59 @@
     * 

     * @param uid

     * @param url

     * @param title

     * @param content

     * @throws PushException

     */

    void pushUrl(Long uid, String url, String title, String content, List<Integer> versionCodeList)

    void pushUrl(Long uid, String url, PushBaseContent content)

            throws PushException;



    /**

     * 推送站内信

     * 

     * @param uId

     * @param title

     * @param content

     * @throws PushException

     */

    void pushZNX(Long uId, String title, String content, List<Integer> versionCodeList) throws PushException;

    void pushZNX(Long uId, PushBaseContent content) throws PushException;



    /**

     * 适用版本 1.4.8及以后 推送weex页面

     * 

     * @param uid

     * @param title

     * @param content

     * @param weexUrl

     * @throws PushException

     */

    void pushWEEX(Long uid, String title, String content, String weexUrl, List<Integer> versionCodeList)

    void pushWEEX(Long uid,  String weexUrl,  PushBaseContent content)

            throws PushException;



    /**

     * 适用版本 1.4.8及以后 推送百川网页

     * 

     * @param uid

     * @param title

     * @param content

     * @param url

     * @throws PushException

     */

    void pushBaiChuanUrl(Long uid, String title, String content, String url, List<Integer> versionCodeList)

    void pushBaiChuanUrl(Long uid, String url, PushBaseContent content)

            throws PushException;



    /**

     * 推送福利中心（版本号:1.5.1后）

     * 

     * @param uid

     * @param title

     * @param content

     * @throws PushException

     */

    void pushWelfareCenter(Long uid, String title, String content, List<Integer> versionCodeList) throws PushException;

    void pushWelfareCenter(Long uid, PushBaseContent content) throws PushException;



    /**

     * 推送签到提醒

     * 

     * @param uid

     * @param title

     * @param content

     * @param versions

     * @throws PushException

     */

    void pushUserSignInNotification(Long uid, String title, String content,  List<Integer> versionCodeList) throws PushException;

    void pushUserSignInNotification(Long uid, PushBaseContent content) throws PushException;



}


 fanli/src/main/java/com/yeshi/fanli/util/cache/HttpGoodsCacheManager.java

@@ -157,7 +157,7 @@


    // 触发品牌商品列表

    public void requestBrandGoods() {

        List<BrandClass> list = brandClassService.listBrandClassEffectiveCache();

        List<BrandClass> list = brandClassService.listBrandClassEffectiveCache(null);

        list.add(new BrandClass(0L));

        list.addAll(list);

        for (int p = 1; p < 5; p++) {


 fanli/src/test/java/org/fanli/AppVersionTest.java

@@ -28,8 +28,8 @@
    @Test

    public void test2() {

        AppVersionService appVersionService = com.yeshi.fanli.util.BeanUtil.getBean(AppVersionService.class);

        List<AppVersionInfo> list = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID);

        appVersionService.getAppVersionInfoListByPlatformAndVersion(AppVersionInfo.PLATFORM_ANDROID, 26);

        List<AppVersionInfo> list = appVersionService.getAppVersionInfoListByPlatform(AppVersionInfo.PLATFORM_ANDROID,null);

        appVersionService.getAppVersionInfoListByPlatformAndVersion(AppVersionInfo.PLATFORM_ANDROID, 26,null);

    }



}


 fanli/src/test/java/org/fanli/MyBatisProduce.java

@@ -1,6 +1,9 @@
package org.fanli;



import com.yeshi.fanli.entity.brand.BrandClassSystemMap;

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

import com.yeshi.fanli.entity.config.CommonConfig;

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

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

import org.junit.Test;

import org.yeshi.utils.mybatis.ColumnParseUtil;

@@ -17,15 +20,15 @@


    @Test

    public void test3() {

        MyBatisMapperUtil.createMapper(SuningOrderInfo.class);

//        MyBatisMapperUtil.createMapper(VipShopOrderDetail.class);

        MyBatisMapperUtil.createMapper(CommonConfig.class);

        MyBatisMapperUtil.createMapper(BrandClassSystemMap.class);

//        MyBatisMapperUtil.createMapper(VipShopAfterSaleDetailInfo.class);

    }



    @Test

    public void test1() {

        ColumnParseUtil.parseColumn(BusinessSystem.class,

                "D:\\workspace\\fanli\\fanli-server\\fanli\\src\\main\\java\\com\\yeshi\\fanli\\mapping\\BusinessSystemMapper.xml");

        ColumnParseUtil.parseColumn(PushGoods.class,

                "D:\\workspace\\fanli\\fanli-server\\fanli\\src\\main\\java\\com\\yeshi\\fanli\\mapping\\push\\PushGoodsMapper.xml");

    }



}


 fanli/src/test/java/org/fanli/config/Test_Brand.java

@@ -42,7 +42,7 @@
            brandInfo.setIcon("http://ec-1255749512.file.myqcloud.com/img/TaoBaoShop/2bb853de35d845da85b7b10df42424d4.jpeg");

            brandInfo.setSearchKey("GAP");

            

            service.addBrandGoods(brandInfo);

            service.addBrandGoods(brandInfo,null);

            System.out.println("test");

        } catch (Exception e) {

            e.printStackTrace();