后台订单列表bug修改，ios添加更名提醒，自购立减深夜专题提醒

admin

2019-08-12 6f2640a4aba1bb6ee334b3f40cbbf5d1c4547043

后台订单列表bug修改，ios添加更名提醒，自购立减深夜专题提醒

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

@@ -129,10 +129,16 @@
            JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);



            // 2、顶部轮播图

            List<SwiperPicture> topPicList = swiperPictureService.getByBannerCard("index_top");

            if (topPicList == null) {

                topPicList = new ArrayList<SwiperPicture>();

            List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("index_top");

            List<SwiperPicture> topPicList = new ArrayList<>();

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

                topPicList.addAll(oldtopPicList);

            if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {

                SwiperPicture notifyReName = swiperPictureService.selectByPrimaryKey(162L);

                if (notifyReName != null)

                    topPicList.add(0, notifyReName);

            }



            root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));



            // 3、邀请有奖


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

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


import java.io.InputStream;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;

import java.util.UUID;

@@ -390,6 +391,8 @@
            }

        }



        int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);



        // 处理9.9包邮

        if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())

                && !Constant.IS_TEST)

@@ -400,6 +403,16 @@
                    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"));

                        JSONObject params = new JSONObject();

                        params.put("url", configService.get("tlj_own_buy_nogoods"));

                        s.setParams(params.toString());

                    } else {

                        s.setJumpDetail(jumpDetailV2Service.getByTypeCache("tlj_own_buy"));

                        s.setParams(null);

                    }

                }

            }




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

@@ -1161,6 +1161,8 @@
                                || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                            if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                                // 免单成功

                                order.setOtherState(2);

                            } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                                order.setOtherState(1);

                            }

                        }

@@ -1176,6 +1178,8 @@
                                || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                            if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                                // 免单成功

                                order.setOtherState(2);

                            } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                                order.setOtherState(1);

                            }

                        }

@@ -1191,6 +1195,8 @@
                                || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                            if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                                // 免单成功

                                order.setOtherState(2);

                            } else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {

                                order.setOtherState(1);

                            }

                        }