系统区分BUG修复

admin

2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d

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

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

import javax.servlet.http.HttpSession;



import com.yeshi.fanli.entity.SystemEnum;

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

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

import org.springframework.stereotype.Controller;

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

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

@@ -99,8 +102,7 @@
@RequestMapping("api/v1/user/msg")

public class UserMsgController {



    @Resource

    private BusinessSystemService businessSystemService;



    @Resource

    private MsgOrderDetailService msgOrderDetailService;



@@ -160,6 +162,9 @@


    @Resource

    private UserInfoExtraService userInfoExtraService;



    @Resource

    private ConfigService configService;



    // 消息的类型

    final static String MSG_TYPE_ORDER = "order";

@@ -605,10 +610,11 @@
            // 创建时间在28号后的才有新人欢迎

            if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {

                UserHomeMsgVO vo = new UserHomeMsgVO();

                vo.setContent(String.format("恭喜你，成为%s的用户\n独家优惠券帮你省钱；\n参与奖金活动帮你赚钱；\n让%s成为你的省钱助手吧！",

                        Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()),

                        Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));

                vo.setTitle("新人欢迎");

                vo.setContent(configService.getValue(ConfigKeyEnum.welcomeMsg, acceptData.getSystem()));

                if (acceptData.getSystem() == SystemEnum.blks)

                    vo.setTitle("新人欢迎");

                else

                    vo.setTitle("欢迎新人");

                vo.setCreateTime(getTimeDesc(now, new Date(time)));

                vo.setType(UserHomeMsgVO.TYPE_WELCOME);

                volist.add(vo);

@@ -726,7 +732,8 @@
        }



        // 人工客服

        commonMsgList.add(getKeFuMsg(acceptData));

        if (acceptData.getSystem() == SystemEnum.blks)

            commonMsgList.add(getKeFuMsg(acceptData));



        // 推荐记录

        DeviceActive deviceActive = deviceActiveService.getDeviceByDeviceAndPlatform(acceptData.getDevice(),

@@ -854,11 +861,12 @@
        // 创建时间在28号后的才有新人欢迎

        if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {

            Map<String, Object> map = new HashMap<String, Object>();

            map.put("title", "新人欢迎");

            if (acceptData.getSystem() == SystemEnum.blks)

                map.put("title", "新人欢迎");

            else

                map.put("title", "欢迎新人");

            map.put("content",

                    String.format("恭喜你，成为%s的用户\n独家优惠券帮你省钱；\n参与奖金活动帮你赚钱；\n让%s成为你的省钱助手吧！",

                            Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()),

                            Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion())));

                    configService.getValue(ConfigKeyEnum.welcomeMsg, acceptData.getSystem()));

            map.put("createTime", new Date(time));

            UserMsgCenter msgCenternre = new UserMsgCenter();

            msgCenternre.setWelcomeMsg(map);