fanli/src/main/java/com/yeshi/fanli/controller/admin/ConfigAdminController.java
@@ -85,8 +85,11 @@ return; } int pageSize = Constant.PAGE_SIZE; int count = configService.getCount(key, pageIndex); PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count); int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); JSONObject data = new JSONObject(); data.put("pe", pe); fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
@@ -210,7 +210,7 @@ * @param acceptData * @param out */ @RequestMapping(value = "/gethistory", method = RequestMethod.POST) @RequestMapping(value = "/gethistory"/*, method = RequestMethod.POST*/) public void getHistory(AcceptData acceptData, String deviceToken, int page, PrintWriter out) { long count = 0; @@ -273,21 +273,23 @@ String fontColor2 = "#F14242"; JSONArray array = new JSONArray(); JSONArray array1 = new JSONArray(); array1.add(fontColor1); array1.add("本次推送共"); JSONArray array2 = new JSONArray(); array2.add(fontColor2); array2.add(totalgoods); JSONObject contentJson1 = new JSONObject(); contentJson1.put("color", fontColor1); contentJson1.put("content", "本次推送共"); JSONObject contentJson2 = new JSONObject(); contentJson2.put("color", fontColor2); contentJson2.put("content", totalgoods); JSONObject contentJson3 = new JSONObject(); contentJson3.put("color", fontColor1); contentJson3.put("content", "个商品"); JSONArray array3 = new JSONArray(); array3.add(fontColor1); array3.add("个商品"); array.add(array1); array.add(array2); array.add(array3); array.add(contentJson1); array.add(contentJson2); array.add(contentJson3); result.put("totalwords", array);
@@ -1708,40 +1708,47 @@ @RequestMapping(value = "setextrainfo", method = RequestMethod.POST) public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) { List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null); if (listThreeSale == null || listThreeSale.size() == 0) { out.print(JsonUtil.loadFalseResult("该记录不存在")); return; try { List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null); if (listThreeSale == null || listThreeSale.size() == 0) { out.print(JsonUtil.loadFalseResult("该记录不存在")); return; } UserInfo worker = listThreeSale.get(0).getWorker(); if (worker == null) { out.print(JsonUtil.loadFalseResult("该记录不存在")); return; } List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId()); if (list == null || list.size() == 0) { ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo(); extraInfo.setWorker(worker); extraInfo.setNickname(memoName); extraInfo.setCreateTime(new Date()); extraInfo.setUpdateTime(new Date()); UserInfo boss = new UserInfo(uid); extraInfo.setBoss(boss); threeSaleExtraInfoSerivce.insert(extraInfo); } else { ThreeSaleExtraInfo extraInfo = list.get(0); extraInfo.setNickname(memoName); extraInfo.setUpdateTime(new Date()); threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo); } out.print(JsonUtil.loadTrueResult("保存成功")); } catch (Exception e) { out.print(JsonUtil.loadFalseResult("保存失败")); e.printStackTrace(); } UserInfo worker = listThreeSale.get(0).getWorker(); if (worker == null) { out.print(JsonUtil.loadFalseResult("该记录不存在")); return; } List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId()); if (list == null || list.size() == 0) { ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo(); extraInfo.setWorker(worker); extraInfo.setNickname(memoName); extraInfo.setCreateTime(new Date()); extraInfo.setUpdateTime(new Date()); UserInfo boss = new UserInfo(uid); extraInfo.setBoss(boss); threeSaleExtraInfoSerivce.insert(extraInfo); } else { ThreeSaleExtraInfo extraInfo = list.get(0); extraInfo.setNickname(memoName); extraInfo.setUpdateTime(new Date()); threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo); } out.print(JsonUtil.loadTrueResult("修改成功")); } /** @@ -1753,25 +1760,30 @@ */ @RequestMapping(value = "removethreesale", method = RequestMethod.POST) public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) { try { List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1); if (listThreeSale == null || listThreeSale.size() == 0) { out.print(JsonUtil.loadFalseResult("操作数据无效")); return; } UserInfo worker = listThreeSale.get(0).getWorker(); if (worker == null) { out.print(JsonUtil.loadFalseResult("操作数据无效")); return; } // 删除关系 threeSaleSerivce.deleteByPrimaryKey(inviteId); // 删除备注 threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId()); List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1); if (listThreeSale == null || listThreeSale.size() == 0) { out.print(JsonUtil.loadFalseResult("操作数据无效")); return; out.print(JsonUtil.loadTrueResult("删除成功")); } catch (Exception e) { out.print(JsonUtil.loadFalseResult("删除失败")); e.printStackTrace(); } UserInfo worker = listThreeSale.get(0).getWorker(); if (worker == null) { out.print(JsonUtil.loadFalseResult("操作数据无效")); return; } // 删除关系 threeSaleSerivce.deleteByPrimaryKey(inviteId); // 删除备注 threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId()); out.print(JsonUtil.loadTrueResult("操作成功")); } } fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -450,11 +450,9 @@ String nickName = ""; String portrait = ""; Long lastLoginTime = null; Long workerId = null; UserInfo worker = threeSale.getWorker(); if (worker != null) { workerId = worker.getId(); portrait = worker.getPortrait(); lastLoginTime = worker.getLastLoginTime(); nickName = worker.getNickName(); @@ -462,39 +460,38 @@ object.put("nickName", nickName); object.put("portrait", portrait); int type = 0; int state = 0; String fontColor1 = "#888888"; String fontColor2 = "#F14242"; JSONArray array = new JSONArray(); if (threeSale.getState()) { type = 1; state = 1; if (lastLoginTime == null) { lastLoginTime = threeSale.getCreateTime(); } JSONArray array1 = new JSONArray(); array1.add(fontColor1); JSONObject contentJson = new JSONObject(); contentJson.put("color", fontColor1); if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) { // 本年 array1.add("最近登陆 " + sdf.format(lastLoginTime)); contentJson.put("content", "最近登陆 " + sdf.format(lastLoginTime)); } else { // 往年 array1.add("最近登陆 " + format.format(lastLoginTime)); contentJson.put("content", "最近登陆 " + format.format(lastLoginTime)); } array.add(array1); array.add(contentJson); } else if ( threeSale.getExpire()!= null && (threeSale.getExpire() == 1 || threeSale.getExpire().equals(1))) { type = 2; JSONArray array1 = new JSONArray(); array1.add(fontColor1); array1.add("已经脱离邀请关系"); array.add(array1); state = 2; JSONObject contentJson = new JSONObject(); contentJson.put("color", fontColor1); contentJson.put("content", "已经脱离邀请关系"); array.add(contentJson); } else { type = 0; state = 0; Calendar c = Calendar.getInstance(); c.setTime(inviteTime); @@ -506,24 +503,24 @@ days = 0; } JSONArray array1 = new JSONArray(); array1.add(fontColor1); array1.add("将于"); JSONObject contentJson1 = new JSONObject(); contentJson1.put("color", fontColor1); contentJson1.put("content", "将于"); JSONArray array2 = new JSONArray(); array2.add(fontColor2); array2.add(days+"天"); JSONObject contentJson2 = new JSONObject(); contentJson2.put("color", fontColor2); contentJson2.put("content", days+"天"); JSONArray array3 = new JSONArray(); array3.add(fontColor1); array3.add("后脱离邀请关系"); JSONObject contentJson3 = new JSONObject(); contentJson3.put("color", fontColor1); contentJson3.put("content", "后脱离邀请关系"); array.add(array1); array.add(array2); array.add(array3); array.add(contentJson1); array.add(contentJson2); array.add(contentJson3); } object.put("type", type); object.put("state", state); object.put("recentMsg", array); resultArray.add(object);
