用户自定义界面设置+ 免打扰IOS推送修改

yujian

2019-01-17 0a3b28bcff870dfb742d76d06fc74481965ea122

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

@@ -66,6 +66,7 @@
import com.yeshi.fanli.exception.goods.CollectionGoodsException;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.UserCustomSettingsException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

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

@@ -90,6 +91,7 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

@@ -111,6 +113,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

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

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -202,6 +205,10 @@


   @Resource

   private UserShareGoodsRecordService userShareGoodsRecordService;

	
   @Resource

   private UserCustomSettingsService userCustomSettingsService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -499,11 +506,17 @@
      data.put("first", 0);

      int spreadImgCount = spreadUserImgService.countUserSpreadImg(user.getId());

      long shareCount = userShareGoodsRecordService.countShareRecordByUid(user.getId());

		
      int showTiCheng = 1; // 不显示

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

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

         data.put("showTiCheng", false);

      else

      else {

         data.put("showTiCheng", spreadImgCount + shareCount > 0);

         if (spreadImgCount + shareCount > 0) {

            showTiCheng = 0;

         }

      }



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

            && configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

@@ -511,6 +524,34 @@
               Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));

      else

         data.put("inviteList", configService.get("team_list"));

	
      // 界面状态

      UserSettingsVO mySettings = null; 
      try {

         mySettings = userCustomSettingsService.getMySettings(user.getId());

      } catch (UserCustomSettingsException e) {

         mySettings = new UserSettingsVO();

         e.printStackTrace();

      }

		
      if (mySettings.getCancelNotice() == null) {

         mySettings.setCancelNotice(0);

      }

      if (mySettings.getNoBonusCount() == null) {

         mySettings.setNoBonusCount(showTiCheng); // 根据showTiCheng来判断

      }

      if (mySettings.getNoNewsRedDot() == null) {

         mySettings.setNoNewsRedDot(0);

      }

      if (mySettings.getNoShareRecordAndStorage() == null) {

         mySettings.setNoShareRecordAndStorage(showTiCheng); // 根据showTiCheng来判断

      }

      if (mySettings.getNoInvitationBonus() == null) {

         mySettings.setNoInvitationBonus(0);

      }

		
      data.put("moduleState", mySettings);

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

      final UserInfo uuser = user;

      ThreadUtil.run(new Runnable() {

@@ -1934,7 +1975,35 @@
         out.print(JsonUtil.loadFalseResult("删除失败"));

         e.printStackTrace();

      }



   }



	
   /**

    *  设置界面开关状态

    * @param acceptData

    * @param uid

    * @param type  1-通知免打扰(20:00-8:00)  2-不看消息红点提醒  3-不看奖金统计 不看邀请拿奖金 4-不看分享记录和选品库  不看消息红点提醒  
    * @param state   0关闭  1开启

    * @param out

    */

   @RequestMapping(value = "setModuleState", method = RequestMethod.POST)

   public void setModuleState(AcceptData acceptData, Long uid, Integer type, Integer state, PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

         return;

      }

		
      try {

         userCustomSettingsService.saveModuleState(uid, type, state);

         out.print(JsonUtil.loadTrueResult("设置成功"));

      } catch (UserCustomSettingsException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("设置失败"));

         e.printStackTrace();

      }

   }





}