版本区分

yujian

2019-06-25 ec747d6340ad383a7cab972a25c0ef8aaa1fa428

版本区分

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

@@ -2479,17 +2479,19 @@
        }



        try {

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

            // 专题活动

            String specialCard = "special_activities";



            List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,

                    system.getId());



            if (listSpecial == null) {

                listSpecial = new ArrayList<Special>();

            if (listSpecial != null) {

                list.addAll(listSpecial);

            }

            

            for (Special special: listSpecial) {

            for (Special special: list) {

                

                JumpDetailV2 jumpDetail = special.getJumpDetail();

                if (jumpDetail != null) {

@@ -2503,20 +2505,20 @@
                    continue;

                }

                

                if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                    continue;

                } 
				
                // 是否需要弹出框

                if (name.equals("账户等级特权")) { 

                    if (uid != null) {

                        special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));

                    if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                        list.remove(special);

                    } else {

                        if (uid != null) {

                            special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));

                        }

                    }

                }

            }



            JSONObject root = new JSONObject();

            root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));

            root.put("special", JsonUtil.getApiCommonGson().toJson(list));

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



        } catch (Exception e) {


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

@@ -60,6 +60,7 @@
import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.wx.WXLoginUtil;



@@ -1180,15 +1181,14 @@
                            e.printStackTrace();

                        }

                        

                        /* 新人红包 */

                        try {

                            userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(),  device);

                        } catch (Exception e) {

                            e.printStackTrace();

                        }

						
						
						
                        if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                            /* 新人红包 */

                            try {

                                userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(),  device);

                            } catch (Exception e) {

                                e.printStackTrace();

                            }

                        } 
                    }

                });

            }