admin
2019-08-22 79f52f6eee352a83876233b0e21194cf9d50e4c1
Merge remote-tracking branch 'origin/div' into div
2个文件已修改
25 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
@@ -14,6 +14,8 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -112,6 +114,26 @@
            data.put("count", count);
            data.put("list", JsonUtil.getApiCommonGson().toJson(resultList));
            out.print(JsonUtil.loadTrueResult(data));
            // 更新福利中心未读数量
            if (page == 1) {
                executor.execute(new Runnable() {
                    @Override
                    public void run() {
                        UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
                        // 未读券是否大于0
                        if (userInfoExtra != null && userInfoExtra.getCouponNews() > 0) {
                            userInfoExtra.setCouponNews(0);
                            try {
                                userInfoExtraService.saveUserInfoExtra(userInfoExtra);
                            } catch (UserInfoExtraException e) {
                                e.printStackTrace();
                            }
                        }
                    }
                });
            }
        } catch (UserSystemCouponException e) {
            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
        } catch (Exception e) {
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -758,9 +758,8 @@
            if (dto == null)
                return null;
            icon = "http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png";
            icon = "http://img.flqapp.com/resource/msg/icon_msg_other_integral.png";
            
            List<ClientTextStyleVO> contentList = new ArrayList<>();
            contentList.add(new ClientTextStyleVO(dto.getState(), COLOR_CONTENT));
            items.add(new CommonMsgItemVO(new ClientTextStyleVO("状态", COLOR_TITLE), contentList));