Merge remote-tracking branch 'origin/master'

admin

2019-03-01 a5b74cb17159f71dac98b3e7ae81e43fce73a3f9

Merge remote-tracking branch 'origin/master'

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

@@ -593,12 +593,14 @@


        data.put("moduleState", mySettings);

        

        int welfareCenterNews = 0;

        UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());

        if (userInfoExtra == null) {

            data.put("welfareCenterNews", 0);

        } else {

            data.put("welfareCenterNews", userInfoExtra.getCouponNews());

        if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {

            welfareCenterNews = userInfoExtra.getCouponNews();

        }

        data.put("welfareCenterNews", welfareCenterNews);

		
		
        

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

        


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -199,7 +199,13 @@
                UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

                // 添加一条消息

                if (userInfoExtra != null) {

                    if (userInfoExtra.getCouponNews() == null) {

                        userInfoExtra.setCouponNews(1);

                    } else {

                    userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);

                    }

					
					
                    try {

                        userInfoExtraService.saveUserInfoExtra(userInfoExtra);

                    } catch (UserInfoExtraException e) {