jumpdetail分system

admin

2021-07-24 e257a2834bf7b62af5c5c96f9b0b21fac92f2196

jumpdetail分system

 fanli/pom.xml

@@ -223,6 +223,12 @@

        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>facade-push</artifactId>
            <version>0.0.1</version>
        </dependency>

        <dependency>
            <groupId>com.ks</groupId>
            <artifactId>lib-common</artifactId>
            <version>0.0.1</version>
        </dependency>

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

@@ -33,7 +33,7 @@
    @RequestMapping({ "getJumpOption" })
    public void getJumpOption(AdminAcceptData acceptData, String callback, PrintWriter out) {
        try {
            List<JumpDetailV2> listJump = JumpDetailV2Service.listJump();
            List<JumpDetailV2> listJump = JumpDetailV2Service.listJump(acceptData.getSystem());
            JSONObject data = new JSONObject();

            JumpDetailV2 jumpDetailV2 = new JumpDetailV2();
@@ -138,7 +138,7 @@

        try {
            List<JumpDetailV2> list = JumpDetailV2Service.listQuery((pageIndex - 1) * pageSize, 
                    pageSize, key);
                    pageSize, key,acceptData.getSystem());

            if (list == null || list.size() == 0) {
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));
@@ -146,7 +146,7 @@
            }
            

            long count = JumpDetailV2Service.countListQuery(key);
            long count = JumpDetailV2Service.countListQuery(key,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/homemodule/SpecialCardAdminController.java

@@ -210,9 +210,9 @@
            if (request instanceof MultipartHttpServletRequest) {
                MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
                specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),
                        fileRequest.getFile("file3"), record, jumpType, extra);
                        fileRequest.getFile("file3"), record, jumpType, extra,acceptData.getSystem());
            } else {
                specialService.saveObject(null, null, null, record, jumpType, extra);
                specialService.saveObject(null, null, null, record, jumpType, extra,acceptData.getSystem());
            }

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

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

@@ -469,9 +469,9 @@
            // 1. 先判断httpRequest 是否含有文件类型
            if (request instanceof MultipartHttpServletRequest) {
                MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
                swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType, extra);
                swiperPictureService.saveObject(fileRequest.getFile("file"), record, jumpType, extra,acceptData.getSystem());
            } else {
                swiperPictureService.saveObject(null, record, jumpType, extra);
                swiperPictureService.saveObject(null, record, jumpType, extra,acceptData.getSystem());
            }

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

 fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java

@@ -29,6 +29,7 @@
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import com.yeshi.fanli.lijin.manager.UserLijinMnager;
import com.yeshi.fanli.lijin.manager.UserLijinSendManager;
import com.yeshi.fanli.log.vo.UserGoodsScanLog;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
@@ -54,6 +55,8 @@
import com.yeshi.fanli.lijin.vo.GoodsDetailVO;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -69,6 +72,7 @@
@Controller
@RequestMapping("api/lijin/goods")
public class GoodsControllerLijin {
    Logger userGoodsScanLogger = LoggerFactory.getLogger("userGoodsScanLog");

    @Resource
    private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
@@ -119,6 +123,7 @@
     * @param from
     * @return
     */

    @RequestMapping("getGoodsDetail")
    public void getGoodsDetail(AcceptData acceptData, int goodsType, String goodsId, Long uid, String from, PrintWriter out) {
        GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
@@ -149,7 +154,7 @@

                //加载资金信息
                com.yeshi.fanli.vo.goods.GoodsDetailVO goodsDetailVO1 = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
                goodsDetailVO1 = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goods, goodsDetailVO1);
                goodsDetailVO1 = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goods, goodsDetailVO1, true);

                goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertTaoBao(goods, paramsDTO));
                //重置资金信息
@@ -266,6 +271,8 @@
                break;
        }

        userGoodsScanLogger.info("{}", new Gson().toJson(UserGoodsScanLog.UserGoodsScanLogFactory.create(goodsDetailVO.getGoods(), uid, acceptData.getUtdid(), acceptData.getDevice())));


        //是否收藏
        extraVO.setCollected(false);

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

@@ -343,7 +343,7 @@
                        if (userInfo != null) {
                            JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web",
                                    Constant.getPlatformCode(acceptData.getPlatform()),
                                    Integer.parseInt(acceptData.getVersion()));
                                    Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());

                            JSONObject negativeParams = new JSONObject();
                            negativeParams.put("url", configService.getByVersion(ConfigKeyEnum.newerGonglue.getKey(),

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

@@ -7,7 +7,11 @@

import javax.annotation.Resource;

import com.ks.push.pojo.DO.BPushDeviceToken;
import com.ks.push.pojo.DO.PushPlatform;
import com.ks.push.service.BDeviceTokenService;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -109,6 +113,47 @@
    
    @Resource
    private GoodsEvaluateService goodsEvaluateService;

    @Reference(version = "1.0", check = false)
    private BDeviceTokenService bDeviceTokenService;

    /**
     * 店铺列表
     *
     * @param acceptData
     * @param out
     */
    @RequestMapping(value = "bindToken", method = RequestMethod.POST)
    public void bindToken(AcceptData acceptData, Long uid, String type, String token, PrintWriter out) {
        BPushDeviceToken deviceToken = new BPushDeviceToken();
        deviceToken.setAppCode(acceptData.getSystem().name());
        deviceToken.setDeviceId(StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid());
        deviceToken.setBuildModel(acceptData.getDeviceType());
        deviceToken.setBuildVersion(acceptData.getOsVersion());
        deviceToken.setToken(token);
        switch (type) {
            case "huawei":
                type = "hw";
                break;
            case "xiaomi":
                type = "xm";
                break;
            case "meizu":
                type = "mz";
                break;
        }
        deviceToken.setType(PushPlatform.valueOf(type));
        deviceToken.setUid(uid + "");
        deviceToken.setVersionCode(Integer.parseInt(acceptData.getVersion()));
        try {
            bDeviceTokenService.save(deviceToken);
            out.print(JsonUtil.loadTrueResult(""));
        } catch (Exception e) {
            out.print(JsonUtil.loadFalseResult("绑定出错：" + e.getMessage()));
            e.printStackTrace();
        }
    }

    

    @RequestMapping(value = "callback", method = RequestMethod.POST)
@@ -286,7 +331,7 @@
                if (totalgoods == 1) {
                    params = JumpDetailParamsFactory.createGoodsParams(goods.getGoodsId(), goods.getGoodsType());
                    jumpDetail = jumpDetailV2Service.getByTypeCache("goodsdetail",Constant.getPlatformCode(acceptData.getPlatform()),
                            Integer.parseInt(acceptData.getVersion()));
                            Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
                } else {
                    String url = configService.getValue(ConfigKeyEnum.pushGoodsDetails.getKey(),acceptData.getSystem());
                    if (url == null) {
@@ -296,7 +341,7 @@

                    params = JumpDetailParamsFactory.createWEBParams(url);
                    jumpDetail = jumpDetailV2Service.getByTypeCache("web",Constant.getPlatformCode(acceptData.getPlatform()),
                            Integer.parseInt(acceptData.getVersion()));
                            Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
                }

                totalwords.add(new ClientTextStyleVO("本次推荐共", "#666666"));
@@ -328,7 +373,7 @@
                url = url + "?id=" + id;
                params = JumpDetailParamsFactory.createWEBParams(url);
                jumpDetail = jumpDetailV2Service.getByTypeCache("web",
                        Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()));
                        Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
            } else {
                continue;
            }

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

@@ -1730,7 +1730,7 @@
                array = JSONArray.fromObject(cacheValue);
            }
        }
        JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
        JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem());
        if (array == null) {
            array = new JSONArray();


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

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

import com.alipay.api.AlipayApiException;
import com.google.gson.Gson;
import com.ks.push.service.BDeviceTokenService;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.*;
@@ -31,6 +32,9 @@
import com.yeshi.fanli.util.wx.MyWXLoginUtil;
import com.yeshi.fanli.vo.user.QQUserInfoVO;
import net.sf.json.JSONObject;
import org.apache.dubbo.config.annotation.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -54,6 +58,8 @@
@Controller
@RequestMapping("api/v1/user")
public class UserAccountController {

    private Logger logger = LoggerFactory.getLogger(UserAccountController.class);

    @Resource
    private UserInfoService userInfoService;
@@ -120,6 +126,10 @@

    @Resource
    private DeviceActiveService deviceActiveService;


    @Reference(version = "1.0", check = false)
    private BDeviceTokenService bDeviceTokenService;

    private BusinessSystem getSystem(AcceptData acceptData) {
        BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -1056,6 +1066,15 @@
            return;
        if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
            DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

            //新版推送解绑
            if (acceptData.getSystem().isNewPush()) {
                try {
                    bDeviceTokenService.unBindUid(acceptData.getSystem().name(), StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid());
                } catch (Exception e) {
                    logger.error("新版推送解绑出错：{}", uid, e);
                }
            } else {
            // 需要解绑HW推送的用户绑定
            deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());
            if (deviceActive != null) {
@@ -1067,6 +1086,8 @@
                deviceTokenXMService.unBindUid(deviceActive.getId());
            }
        }

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


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

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

import javax.annotation.Resource;

import com.yeshi.fanli.service.inter.user.UserInfoService;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,7 +50,6 @@
 * 福利中心
 * 
 * @author Administrator
 *
 */
@Controller
@RequestMapping("api/v1/user/coupon")
@@ -83,6 +83,9 @@
    private UserInfoExtraService userInfoExtraService;

    @Resource
    private UserInfoService userInfoService;

    @Resource
    private UserVIPInfoService userVIPInfoService;
    
    @Resource
@@ -97,8 +100,6 @@
    
    @Resource
    private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;
	
	
    
    
    /**
@@ -221,8 +222,6 @@
    }

    
	
	
    /**
     * 免单券使用记录 以及状态修改
     * 
@@ -316,7 +315,7 @@
        }
        try {
            UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType, acceptData);
            JSONObject data = commonOrderService.getRewardJumpInfo(orderNo, goodsType);
            JSONObject data = commonOrderService.getRewardJumpInfo(orderNo, goodsType, userInfoService.getUserSystem(uid));
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
        } catch (UserSystemCouponException e) {
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -379,9 +378,9 @@
    }
    
    

    /**
     * 查询免单券
     *
     * @param acceptData
     * @param uid
     * @param auctionId
@@ -446,7 +445,6 @@
        data.put("list", JsonUtil.getApiCommonGson().toJson(list));
        out.print(JsonUtil.loadTrueResult(data));
    }
	
    
     
    private boolean checkCanUsedTB(Long goodsId, BigDecimal priceLimit) {

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

@@ -2247,7 +2247,7 @@
                    vipAction.put("jumpDetail",
                            jumpDetailV2Service.getByTypeCache("web",
                                    acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
                                    Integer.parseInt(acceptData.getVersion())));
                                    Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
                    JSONObject params = new JSONObject();
                    params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));
                    vipAction.put("params", params);
@@ -2263,7 +2263,7 @@
                            vipAction.put("jumpDetail",
                                    jumpDetailV2Service.getByTypeCache("web",
                                            acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
                                            Integer.parseInt(acceptData.getVersion())));
                                            Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
                            JSONObject params = new JSONObject();
                            params.put("url", link.replace("[ID]", list.get(0).getId()));
                            vipAction.put("params", params);

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

@@ -208,7 +208,7 @@
                        if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
                            params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));

                        UserMsgVO msgVO = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"), params);
                        UserMsgVO msgVO = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search",acceptData.getSystem()), params);
                        msgVO.setType(MSG_TYPE_ORDER);
                        list.add(msgVO);
                    }
@@ -752,7 +752,7 @@

                commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "推荐记录",
                        list.get(0).getPushTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), read,
                        jumpDetailV2Service.getByTypeCache("recommend_list"), null, 0));
                        jumpDetailV2Service.getByTypeCache("recommend_list",acceptData.getSystem()), null, 0));
            }
        }

@@ -793,7 +793,7 @@
                    if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
                        params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));
                    UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,
                            jumpDetailV2Service.getByTypeCache("order_search"), params);
                            jumpDetailV2Service.getByTypeCache("order_search",acceptData.getSystem()), params);
                    userMsgVO.setType(MSG_TYPE_ORDER);
                    list.add(userMsgVO);
                }

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

@@ -682,6 +682,9 @@
                }

                for (GoodsEvaluate goodsEvaluate : list) {
                    if (goodsEvaluate.getGoods() != null) {
                        goodsEvaluate.getGoods().setCreatetime(null);
                    }
                    GoodsEvaluate evaluateNew = new GoodsEvaluate();
                    try {
                        PropertyUtils.copyProperties(evaluateNew, goodsEvaluate);
@@ -1427,7 +1430,7 @@

            int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
            jumpDetail = jumpDetailV2Service.getByTypeCache("web", platformCode,
                    Integer.parseInt(acceptData.getVersion()));
                    Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
            JSONObject inner = new JSONObject();
            inner.put("url", jumpLink);
            params = inner.toString();

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

@@ -193,7 +193,7 @@
            goodsBriefs.add(taoBaoGoodsBrief);
        }

        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsBriefs, paramsDTO);
        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsBriefs, paramsDTO,false);
        for (GoodsDetailVO vo : voList) {
            vo.setCreatetime(null);
            array.add(gson.toJson(vo));
@@ -295,7 +295,7 @@
                if (resultGoodsList != null) {
                    GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
                            acceptData.getVersion(), acceptData.getSystem());
                    List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, resultGoodsList, paramsDTO);
                    List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, resultGoodsList, paramsDTO,false);
                    for (GoodsDetailVO vo : voList) {
                        array.add(gson2.toJson(vo));
                    }

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

@@ -633,7 +633,7 @@
        } else {// 普通购买
            OtherInfo otherInfo = new OtherInfo();
            RewardCouponVO rewardCoupon = new RewardCouponVO();
            rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
            rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()));
            JSONObject params1 = new JSONObject();
            if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
                params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -790,7 +790,7 @@
        // 奖励券返利
        RewardCouponVO rewardCoupon = new RewardCouponVO();
        rewardCoupon.setMaxMoneyPlus(maxMoneyPlus);
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()));
        JSONObject params1 = new JSONObject();
        if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
            params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -987,7 +987,7 @@
        // 附加信息
        OtherInfo otherInfo = new OtherInfo();
        RewardCouponVO rewardCoupon = new RewardCouponVO();
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()));
        JSONObject params1 = new JSONObject();
        if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
            params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -1194,7 +1194,7 @@
        // 附加信息
        OtherInfo otherInfo = new OtherInfo();
        RewardCouponVO rewardCoupon = new RewardCouponVO();
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()));
        JSONObject params1 = new JSONObject();
        if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
            params1.put("url", configService.getValue(ConfigKeyEnum.specialGuideRewardCouponLink.getKey(), acceptData.getSystem()));
@@ -1334,7 +1334,7 @@
        // 附加信息
        OtherInfo otherInfo = new OtherInfo();
        RewardCouponVO rewardCoupon = new RewardCouponVO();
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
        rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()));
        JSONObject params1 = new JSONObject();

        params1.put("url", userVipConfigService.getValueByKey("vip_link"));
@@ -1626,7 +1626,7 @@
            List<GoodsDetailVO> listExtra = new ArrayList<GoodsDetailVO>();
            GoodsMoneyConfigParamsDTO paramsDTO = getParamsDTO(acceptData.getPlatform(), acceptData.getVersion(), null, acceptData.getSystem());

            listExtra = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO);
            listExtra = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO,false);

            List<GoodsDetailVO> listQuality = new ArrayList<GoodsDetailVO>();
            // 取偶数个数据

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

@@ -196,7 +196,7 @@
                    if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) {
                        JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate",
                                Constant.getPlatformCode(acceptData.getPlatform()),
                                Integer.parseInt(acceptData.getVersion()));
                                Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
                        taskClassVO.setJumpDetail(jumpDetailV2);
                    }
                }

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

@@ -359,9 +359,9 @@

        JumpDetailV2 jumpDetail = null;
        if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
            jumpDetail = jumpDetailV2Service.getByTypeCache("spike_goods_list");
            jumpDetail = jumpDetailV2Service.getByTypeCache("spike_goods_list",acceptData.getSystem());
        } else {
            jumpDetail = jumpDetailV2Service.getByTypeCache("web");
            jumpDetail = jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem());
        }

        if (array == null) {
@@ -538,7 +538,7 @@
        params.put("balanceMore", true);
        root.put("params", params);
        root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("integralExchange",
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));

        root.put("name", "金币兑换");
        root.put("desc", "每日签到，惊喜不停");
@@ -576,10 +576,10 @@
        root.put("picture", "http://img.flqapp.com/resource/home_search_found.png");
        root.put("params", params);
        root.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web",
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));

        root.put("jumpResult", jumpDetailV2Service.getByTypeCache("search_goods_result",
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
        root.put("keyList", array);
        return root;
    }
@@ -655,7 +655,7 @@
                    acceptData.getVersion(), acceptData.getSystem());


            List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO);
            List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsList, paramsDTO,false);

            for (GoodsDetailVO vo : voList) {
                if (page < 3)
@@ -745,7 +745,7 @@
                                deviceGoodsList.add(goods);
                            }
                        }
                        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, deviceGoodsList, paramsDTO);
                        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, deviceGoodsList, paramsDTO,false);
                        for (GoodsDetailVO vo : voList) {
                            vo.setRecommend(true);
                        }

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

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

import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;

import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.entity.bus.search.HistorySearch;
import com.yeshi.fanli.exception.pdd.PDDApiException;
import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException;
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.vipshop.VipShopUtil;
import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDSearchFilter;
@@ -45,30 +16,35 @@
import com.yeshi.fanli.dto.vip.VIPSearchFilter;
import com.yeshi.fanli.dto.vip.VIPSearchResult;
import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.help.AppPageNotification;
import com.yeshi.fanli.entity.bus.search.HistorySearch;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.pdd.PDDApiException;
import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import com.yeshi.fanli.service.inter.brand.BrandInfoService;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.help.AppPageNotificationService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.ClipboardAnalysisManager;
import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;
import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -83,10 +59,12 @@
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.suning.SuningApiUtil;
import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.vipshop.VipShopApiUtil;
import com.yeshi.fanli.util.vipshop.VipShopUtil;
import com.yeshi.fanli.vo.brand.BrandInfoVO;
import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
import com.yeshi.fanli.vo.common.JumpDetailContentVO;
@@ -94,9 +72,28 @@
import com.yeshi.fanli.vo.msg.TokenVO;
import com.yeshi.fanli.vo.recommend.RecommendJumpInfoVO;
import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;
import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@Controller
@RequestMapping("api/v2/search")
@@ -204,7 +201,7 @@
                            int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
                            int version = Integer.parseInt(acceptData.getVersion());
                            JumpDetailContentVO convert = new JumpDetailContentVO();
                            convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));
                            convert.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version,acceptData.getSystem()));
                            JSONObject convertParams = new JSONObject();
                            convertParams.put("url", configService.getValue(ConfigKeyEnum.convertDocWebLink.getKey(), acceptData.getSystem()));
                            convertParams.put("clipboard", false);
@@ -226,17 +223,17 @@
                                if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
                                    view = new JumpDetailContentVO();
                                    view.setJumpDetail(
                                            jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version));
                                            jumpDetailV2Service.getByTypeCache("goodsdetail", platformCode, version,acceptData.getSystem()));
                                    view.setParams(params);
                                } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_JD) {
                                    view = new JumpDetailContentVO();
                                    view.setJumpDetail(
                                            jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version));
                                            jumpDetailV2Service.getByTypeCache("goodsdetail_jd", platformCode, version,acceptData.getSystem()));
                                    view.setParams(params);
                                } else if (result.getFirstGoods().getGoodsType() == Constant.SOURCE_TYPE_PDD) {
                                    view = new JumpDetailContentVO();
                                    view.setJumpDetail(
                                            jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version));
                                            jumpDetailV2Service.getByTypeCache("goodsdetail_pdd", platformCode, version,acceptData.getSystem()));
                                    view.setParams(params);
                                }

@@ -244,7 +241,7 @@
                                state = 2;
                                data.put("stateDesc", "选择搜券或转链");
                                view = new JumpDetailContentVO();
                                view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version));
                                view.setJumpDetail(jumpDetailV2Service.getByTypeCache("web", platformCode, version,acceptData.getSystem()));
                                JSONObject params = new JSONObject();
                                params.put("url", result.getFirstLink());
                                view.setParams(params);
@@ -304,7 +301,7 @@
                                                            acceptData.getPlatform(),
                                                            acceptData.getVersion(), acceptData.getSystem()));

                                            goodsDetailVO = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsBrief, goodsDetailVO);
                                            goodsDetailVO = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsBrief, goodsDetailVO,false);

                                            data.put("goods",
                                                    gson.toJson(goodsDetailVO));
@@ -442,7 +439,7 @@
        }

        RecommendJumpInfoVO left = new RecommendJumpInfoVO("去看看", jumpDetailV2Service.getByTypeCache(type,
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params);
                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()), params);
        data.put("left", gson.toJson(left));

        // 去网页
@@ -456,7 +453,7 @@
            params.put("url", rightValue);

            RecommendJumpInfoVO right = new RecommendJumpInfoVO("有更高返利？", jumpDetailV2Service.getByTypeCache("web",
                    Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())),
                    Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()),
                    params);
            data.put("right", gson.toJson(right));
        }
@@ -881,7 +878,7 @@
        GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
                acceptData.getVersion(), acceptData.getSystem());

        List<GoodsDetailVO> list = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsBriefList, paramsDTO);
        List<GoodsDetailVO> list = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goodsBriefList, paramsDTO,false);

        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
                .excludeFieldsWithoutExposeAnnotation().create();

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

@@ -13,6 +13,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.ks.push.service.BDeviceTokenService;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemFunction;
import com.yeshi.fanli.exception.user.UserExtraTaoBaoInfoException;
@@ -20,6 +21,7 @@
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.vo.taobao.TaoBaoUser;
import com.yeshi.fanli.vo.user.QQUserInfoVO;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -178,6 +180,9 @@
    @Resource
    private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;

    @Reference(version = "1.0", check = false)
    private BDeviceTokenService bDeviceTokenService;


    /**
     * 新版登录 V1.5.3
@@ -259,6 +264,9 @@
                            LogHelper.errorDetailInfo(e);
                        }

                        if (acceptData.getSystem().isNewPush()) {
                            bDeviceTokenService.bindUid(acceptData.getSystem().name(), StringUtil.isNullOrEmpty(acceptData.getUtdid()) ? acceptData.getDevice() : acceptData.getUtdid(), uuser.getId() + "");
                        } else {
                        // 绑定oppo,VIVO推送
                        DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
                        if (active != null) {
@@ -267,6 +275,9 @@
                            deviceTokenXMService.bindUid(active.getId(), uuser.getId());
                        }
                    }


                    }
                });
            }


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

@@ -110,7 +110,7 @@
                params.put("orderNo", detail.getOrderId());
                if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
                    params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));
                UserMsgVO msgVO = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"), params);
                UserMsgVO msgVO = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search",acceptData.getSystem()), params);
                msgVO.setType(MsgExtra.MSG_TYPE_ORDER);
                list.add(msgVO);
            } else if (obj instanceof MsgMoneyDetail) {
@@ -145,7 +145,7 @@
                MsgLijinVIPDetail detail = (MsgLijinVIPDetail) obj;
                JSONObject params = new JSONObject();
                params.put("url", configService.getValue(ConfigKeyEnum.lijinVIPLink, acceptData.getSystem()));
                UserMsgVO vo = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("web"), params);
                UserMsgVO vo = UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()), params);
                vo.setType(MsgExtra.MSG_TYPE_LIJIN_VIP);
                list.add(vo);
            } else if (obj instanceof UserSystemMsg) {

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

@@ -771,7 +771,7 @@
            orderRebateVO.setCouponText("奖励成功");
            orderRebateVO.setCouponDesc("已再返¥" + couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
            orderRebateVO.setCouponParams(params.toString());
            orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
            orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail",acceptData.getSystem()));
        } else if (freeState > 0) { // 已使用免单券
            JSONObject params = new JSONObject();
            params.put("orderNo", orderNo);
@@ -779,7 +779,7 @@
            orderRebateVO.setCouponType(2);
            orderRebateVO.setCouponUse(true);
            orderRebateVO.setCouponParams(params.toString());
            orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
            orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("freeCouponDetail",acceptData.getSystem()));
            if (UserSystemCouponRecord.STATE_FREE_ON == freeState) {
                orderRebateVO.setCouponText("免单中");
            } else if (UserSystemCouponRecord.STATE_SUCCESS == freeState) {

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

@@ -168,7 +168,7 @@
                        params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));

                    JumpDetailV2 wxmpJumDetail = JumpDetailUtil
                            .getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("order_search"));
                            .getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("order_search",acceptData.getSystem()));

                    UserMsgVO userMsgVO = UserMsgVOFactory.create(detail, wxmpJumDetail, params);
                    userMsgVO.setType(MSG_TYPE_ORDER);
@@ -249,7 +249,7 @@
                // TODO 跳转地址
                JSONObject params = new JSONObject();
                params.put("url", "http://apph5.banliapp.com/special/1.0.9/jingXuanN_9.html?type=9_9");
                JumpDetailV2 wxmpJumDetail = JumpDetailUtil.getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("web"));
                JumpDetailV2 wxmpJumDetail = JumpDetailUtil.getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("web",acceptData.getSystem()));
                userSystemMsgVO.setJumpDetail(wxmpJumDetail);

                root.put("systemMsg", userSystemMsgVO);

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

@@ -2,6 +2,8 @@

import java.util.List;

import com.ks.lijin.query.BaseDaoQuery;
import com.yeshi.fanli.entity.SystemEnum;
import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -43,32 +45,17 @@
     */
    int deleteBatchByPrimaryKey(List<Long> list);

    /**
     * 后端列表查询
     * 
     * @param start
     * @param count
     * @param key
     * @return
     */
    List<JumpDetailV2> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key);

    long countListQuery(@Param("key") String key);
    List<JumpDetailV2> list(@Param("query") DaoQuery daoQuery);

    /**
     * 根据Android版本获取最近的跳转值
     * @param type
     * @param version
     * @return
     */
    JumpDetailV2 selectAndroidByTypeAndVersion(@Param("type")String type, @Param("version")int version);
    long count(@Param("query") DaoQuery daoQuery);
    
    /**
     * 根据IOS版本获取最近的跳转值
     * @param type
     * @param version
     * @return
     */
    JumpDetailV2 selectIOSByTypeAndVersion(@Param("type")String type, @Param("version")int version);

    public class DaoQuery extends BaseDaoQuery {
        public String type;
        public Integer maxAndroidVersion;
        public Integer maxIOSVersion;
        public SystemEnum system;
    }

}

 fanli/src/main/java/com/yeshi/fanli/entity/SystemEnum.java

@@ -9,9 +9,9 @@
public enum SystemEnum {
    blks("com.yeshi.ec.rebate", "com.xyj.ec.fanli-ios", new String[]{}, new SystemFunction[]{SystemFunction.share,
            SystemFunction.bindPhone, SystemFunction.threeSale, SystemFunction.cloudOrder, SystemFunction.godenCorn, SystemFunction.redPack,SystemFunction.faQuan,SystemFunction.fanli,SystemFunction.vip,SystemFunction.inviteCode
    }, 1, "板栗快省","板栗快省"),
    flq("com.fanliunion.android", "com.xyj.ec.flq-ios", new String[]{}, new SystemFunction[]{SystemFunction.share,SystemFunction.faQuan,SystemFunction.fanli}, 11, "返利联盟","淘拼团"),
    yhqjx("com.youhuiquan.android","com.youhuiquanjx.ios",new String[]{}, new SystemFunction[]{SystemFunction.fanli,SystemFunction.lijinSub,SystemFunction.bindPhone}, 12, "特价","特价App");
    }, 1, "板栗快省", "板栗快省", false),
    flq("com.fanliunion.android", "com.xyj.ec.flq-ios", new String[]{}, new SystemFunction[]{SystemFunction.share, SystemFunction.faQuan, SystemFunction.fanli}, 11, "返利联盟", "淘拼团", false),
    yhqjx("com.youhuiquan.android", "com.youhuiquanjx.ios", new String[]{}, new SystemFunction[]{SystemFunction.fanli, SystemFunction.lijinSub, SystemFunction.bindPhone}, 12, "特价", "特价App", true);
    private String packageName;
    private String bundleId;
    private int systemId;
@@ -19,17 +19,20 @@
    private String[] wxxcxAppIds;
    private Set<SystemFunction> functionSet;
    private String smsAlias;
    //新版推送
    private boolean newPush;

    public String getSmsAlias() {
        return smsAlias;
    }

    private SystemEnum(String packageName, String bundleId, String[] wxxcxAppIds, SystemFunction[] functions, int systemId, String name, String smsAlias) {
    private SystemEnum(String packageName, String bundleId, String[] wxxcxAppIds, SystemFunction[] functions, int systemId, String name, String smsAlias, boolean newPush) {
        this.bundleId = bundleId;
        this.name = name;
        this.packageName = packageName;
        this.systemId = systemId;
        this.wxxcxAppIds = wxxcxAppIds;
        this.newPush = newPush;
        Set<SystemFunction> set = new HashSet<>();
        if (functions != null)
            for (SystemFunction f : functions)
@@ -61,4 +64,8 @@
    public String[] getWxxcxAppIds() {
        return wxxcxAppIds;
    }

    public boolean isNewPush() {
        return newPush;
    }
}

 fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetailV2.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.entity.common;

import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.SystemEnum;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;

@@ -36,6 +37,10 @@
    @org.yeshi.utils.mybatis.Column(name = "jp_controller")
    private String controller;

    @Expose
    @org.yeshi.utils.mybatis.Column(name = "jp_path")
    private String path;//小程序路径

    // 跳转类型
    @Expose
    @org.yeshi.utils.mybatis.Column(name = "jp_type")
@@ -49,9 +54,9 @@
    @org.yeshi.utils.mybatis.Column(name = "jp_min_ios_version")
    private Integer minIOSAppVersion;// 最小ios版本

    @Expose
    @org.yeshi.utils.mybatis.Column(name = "jp_path")
    private String path;//小程序路径

    @org.yeshi.utils.mybatis.Column(name = "jp_system")
    private SystemEnum system;

    public String getPath() {
        return path;
@@ -133,4 +138,11 @@
        this.type = type;
    }

    public SystemEnum getSystem() {
        return system;
    }

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

 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -240,7 +240,11 @@
    clipboardRecommendGoodsMakeMore("clipboard_recommend_goods_make_more_link", "根据粘贴板推荐商品赚更多链接"),
    welcomeMsg("welcome_message", "消息页面的欢迎消息"),
    gdtAdInfo("gdt_ad_info", "广点通广告信息"),
    demoLoginUser("demo_login_user", "模拟用户登录");
    demoLoginUser("demo_login_user", "模拟用户登录"),
    //推送
    pushAndroidActivityScheme("push_android_activity_scheme", "android推送Activity协议名称"),
    pushAndroidActivity("push_android_activity", "android接受推送的落地Activity"),
    pushAndroidHostPath("push_android_host_path", "android推送落地页唤起路径");


    private final String key;

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

@@ -338,7 +338,7 @@
                                        hongBaoManageService.getShareRate(SystemEnum.blks), null,
                                        hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP, SystemEnum.blks))));
                picture.setGoodState(0);
                picture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
                picture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail",SystemEnum.blks));
                picture.setParams(null);
                picture.setUrl(jdGoods.getPicUrl());
                imgs.add(picture);

 fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java

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

import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.vipshop.DingDanXiaApiUtil;
import org.springframework.stereotype.Component;

import com.xxl.job.core.biz.model.ReturnT;
@@ -89,7 +90,6 @@
    }



    //根据订单号更新
    @XxlJob("order-vip-updateByOrderSn")
    public ReturnT<String> updateByOrderSn(String param) throws Exception {
@@ -127,6 +127,20 @@
        }

        saveVipShopOrders(vipShopOrderList);

        //订单侠的接口
        page = 1;
        result = DingDanXiaApiUtil
                .getOrderList(VipShopOrderQueryModel.createOrderTime(startTime, endTime, null, page));

        while (result != null && result.getOrderList().size() > 0) {
            page++;
            vipShopOrderList.addAll(result.getOrderList());
            result = DingDanXiaApiUtil
                    .getOrderList(VipShopOrderQueryModel.createOrderTime(startTime, endTime, null, page));
        }

        saveVipShopOrders(vipShopOrderList);
    }

    /**

 fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java

@@ -114,7 +114,7 @@

    }

    private void loadTBMoneyInfo(SystemEnum system, Map<String, MoneyInfo> lijinMap, TaoBaoGoodsBrief goods, GoodsDetailVO detailVO) {
    private void loadTBMoneyInfo(SystemEnum system, Map<String, MoneyInfo> lijinMap, TaoBaoGoodsBrief goods, GoodsDetailVO detailVO, boolean detail) {
        if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub)) {
            //设置礼金
            MoneyInfo moneyInfo = lijinMap.get(goods.getAuctionId() + "");
@@ -123,6 +123,7 @@
            BigDecimal finalPrice = null;
            if (moneyInfo != null && moneyInfo.getLijinAmount() != null) {//有礼金
                detailVO.getMoneyInfo().setHongBaoMoney("¥" + moneyInfo.getLijinAmount());
                if (!detail)
                detailVO.getMoneyInfo().setFanliMoney(null);
                finalPrice = couponPrice.subtract(moneyInfo.getLijinAmount());
            } else {//无礼金
@@ -135,7 +136,7 @@
    }


    public GoodsDetailVO loadTBMoneyInfo(SystemEnum system, Long uid, TaoBaoGoodsBrief goodsBrief, GoodsDetailVO detailVO) {
    public GoodsDetailVO loadTBMoneyInfo(SystemEnum system, Long uid, TaoBaoGoodsBrief goodsBrief, GoodsDetailVO detailVO,boolean detail) {
        List<TaoBaoGoodsBrief> goodsBriefs = new ArrayList<>();
        goodsBriefs.add(goodsBrief);
        Map<String, MoneyInfo> lijinMap = null;
@@ -145,7 +146,7 @@
        }
        for (TaoBaoGoodsBrief goods : goodsBriefs) {
            try {
                loadTBMoneyInfo(system, lijinMap, goods, detailVO);
                loadTBMoneyInfo(system, lijinMap, goods, detailVO,detail);
            } catch (Exception e) {
                e.printStackTrace();
            }
@@ -154,7 +155,7 @@
    }


    public List<GoodsDetailVO> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, GoodsMoneyConfigParamsDTO paramsDTO) {
    public List<GoodsDetailVO> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, GoodsMoneyConfigParamsDTO paramsDTO,boolean detail) {
        Map<String, MoneyInfo> lijinMap = null;
        if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub)) {
            loadMaterialLibsType(goodsBriefList);
@@ -164,7 +165,7 @@
        for (TaoBaoGoodsBrief goods : goodsBriefList) {
            try {
                GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
                loadTBMoneyInfo(system, lijinMap, goods, detailVO);
                loadTBMoneyInfo(system, lijinMap, goods, detailVO,detail);
                voList.add(detailVO);
            } catch (Exception e) {
                e.printStackTrace();
@@ -180,7 +181,7 @@
    }


    private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO) {
    private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO,boolean detail) {
        Map<String, MoneyInfo> lijinMap = null;
        boolean hasCreateTime = false;
        if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub) && goodsBriefList.size() > 0) {
@@ -192,7 +193,7 @@
        for (int i = 0; i < goodsBriefList.size(); i++) {
            try {
                GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goodsBriefList.get(i), paramsDTO);
                loadTBMoneyInfo(system, lijinMap, goodsBriefList.get(i), detailVO);
                loadTBMoneyInfo(system, lijinMap, goodsBriefList.get(i), detailVO,detail);
                voList.add(new GoodsDetailVOWithKey(detailVO, goodsKeyList.get(i)));
            } catch (Exception e) {
                e.printStackTrace();
@@ -311,7 +312,7 @@
            }
        }
        GoodsDetailVO[] vos = new GoodsDetailVO[positionMap.size()];
        List<GoodsDetailVOWithKey> tbVOList = loadTBMoneyInfo(system, uid, taoBaoGoodsBriefList, tbKeyList, paramsDTO);
        List<GoodsDetailVOWithKey> tbVOList = loadTBMoneyInfo(system, uid, taoBaoGoodsBriefList, tbKeyList, paramsDTO,false);
        List<GoodsDetailVO> otherVOList = loadOtherMoneyInfo(system, uid, otherGoodsList, paramsDTO);

        for (GoodsDetailVOWithKey vo : tbVOList) {

 fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java

@@ -124,7 +124,7 @@
    }

    public static void errorDetailInfo(Throwable e) {
        logger.error("", e);
        logger.error("出错：", e);
    }

    public static void errorDetailInfo(Throwable e, String params, String url) {

 fanli/src/main/java/com/yeshi/fanli/service/impl/common/JumpDetailV2ServiceImpl.java

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

import javax.annotation.Resource;

import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;

@@ -49,17 +50,21 @@
    }

    @Override
    public List<JumpDetailV2> listByType(String type) {
        return jumpDetailV2Mapper.listByType(type);
    public List<JumpDetailV2> listByType(String type, SystemEnum system) {
        JumpDetailV2Mapper.DaoQuery daoQuery = new JumpDetailV2Mapper.DaoQuery();
        daoQuery.type = type;
        daoQuery.system = system;
        daoQuery.count = Integer.MAX_VALUE;
        return jumpDetailV2Mapper.list(daoQuery);
    }

    @Cacheable(value = "configCache", key = "'getByTypeCache-'+#type")
    @Override
    public JumpDetailV2 getByTypeCache(String type) {
    public JumpDetailV2 getByTypeCache(String type, SystemEnum system) {

        JumpDetailV2 jumpDetailV2 = null;

        List<JumpDetailV2> listByType = listByType(type);
        List<JumpDetailV2> listByType = listByType(type, system);

        if (listByType != null && listByType.size() > 0) {
            jumpDetailV2 = listByType.get(0);
@@ -72,17 +77,29 @@

    @Cacheable(value = "configCache", key = "'getByTypeCache-'+#type+'-'+#platform+'-'+#version")
    @Override
    public JumpDetailV2 getByTypeCache(String type, int platform, int version) {
    public JumpDetailV2 getByTypeCache(String type, int platform, int version, SystemEnum system) {
        JumpDetailV2Mapper.DaoQuery daoQuery = new JumpDetailV2Mapper.DaoQuery();
        daoQuery.type = type;
        daoQuery.system = system;
        if (platform == 1) {
            return jumpDetailV2Mapper.selectAndroidByTypeAndVersion(type, version);
            daoQuery.maxAndroidVersion = version;
        } else {
            return jumpDetailV2Mapper.selectIOSByTypeAndVersion(type, version);
            daoQuery.maxIOSVersion = version;
        }
        daoQuery.count = 1;
        List<JumpDetailV2> list = jumpDetailV2Mapper.list(daoQuery);
        if (list == null || list.size() == 0)
            return list.get(0);
        else
            return list.get(0);
    }

    @Override
    public List<JumpDetailV2> listJump() {
        return jumpDetailV2Mapper.listJump();
    public List<JumpDetailV2> listJump(SystemEnum system) {
        JumpDetailV2Mapper.DaoQuery daoQuery = new JumpDetailV2Mapper.DaoQuery();
        daoQuery.count = Integer.MAX_VALUE;
        daoQuery.system = system;
        return jumpDetailV2Mapper.list(daoQuery);
    }

    @Override
@@ -91,13 +108,21 @@
    }

    @Override
    public List<JumpDetailV2> listQuery(long start, int count, String key) {
        return jumpDetailV2Mapper.listQuery(start, count, key);
    public List<JumpDetailV2> listQuery(long start, int count, String key, SystemEnum system) {
        JumpDetailV2Mapper.DaoQuery daoQuery = new JumpDetailV2Mapper.DaoQuery();
        daoQuery.key = key;
        daoQuery.start = start;
        daoQuery.count = count;
        daoQuery.system = system;
        return jumpDetailV2Mapper.list(daoQuery);
    }

    @Override
    public long countListQuery(String key) {
        return jumpDetailV2Mapper.countListQuery(key);
    public long countListQuery(String key, SystemEnum system) {
        JumpDetailV2Mapper.DaoQuery daoQuery = new JumpDetailV2Mapper.DaoQuery();
        daoQuery.key = key;
        daoQuery.system = system;
        return jumpDetailV2Mapper.count(daoQuery);
    }

}

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -322,7 +322,7 @@
            goodsPicture.setH(100);
            goodsPicture.setW(100);
            goodsPicture.setUrl(TbImgUtil.getTBSize320Img(goodsBrief.getPictUrl()));
            goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
            goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail", SystemEnum.blks));
            goodsPicture.setParams(item.toString());
            goodsPicture.setGoods(taoBaoGoodsBriefExtra);

@@ -379,7 +379,7 @@
                // 商品图片
                taoBaoGoodsBriefExtra.setUpdatetime(new Date());
                taoBaoGoodsBriefExtra.setCouponInfo(null);
                GoodsPicture goodsPicture = getGoodsPicture(daTaoKe);
                GoodsPicture goodsPicture = getGoodsPicture(daTaoKe, SystemEnum.blks);
                goodsPicture.setGoods(taoBaoGoodsBriefExtra);

                listPicture.add(goodsPicture);
@@ -507,7 +507,7 @@
        goodsExtra.setUpdatetime(new Date());
        goodsExtra.setCouponInfo(null);

        GoodsPicture goodsPicture = getGoodsPicture(daTaoKe);
        GoodsPicture goodsPicture = getGoodsPicture(daTaoKe, SystemEnum.blks);
        goodsPicture.setGoods(goodsExtra);
        // 商品列表
        List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();
@@ -615,12 +615,12 @@
     * @param daTaoKe
     * @return
     */
    public GoodsPicture getGoodsPicture(DaTaoKeDetailV2 daTaoKe) {
    public GoodsPicture getGoodsPicture(DaTaoKeDetailV2 daTaoKe, SystemEnum system) {
        GoodsPicture goodsPicture = new GoodsPicture();
        goodsPicture.setH(100);
        goodsPicture.setW(100);
        goodsPicture.setUrl(TbImgUtil.getTBSize320Img(daTaoKe.getMainPic()));
        goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
        goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail", system));

        String goodsId = daTaoKe.getGoodsId().toString();
        JSONObject item = new JSONObject();
@@ -852,7 +852,7 @@
                    goodsPicture.setH(100);
                    goodsPicture.setW(100);
                    goodsPicture.setUrl(TbImgUtil.getTBSize320Img(taoBaoGoodsBrief.getPictUrl()));
                    goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));
                    goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail", SystemEnum.blks));
                    goodsPicture.setParams(item.toString());
                    goodsPicture.setGoods(taoBaoGoodsBriefExtra);

@@ -1041,7 +1041,7 @@
                        JumpDetailV2 jumpDetail = goodsNew.getJumpDetail();
                        if (jumpDetail != null) {
                            JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache(jumpDetail.getType(),
                                    platform, version);
                                    platform, version, SystemEnum.blks);
                            if (jumpDetailV2 != null) {
                                goodsNew.setJumpDetail(jumpDetailV2);
                            }

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java

@@ -2327,7 +2327,7 @@
                        if (goodsBrief != null && goodsBrief.getImgList() != null) {
                            GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
                            goods = GoodsDetailVOFactory.convertTaoBao(goodsBrief, params);
                            goods = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBrief, goods);
                            goods = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBrief, goods,false);
                            for (String img : goodsBrief.getImgList()) {
                                if (!imgSet.contains(img) && imgs.size() < 9) {
                                    imgSet.add(img);

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java

@@ -78,7 +78,7 @@
            throw new FloatADException(1, "类型不能为空");
            
        if (!StringUtil.isNullOrEmpty(jumpType)) {
            List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
            List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType,record.getSystem());
            if (listByType !=null && listByType.size() > 0) {
                record.setJumpDetail(listByType.get(0));
            } 

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java

@@ -80,7 +80,7 @@

    @Override
    public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record,
            String jumpType, CommonShareInfo shareInfo) throws SpecialException, Exception {
            String jumpType, CommonShareInfo shareInfo,SystemEnum system) throws SpecialException, Exception {

        Long cardId = record.getCardId();
        if (cardId == null) {
@@ -107,7 +107,7 @@
        }

        if (!StringUtil.isNullOrEmpty(jumpType)) {
            List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
            List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType,system);
            if (listByType != null && listByType.size() > 0) {
                record.setJumpDetail(listByType.get(0));
            }
@@ -553,14 +553,14 @@
        if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion()))
            for (Special s : listArc) {
                if (s.getName().contains("9.9")) {// 9块9
                    s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));
                    s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template",system));
                    JSONObject params = new JSONObject();
                    params.put("key", CommonContentTypeEnum._9k9.name());
                    params.put("title", CommonContentTypeEnum._9k9.getDesc());
                    s.setParams(params.toString());
                } else if (s.getName().contains("自购立减")) {
                    if (hour < 6) {// 0-6点之间不进入自购立减的页面
                        s.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
                        s.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",system));
                        JSONObject params = new JSONObject();
                        params.put("url", configService.getValue(ConfigKeyEnum.tljOwnBuyNogoods.getKey(), SystemInfoUtil.getSystem(acceptData)));
                        s.setParams(params.toString());
@@ -634,7 +634,7 @@
            if (listBlock != null)
                for (int i = 0; i < listBlock.size(); i++) {
                    if ("品牌券".equalsIgnoreCase(listBlock.get(i).getName())) {
                        listBlock.get(i).setJumpDetail(jumpDetailV2Service.getByTypeCache("hot_cakes"));
                        listBlock.get(i).setJumpDetail(jumpDetailV2Service.getByTypeCache("hot_cakes",system));
                    }
                }

@@ -711,7 +711,7 @@

                    specialVO.setComment(comment);
                    specialVO.setParams(params.toString());
                    specialVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
                    specialVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",system));
                }
                listVo.add(specialVO);
            }

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java

@@ -95,7 +95,7 @@
    }

    @Override
    public void saveObject(MultipartFile file, SwiperPicture record, String jumpType, CommonShareInfo shareInfo)
    public void saveObject(MultipartFile file, SwiperPicture record, String jumpType, CommonShareInfo shareInfo,SystemEnum system)
            throws SwiperPictureException, Exception {
        if (record == null) {
            throw new SwiperPictureException(1, "参数不能为空");
@@ -127,7 +127,7 @@
        
        
        if (!StringUtil.isNullOrEmpty(jumpType)) {
            List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
            List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType,system);
            if (listByType != null && listByType.size() > 0) {
                record.setJumpDetail(listByType.get(0));
            }
@@ -480,7 +480,7 @@
                    
                    bannerVO.setComment(info.getComment());
                    bannerVO.setParams(params.toString());
                    bannerVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
                    bannerVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",system));
                }
                listVo.add(bannerVO);
            }

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java

@@ -341,7 +341,7 @@
        Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
                .excludeFieldsWithoutExposeAnnotation().create();

        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBriefList, paramsDTO);
        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBriefList, paramsDTO,false);
        for (GoodsDetailVO vo : voList) {
            re.add(vo);
        }

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java

@@ -51,7 +51,7 @@
            dto.setIcon("http://img.flqapp.com/resource/msg/icon_zhushou.png");
            dto.setTitle(Constant.systemCommonConfig.getProjectChineseName() + "小助手");
            dto.setUpdateTime(new Date());
            dto.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
            dto.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",systemEnum));
            Config config = new Config();
            config.setCreatetime(System.currentTimeMillis() + "");
            config.setKey(KEY_ZHUSHOU);
@@ -86,7 +86,7 @@
            dto.setIcon("http://img.flqapp.com/resource/msg/icon_guanxuan.png");
            dto.setTitle("官宣任务");
            dto.setUpdateTime(new Date());
            dto.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
            dto.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",systemEnum));
            Config config = new Config();
            config.setCreatetime(System.currentTimeMillis() + "");
            config.setKey(KEY_GUANXUAN);

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -728,7 +728,7 @@
            Map<String, Object> jump = new HashMap<String, Object>();
            jump.put("type", 1); // 页面跳转
            jump.put("params", jumpLink);
            jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
            jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail",acceptData.getSystem()));

            Map<String, Object> rewardMap = new HashMap<String, Object>();
            rewardMap.put("text", rewardStyleVO);
@@ -757,7 +757,7 @@
            Map<String, Object> jump = new HashMap<String, Object>();
            jump.put("type", 1); // 1 常规跳转页面
            jump.put("params", jumpLink);
            jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
            jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",acceptData.getSystem()));
            rewardMap.put("jump", jump);
            order.setRewardDetail(rewardMap);
        }
@@ -782,7 +782,7 @@
            long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
            if (downOrderTime > limitDate) {
                // 2.1 开始新版
                rewardCounponLimitTime(order, accountTime);
                rewardCounponLimitTime(order, accountTime,acceptData.getSystem());
            } else if (hasRewardCoupon) {
                // 在2.1新版上线之前订单-存在则显示奖励券可使用
                ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
@@ -797,7 +797,7 @@
                Map<String, Object> jump = new HashMap<String, Object>();
                jump.put("type", 2); // 弹框
                jump.put("params", jumpLink);
                jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
                jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",acceptData.getSystem()));

                Map<String, Object> rewardMap = new HashMap<String, Object>();
                rewardMap.put("text", rewardStyleVO);
@@ -807,7 +807,7 @@
        }
    }

    private void rewardCounponLimitTime(CommonOrderVO order, Date accountTime) throws Exception {
    private void rewardCounponLimitTime(CommonOrderVO order, Date accountTime,SystemEnum system) throws Exception {
        // 倒计时验证
        Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
        long currentTime = java.lang.System.currentTimeMillis();
@@ -882,7 +882,7 @@
        Map<String, Object> jump = new HashMap<String, Object>();
        jump.put("type", 2); // 弹出框使用券
        jump.put("params", jumpLink);
        jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
        jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",system));
        rewardMap.put("jump", jump);
        order.setRewardDetail(rewardMap);
    }
@@ -1806,7 +1806,7 @@
    }

    @Override
    public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
    public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType,SystemEnum system) {

        JSONObject map = new JSONObject();
        // 订单标识
@@ -1828,7 +1828,7 @@
        Map<String, Object> jump = new HashMap<String, Object>();
        jump.put("type", 1);
        jump.put("params", jumpLink);
        jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
        jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail",system));

        Map<String, Object> rewardMap = new HashMap<String, Object>();
        rewardMap.put("text", rewardStyleVO);

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -1,5 +1,10 @@
package com.yeshi.fanli.service.impl.push;

import com.ks.push.exception.BPushTaskException;
import com.ks.push.pojo.DO.BPushFilter;
import com.ks.push.pojo.DO.BPushMessage;
import com.ks.push.pojo.DO.BPushTask;
import com.ks.push.service.BPushTaskService;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.dao.mybatis.push.PushRecordMapper;
import com.yeshi.fanli.dto.push.PushBaseContent;
@@ -8,28 +13,39 @@
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.common.JumpDetailV2;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
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.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
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 net.sf.json.JSONObject;
import org.apache.dubbo.config.annotation.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.*;

@Service
public class PushServiceImpl implements PushService {
    Logger logger = LoggerFactory.getLogger(PushService.class);

    static String PROJECT_NAME = "";

    static {
        PROJECT_NAME = Constant.systemCommonConfig.getProjectChineseName();
    }

    @Resource
    private SystemZnxService systemZnxService;

@@ -57,9 +73,14 @@
    @Resource
    private AppVersionService appVersionService;

    @Reference(version = "1.0", check = false)
    private BPushTaskService bPushTaskService;

    @Resource
    private SystemConfigService systemConfigService;
    private ConfigService configService;

    @Resource
    private JumpDetailV2Service jumpDetailV2Service;

    @Override
    public void pushGoods(Long uid, String title, String content, String url, List<String> listIOS,
@@ -73,6 +94,23 @@
        if (StringUtil.isNullOrEmpty(content))
            throw new PushException(1, "请填写推送内容");

        if (system.isNewPush()) {
            List<Long> uidList = null;
            if (uid != null) {
                uidList = new ArrayList<>();
                uidList.add(uid);
            }
            List<Integer> versionCodeList = null;
            if (listAndroid == null || listAndroid.size() > 0) {
                if (listAndroid != null)
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
            }
            try {
                newPush(system, uidList, versionCodeList, null, title, content, NewPushExtraParamsFactory.createGoods(jumpDetailV2Service.getByTypeCache("goodsdetail", system), gid, Constant.SOURCE_TYPE_TAOBAO));
            } catch (BPushTaskException e) {
                logger.error("推送-商品：{}", gid, e);
            }
        } else {
        /* IOS端推送 (注明：list等于 'null' 时全推， size等于0 不做推送) */
        if (listIOS == null || listIOS.size() > 0) {
            // 限制推送版本号：0
@@ -111,7 +149,7 @@
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
                vIVOPushService.pushGoods(uid, Long.parseLong(gid), new PushBaseContent(title, content, versionCodeList, system));
            }

            }
        }

        PushRecord pushRecord = new PushRecord();
@@ -136,6 +174,25 @@
            throw new PushException(1, "无推送标题");
        if (StringUtil.isNullOrEmpty(content))
            throw new PushException(1, "无推送内容");


        if (system.isNewPush()) {
            List<Long> uidList = null;
            if (uid != null) {
                uidList = new ArrayList<>();
                uidList.add(uid);
            }
            List<Integer> versionCodeList = null;
            if (listAndroid == null || listAndroid.size() > 0) {
                if (listAndroid != null)
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
            }
            try {
                newPush(system, uidList, versionCodeList, null, title, content, NewPushExtraParamsFactory.createUrl(jumpDetailV2Service.getByTypeCache("web", system), url));
            } catch (BPushTaskException e) {
                logger.error("推送-链接：{}", url, e);
            }
        } else {

        /* IOS端推送 (注明：list等于 'null' 时全推， size等于0 不做推送) */
        if (listIOS == null || listIOS.size() > 0) {
@@ -177,7 +234,7 @@
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
                vIVOPushService.pushUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));
            }

            }
        }

        PushRecord pushRecord = new PushRecord();
@@ -220,6 +277,24 @@
            accountMessageMapper.insertSelective(accountMessage);
        }

        if (system.isNewPush()) {
            logger.debug("新版站内信推送开始：uid-{} title-{} content-{}", new Object[]{uId, title, content});
            List<Long> uidList = null;
            if (uId != null) {
                uidList = new ArrayList<>();
                uidList.add(uId);
            }
            List<Integer> versionCodeList = null;
            if (listAndroid == null || listAndroid.size() > 0) {
                if (listAndroid != null)
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
            }
            try {
                newPush(system, uidList, versionCodeList, null, title, content, NewPushExtraParamsFactory.createZNX(jumpDetailV2Service.getByTypeCache("system_msg", system)));
            } catch (BPushTaskException e) {
                logger.error("推送-站内信：{}", uId + "", e);
            }
        } else {
        /* IOS端推送 (注明：list等于 'null' 时全推， size等于0 不做推送) */
        if (listIOS == null || listIOS.size() > 0) {
            // 限制推送版本号：0
@@ -259,6 +334,7 @@
                if (listAndroid != null)
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
                vIVOPushService.pushZNX(uId, new PushBaseContent(title, content, versionCodeList, system));
                }
            }
        }

@@ -345,6 +421,24 @@
        if (StringUtil.isNullOrEmpty(content))
            throw new PushException(1, "无推送内容");

        if (system.isNewPush()) {
            List<Long> uidList = null;
            if (uid != null) {
                uidList = new ArrayList<>();
                uidList.add(uid);
            }
            List<Integer> versionCodeList = null;
            if (listAndroid == null || listAndroid.size() > 0) {
                if (listAndroid != null)
                    versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
            }
            try {
                newPush(system, uidList, versionCodeList, null, title, content, NewPushExtraParamsFactory.createBaichuan(jumpDetailV2Service.getByTypeCache("system_msg", system), url));
            } catch (BPushTaskException e) {
                logger.error("推送-百川：{}", url, e);
            }
        } else {

        // 适用版本 1.4.8及以后 推送百川网页

        /* IOS端推送 (注明：list等于 'null' 时全推， size等于0 不做推送) */
@@ -387,6 +481,7 @@
            if (listAndroid != null)
                versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid, system);
            vIVOPushService.pushBaiChuanUrl(uid, url, new PushBaseContent(title, content, versionCodeList, system));
            }
        }

        // 插入推送记录
@@ -602,4 +697,101 @@
        pushRecordMapper.insertSelective(pushRecord);
    }

    private void newPush(SystemEnum system, List<Long> uidList, List<Integer> versionCodeList, Date startPushTime, String title, String content, Map<String, String> params) throws BPushTaskException {

        logger.debug("新版推送开始：title-{} content-{}", new Object[]{title, content});
        //灰度测试
        if (uidList == null || uidList.size() == 0 || uidList.size() > 1)
            return;
        Set<Long> uidSet = new HashSet<>();
        uidSet.add(6857703L);
        uidSet.add(6845887L);

        if (!uidSet.contains(uidList.get(0))) {
            return;
        }

        logger.debug("新版推送灰度测试开始：title-{} content-{}", new Object[]{title, content});


        BPushFilter filter = new BPushFilter();
        //设置用户信息
        List<String> uidStrList = null;
        if (uidList != null && uidList.size() > 0) {
            uidStrList = new ArrayList<>();
            for (Long uid : uidList) {
                uidStrList.add(uid + "");
            }
        }
        filter.setUidList(uidStrList);
        filter.setVersionCodeList(versionCodeList);
        //默认推送最近两个月的活跃用户
        filter.setMinActiveTime(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 60));
        filter.setStartPushTime(startPushTime);

        BPushMessage message = new BPushMessage();
        message.setAndroidActivityScheme(configService.getValue(ConfigKeyEnum.pushAndroidActivityScheme, system));
        message.setAndroidActivity(configService.getValue(ConfigKeyEnum.pushAndroidActivity, system));
        message.setAndroidHostPath(configService.getValue(ConfigKeyEnum.pushAndroidHostPath, system));
        message.setTitle(title);
        message.setContent(content);

        message.setExtras(params);
        BPushTask pushTask = new BPushTask();
        pushTask.setFilter(filter);
        pushTask.setAppCode(system.name());
        pushTask.setMessage(message);
        String taskId = bPushTaskService.createTask(pushTask);
        if (startPushTime == null) {
            bPushTaskService.startPush(taskId);
        }

        logger.debug("新版推送灰度测试结束：title-{} content-{}", new Object[]{title, content});
    }

    private static class NewPushExtraParamsFactory {

        public static Map<String, String> createCommon(JumpDetailV2 jumpDetail, JSONObject cps) {
            Map<String, String> params = new HashMap<>();
            params.put("activity", jumpDetail.getActivity());
            params.put("type", jumpDetail.getType());
            params.put("controller", jumpDetail.getController());
            if (cps != null)
                params.put("params", cps.toString());
            return params;
        }

        //单品推送
        public static Map<String, String> createGoods(JumpDetailV2 jumpDetail, String goodsId, Integer goodsType) {
            JSONObject cps = new JSONObject();
            cps.put("goodsId", goodsId);
            cps.put("goodsType", goodsType);
            cps.put("from", "push");
            return createCommon(jumpDetail, cps);
        }

        //站内信
        public static Map<String, String> createZNX(JumpDetailV2 jumpDetail) {
            return createCommon(jumpDetail, null);
        }

        //推送链接
        public static Map<String, String> createUrl(JumpDetailV2 jumpDetail, String url) {
            JSONObject cps = new JSONObject();
            cps.put("url", url);
            cps.put("from", "push");
            return createCommon(jumpDetail, cps);
        }

        //推送百川链接
        public static Map<String, String> createBaichuan(JumpDetailV2 jumpDetail, String url) {
            JSONObject cps = new JSONObject();
            cps.put("url", url);
            cps.put("from", "push");
            return createCommon(jumpDetail, cps);
        }


    }

}

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java

@@ -244,7 +244,7 @@
        winDetailVO.setDesc("已领取：" + balance + "元");
        winDetailVO.setTips(configTaoLiJinService.getValueByKey("new_user_win_tips"));
        winDetailVO.setParams(json.toString());
        winDetailVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
        winDetailVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",userInfo.getSystem()));
        winDetailVO.setLogo(userInfoService.getDefaultPortrait(userInfo.getSystem()));
        winDetailVO.setLogoLight(userInfo.getPortrait());
        return winDetailVO;

 fanli/src/main/java/com/yeshi/fanli/service/inter/common/JumpDetailV2Service.java

@@ -2,13 +2,13 @@

import java.util.List;

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

/**
 * 跳转详情
 * 
 * @author Administrator
 *
 */
public interface JumpDetailV2Service {

@@ -30,31 +30,27 @@
     * @param type
     * @return
     */
    public List<JumpDetailV2> listByType(String type);
    public List<JumpDetailV2> listByType(String type, SystemEnum system);

    /**
     * 根据类型取值
     * 
     * @param type
     *            类型
     * @param type 类型
     * @return
     */
    public JumpDetailV2 getByTypeCache(String type);
    public JumpDetailV2 getByTypeCache(String type, SystemEnum system);

    /**
     * 根据类型取值
     * 
     * @param type
     *            类型
     * @param platform
     *            -平台 1:android 2:ios
     * @param version
     *            ios-build android-versionCode
     * @param type     类型
     * @param platform -平台 1:android 2:ios
     * @param version  ios-build android-versionCode
     * @return
     */
    public JumpDetailV2 getByTypeCache(String type, int platform, int version);
    public JumpDetailV2 getByTypeCache(String type, int platform, int version, SystemEnum system);

    public List<JumpDetailV2> listJump();
    public List<JumpDetailV2> listJump(SystemEnum system);

    /**
     * 根据主键批量删除
@@ -72,8 +68,8 @@
     * @param key
     * @return
     */
    List<JumpDetailV2> listQuery(long start, int count, String key);
    List<JumpDetailV2> listQuery(long start, int count, String key, SystemEnum system);

    long countListQuery(String key);
    long countListQuery(String key, SystemEnum system);

}

 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java

@@ -55,7 +55,7 @@
     * @throws Exception
     */
    public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record
            , String jumpType, CommonShareInfo shareInfo) throws SpecialException, Exception;
            , String jumpType, CommonShareInfo shareInfo,SystemEnum system) throws SpecialException, Exception;

    /**
     * 更换顺序

 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SwiperPictureService.java

@@ -106,7 +106,7 @@
     * @param record
     * @throws SwiperPictureException
     */
    public void saveObject(MultipartFile file, SwiperPicture record, String jumpType, CommonShareInfo shareInfo)
    public void saveObject(MultipartFile file, SwiperPicture record, String jumpType, CommonShareInfo shareInfo,SystemEnum system)
            throws SwiperPictureException, Exception;

    /**

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -278,7 +278,7 @@
     * @param orderNo
     * @return
     */
    public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
    public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType,SystemEnum system);

    /**
     * 根据交易号获取订单详情

 fanli/src/main/java/com/yeshi/fanli/service/manger/JobManager.java

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

@Component
public class JobManager {

    @Resource
    private BoutiqueAutoRuleService boutiqueAutoRuleService;

@@ -682,6 +683,7 @@
                        Iterator<String> its = map.keySet().iterator();
                        while (its.hasNext()) {
                            String key = its.next();
                            LogHelper.test("拼多多订单处理开始：" + key);
                            try {
                                String orderId = map.get(key);
                                if (!StringUtil.isNullOrEmpty(orderId)) {
@@ -691,7 +693,9 @@
                                            orderProcessService.processPDDOrder(order);
                                }
                                PDDOrderCMQManager.getInstance().deletePDDOrder(key);
                                LogHelper.test("拼多多订单处理成功：" + key);
                            } catch (Exception e) {
                                LogHelper.test("拼多多订单处理失败：" + key);
                                LogHelper.errorDetailInfo(e);
                            }
                        }

 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

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

public class Constant {
    public static boolean IS_TASK = false;
    public static boolean IS_TASK = true;
    // 外网环境
    public static boolean IS_OUTNET = false;


 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java

@@ -40,6 +40,9 @@
    private final static String appKey = "f9e7f22f";
    private final static String appSecret = "9B2291352497FAF42B2DF44BFCF62316";

    //是否采用订单侠转链
    private final static boolean CONVERT_DINGDANXIA = true;

    /**
     * 获取签名
     *
@@ -209,6 +212,11 @@
     * @param goodsId
     */
    public static VIPConvertResultDTO convertLink(String goodsId, String tag) {

        if (CONVERT_DINGDANXIA) {
            return DingDanXiaApiUtil.convertLink(goodsId, tag);
        }

        JSONObject taskParams = new JSONObject();
        JSONArray goodsIdArray = new JSONArray();
        goodsIdArray.add(goodsId);
@@ -228,6 +236,10 @@


    public static VIPConvertResultDTO convertLinkByUrl(String url, String tag) {

        if (CONVERT_DINGDANXIA) {
            return DingDanXiaApiUtil.convertLinkByUrl(url, tag);
        }
        JSONObject taskParams = new JSONObject();
        JSONArray urlArray = new JSONArray();
        urlArray.add(url);

 fanli/src/main/resource/env-dev/constant.properties

@@ -1,3 +1,3 @@
task =false
outnetwork =false
test=false
test=true

 fanli/src/main/resource/kafka_log.properties

@@ -1,6 +1,6 @@
log.config.kafka.isSend=true
log.config.kafka.bootstrapServers= 134.175.68.214:9092
log.config.kafka.topic=    log_fanli_error
log.config.kafka.bootstrapServers= 134.175.68.214:9092,134.175.68.214:9093,134.175.68.214:9094
log.config.kafka.topic=    log_fanli_errors
log.config.kafka.batchSize=5
log.config.kafka.lingerMs=1000
log.config.kafka.compressionType=gzip

 fanli/src/main/resource/logback.xml

@@ -15,7 +15,7 @@
    <property name="log.maxSize" value="20MB"/>
    <!--日志存储的根路径 ${catalina.base}指向每个Tomcat目录私有信息的位置，
             就是conf、logs、temp、webapps和work的父目录-->
    <property name="log.filePath" value="/tmp/logs"/>
    <property name="log.filePath" value="D:/logs"/>
    <!--日志展示的格式-->
    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n"/>

@@ -49,6 +49,28 @@

        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>ERROR</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>

    <!-- ERROR -->
    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.filePath}/debug/debug.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <fileNamePattern>${log.filePath}/debug/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
            <maxHistory>${log.maxHistory}</maxHistory>
            <maxFileSize>${log.maxSize}</maxFileSize>
        </rollingPolicy>

        <layout class="ch.qos.logback.classic.PatternLayout">
            <pattern>
                ${log.pattern}
            </pattern>
        </layout>

        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>DEBUG</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
@@ -351,6 +373,29 @@
    </appender>


    <!-- 用户商品浏览 -->
    <appender name="KAFKA_USER_GOODS_SCAN" class="com.yeshi.fanli.log.KafkaAppender">
        <!-- encoder必须配置, 日志格式 -->
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <!--<pattern>-->
            <!--%red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %highlight(%-5level) %green([%thread]) %boldMagenta(%logger{10}) - %cyan(%msg%n)-->
            <!--</pattern>-->
            <!--为了便于分析将日志数据转为json格式-->
            <pattern>${log.pattern}</pattern>
            <!-- 控制台也要使用UTF-8，不要使用GBK，否则会中文乱码 -->
            <charset>UTF-8</charset>
        </encoder>
        <bootstrapServers>${bootstrapServers}</bootstrapServers>
        <topic>log_fanli_user_goods_scan</topic>
        <batchSize>${batchSize}</batchSize>
        <lingerMs>${lingerMs}</lingerMs>
        <compressionType>${compressionType}</compressionType>
        <retries>${retries}</retries>
        <maxRequestSize>${maxRequestSize}</maxRequestSize>
        <isSend>${isSend}</isSend>
    </appender>


    <!--name表示为哪一个logger指定层级和输出的方式
       additivity表示叠加祖先的输出方式(默认为true,会叠加)，所以com.lxc.o2o以及其子类都会输出在控制台中，因为这个logger继承了root中的appender
       level表示级别大于等于${log.level}的信息才会输出,输出方式为配置的appender，
@@ -417,6 +462,18 @@
        <appender-ref ref="PUSH"></appender-ref>
    </logger>

    <logger name="userGoodsScanLog" level="INFO" additivity="false">
        <appender-ref ref="KAFKA_USER_GOODS_SCAN"></appender-ref>
    </logger>


    <logger name="com.yeshi.fanli" level="DEBUG" additivity="true">
        <appender-ref ref="DEBUG_FILE"></appender-ref>
    </logger>




    <!-- 一切logger都会继承自root，root默认的层级level为debug -->
    <root>
        <level value="INFO"/>

 fanli/src/main/resource/mapping/common/JumpDetailV2Mapper.xml

@@ -10,32 +10,21 @@
        <result column="jp_type" property="type" jdbcType="VARCHAR" />
        <result column="jp_need_login" property="needLogin" jdbcType="BOOLEAN" />
        <result column="jp_path" property="path" jdbcType="VARCHAR" />
        <result column="jp_min_android_version" property="minAndroidAppVersion"
            jdbcType="INTEGER" />
        <result column="jp_min_ios_version" property="minIOSAppVersion"
            jdbcType="INTEGER" />
        <result column="jp_min_android_version" property="minAndroidAppVersion" jdbcType="INTEGER"/>
        <result column="jp_min_ios_version" property="minIOSAppVersion" jdbcType="INTEGER"/>
        <result column="jp_system" property="system" jdbcType="VARCHAR"/>
    </resultMap>
    <sql id="Base_Column_List">jp_id,jp_name,jp_activity,jp_controller,jp_type,jp_need_login,jp_min_android_version,jp_min_ios_version,jp_path
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        select
    <sql id="Base_Column_List">jp_id,jp_name,jp_activity,jp_controller,jp_type,jp_need_login,jp_min_android_version,jp_min_ios_version,jp_path,jp_system</sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
        <include refid="Base_Column_List" />
        from yeshi_ec_action_jumpdetail_v2 where jp_id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_action_jumpdetail_v2 where jp_id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2"
        useGeneratedKeys="true" keyProperty="id">insert into
        yeshi_ec_action_jumpdetail_v2
        (jp_id,jp_name,jp_activity,jp_controller,jp_type,jp_need_login,jp_min_android_version,jp_min_ios_version,jp_path)
        values
        (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{activity,jdbcType=VARCHAR},#{controller,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{needLogin,jdbcType=BOOLEAN},#{minAndroidAppVersion,jdbcType=INTEGER},#{minIOSAppVersion,jdbcType=INTEGER},#{path,jdbcType=VARCHAR})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_action_jumpdetail_v2
    <delete id="deleteByPrimaryKey"
            parameterType="java.lang.Long">delete from yeshi_ec_action_jumpdetail_v2 where jp_id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2" useGeneratedKeys="true"
            keyProperty="id">insert into yeshi_ec_action_jumpdetail_v2 (jp_id,jp_name,jp_activity,jp_controller,jp_type,jp_need_login,jp_min_android_version,jp_min_ios_version,jp_path,jp_system) values (#{id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{activity,jdbcType=VARCHAR},#{controller,jdbcType=VARCHAR},#{type,jdbcType=VARCHAR},#{needLogin,jdbcType=BOOLEAN},#{minAndroidAppVersion,jdbcType=INTEGER},#{minIOSAppVersion,jdbcType=INTEGER},#{path,jdbcType=VARCHAR},#{system,jdbcType=VARCHAR})</insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2" useGeneratedKeys="true"
            keyProperty="id">insert into yeshi_ec_action_jumpdetail_v2
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">jp_id,</if>
            <if test="name != null">jp_name,</if>
@@ -46,6 +35,7 @@
            <if test="minAndroidAppVersion != null">jp_min_android_version,</if>
            <if test="minIOSAppVersion != null">jp_min_ios_version,</if>
            <if test="path != null">jp_path,</if>
            <if test="system != null">jp_system,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -58,82 +48,79 @@
            <if test="minAndroidAppVersion != null">#{minAndroidAppVersion,jdbcType=INTEGER}</if>
            <if test="minIOSAppVersion != null">#{minIOSAppVersion,jdbcType=INTEGER}</if>
            <if test="path != null">#{path,jdbcType=VARCHAR}</if>
            <if test="system != null">#{system,jdbcType=VARCHAR}</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2">update
        yeshi_ec_action_jumpdetail_v2 set jp_name =
        #{name,jdbcType=VARCHAR},jp_activity =
        #{activity,jdbcType=VARCHAR},jp_controller =
        #{controller,jdbcType=VARCHAR},jp_type =
        #{type,jdbcType=VARCHAR},jp_need_login = #{needLogin,jdbcType=BOOLEAN}
        ,jp_min_android_version =#{minAndroidAppVersion,jdbcType=INTEGER}
        ,jp_min_ios_version =#{minIOSAppVersion,jdbcType=INTEGER} 
        ,jp_path =#{path,jdbcType=VARCHAR}
		
        where jp_id
        = #{id,jdbcType=BIGINT}</update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2">
        update yeshi_ec_action_jumpdetail_v2
    <update id="updateByPrimaryKey"
            parameterType="com.yeshi.fanli.entity.common.JumpDetailV2">update yeshi_ec_action_jumpdetail_v2 set jp_name = #{name,jdbcType=VARCHAR},jp_activity = #{activity,jdbcType=VARCHAR},jp_controller = #{controller,jdbcType=VARCHAR},jp_type = #{type,jdbcType=VARCHAR},jp_need_login = #{needLogin,jdbcType=BOOLEAN} ,jp_min_android_version =#{minAndroidAppVersion,jdbcType=INTEGER} ,jp_min_ios_version =#{minIOSAppVersion,jdbcType=INTEGER} ,jp_path =#{path,jdbcType=VARCHAR} ,jp_system =#{system,jdbcType=VARCHAR} where jp_id = #{id,jdbcType=BIGINT}</update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.common.JumpDetailV2">update
        yeshi_ec_action_jumpdetail_v2
        <set>
            <if test="name != null">jp_name=#{name,jdbcType=VARCHAR},</if>
            <if test="activity != null">jp_activity=#{activity,jdbcType=VARCHAR},</if>
            <if test="controller != null">jp_controller=#{controller,jdbcType=VARCHAR},</if>
            <if test="type != null">jp_type=#{type,jdbcType=VARCHAR},</if>
            <if test="needLogin != null">jp_need_login=#{needLogin,jdbcType=BOOLEAN},</if>
            <if test="minAndroidAppVersion !=null">jp_min_android_version
                =#{minAndroidAppVersion,jdbcType=INTEGER},</if>
            <if test="minIOSAppVersion !=null">jp_min_ios_version =#{minIOSAppVersion,jdbcType=INTEGER},
            <if test="minAndroidAppVersion !=null">jp_min_android_version =#{minAndroidAppVersion,jdbcType=INTEGER},
            </if>
			
            <if test="path !=null">jp_path =#{path,jdbcType=VARCHAR},
            </if>
            <if test="minIOSAppVersion !=null">jp_min_ios_version =#{minIOSAppVersion,jdbcType=INTEGER},</if>
            <if test="path !=null">jp_path =#{path,jdbcType=VARCHAR},</if>
            <if test="system !=null">jp_system =#{system,jdbcType=VARCHAR},</if>
        </set>
        where jp_id = #{id,jdbcType=BIGINT}
    </update>
    <select id="listByType" resultMap="BaseResultMap">
        select
    <select id="listByType" resultMap="BaseResultMap">select
        <include refid="Base_Column_List" />
        from yeshi_ec_action_jumpdetail_v2 where jp_type =
        #{type,jdbcType=VARCHAR}
        from yeshi_ec_action_jumpdetail_v2 where jp_type = #{type,jdbcType=VARCHAR}
    </select>
    <select id="listJump" resultMap="BaseResultMap">
        select
    <select id="listJump" resultMap="BaseResultMap">select
        <include refid="Base_Column_List" />
        from yeshi_ec_action_jumpdetail_v2
    </select>
    <select id="listQuery" resultMap="BaseResultMap">
        SELECT
        <include refid="Base_Column_List" />
        FROM yeshi_ec_action_jumpdetail_v2 WHERE 1=1
        <if test="key != null and key != &quot;&quot;">AND (jp_name like '%${key}%')</if>
        ORDER BY jp_id LIMIT ${start},${count}
    </select>
    <select id="countListQuery" resultType="java.lang.Long">
        SELECT IFNULL(count(jp_id),0) FROM yeshi_ec_action_jumpdetail_v2 WHERE
        1=1
        <if test="key != null and key != &quot;&quot;">AND (jp_name like '%${key}%')</if>
    </select>


    <select id="selectAndroidByTypeAndVersion" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_action_jumpdetail_v2 jv
        WHERE jv.`jp_type`=#{type} AND #{version}>=jv.`jp_min_android_version`
        ORDER BY jv.`jp_min_android_version` DESC LIMIT 1
    </select>

    <select id="selectIOSByTypeAndVersion" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_action_jumpdetail_v2 jv
        WHERE jv.`jp_type`=#{type} AND #{version}>=jv.`jp_min_ios_version` ORDER BY
        jv.`jp_min_ios_version` DESC LIMIT 1
    </select>

    <delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">
        delete from yeshi_ec_action_jumpdetail_v2 WHERE jp_id in
        <foreach collection="list" item="item" open="(" close=")"
            separator=",">#{item}</foreach>
    <delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">delete from yeshi_ec_action_jumpdetail_v2 WHERE
        jp_id in
        <foreach collection="list" item="item" open="(" close=")" separator=",">#{item}</foreach>
    </delete>

    <sql id="listWheres">

        <if test="query.key!=null">
            AND jp_name like '%${query.key}%'
        </if>

        <if test="query.maxAndroidVersion!=null">
            AND #{query.maxAndroidVersion}>=jp_min_android_version
        </if>

        <if test="query.maxIOSVersion!=null">
            AND #{query.maxIOSVersion}>=jp_min_ios_version
        </if>

        <if test="query.type!=null">
            AND jp_type= #{query.type}
        </if>

        <if test="query.system!=null">
            AND jp_system= #{query.system}
        </if>

    </sql>

    <select id="list" resultMap="BaseResultMap">
        select <include refid="Base_Column_List"></include> from yeshi_ec_action_jumpdetail_v2 where 1=1
        <include refid="listWheres"></include>
        <if test="query.sortList!=null">
            <foreach collection="query.sortList" item="item" open=" order by " close=" " separator=",">
                #{item}
            </foreach>
        </if>
        limit #{query.start},#{query.count}
    </select>

    <select id="count" resultType="java.lang.Long">
        select count(*) from yeshi_ec_action_jumpdetail_v2 where 1=1
        <include refid="listWheres"></include>
    </select>


</mapper>