fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -29,7 +29,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.taobao.api.ApiException; import com.yeshi.fanli.entity.admin.InviteGetMoney; import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass; import com.yeshi.fanli.entity.bus.recommend.RecommendDetails; import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail; @@ -53,7 +52,6 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.BusinessSystemService; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.InviteGetMoneyService; import com.yeshi.fanli.service.inter.config.SystemClientParamsService; import com.yeshi.fanli.service.inter.config.SystemConfigService; import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService; @@ -158,9 +156,6 @@ @Resource private RedisManager redisManager; @Resource private InviteGetMoneyService inviteGetMoneyService; @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; @@ -798,47 +793,6 @@ List<CustomerName> totalList = new ArrayList<>(); CustomerContent customerContent = systemClientParamsService.getCustomerContent(id); out.print(JsonUtil.loadTrueResult(customerContent.getContent().replace("\n", "<br>"))); } @RequestMapping("getInviteInfo") public void getInviteInfo(PrintWriter out) { JSONObject data = new JSONObject(); String key = "activityRules"; com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem(); system.setCreatetime(java.lang.System.currentTimeMillis()); system.setPlatform(1); system.setId(4L); SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, key); // 转换换行符 给前端 String valueN = values.getValue(); String valueBr = valueN; String[] sts = valueBr.split("\n"); JSONArray array = new JSONArray(); for (String st : sts) array.add(st); data.put("activityRules", array); List<InviteGetMoney> inviteGetMoneyList = inviteGetMoneyService.inviteGetMoneyList(0, ""); // 名字*处理 for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) { String name = inviteGetMoney.getName(); if (name != null) { if (name.length() > 2) { name = Utils.getStarString(name, 1, name.length() - 1); } else { name = name.substring(0, 1) + "**" + name.substring(name.length() - 1); } } inviteGetMoney.setName(name); } data.put("inviteGetMoneyList", JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList)); out.print(JsonUtil.loadTrueResult(data)); } /** fanli/src/main/java/com/yeshi/fanli/controller/admin/InviteGetMoneyAdminController.java
File was deleted fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -2,7 +2,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -14,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.yeshi.utils.JsonUtil; import com.yeshi.fanli.dto.money.InviteGetMoney; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.admin.InviteGetMoney; import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserInfo; @@ -26,7 +25,6 @@ import com.yeshi.fanli.exception.banner.SwiperPictureException; import com.yeshi.fanli.exception.user.UserInfoExtraException; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.InviteGetMoneyService; import com.yeshi.fanli.service.inter.config.SystemClientParamsService; import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; @@ -53,10 +51,6 @@ @Controller @RequestMapping("api/v1/invite") public class InviteGetMoneyController { @Resource private InviteGetMoneyService inviteGetMoneyService; @Resource private SystemClientParamsService systemClientParamsService; @@ -84,7 +78,6 @@ @Resource private RedisManager redisManager; @RequestMapping(value = "/inviteGetMoney", method = RequestMethod.POST) public void everyDayTaskList(AcceptData acceptData, int pageIndex, PrintWriter out, String uid) throws NotExistObjectException,UserInfoExtraException { @@ -93,19 +86,6 @@ int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount / Constant.PAGE_SIZE : totalCount / Constant.PAGE_SIZE + 1; PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount, totalPage); /* * // 分页查询邀请提成榜 List<InviteGetMoney> inviteGetMoneyList = * inviteGetMoneyService.inviteGetMoneyList(pageIndex - 1, ""); * * // 名字*处理 for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) { * * String name = inviteGetMoney.getName(); if (name != null) { if * (name.length() > 2) { name = Utils.getStarString(name, 1, * name.length() - 1); } else { name = name.substring(0, 1) + "**" + * name.substring(name.length() - 1); } } inviteGetMoney.setName(name); * inviteGetMoney.setRankIcon(UserUtil.getRankIcon(3)); } */ List<InviteGetMoney> inviteGetMoneyList = userRankingsService.getRank(0, 5); @@ -121,25 +101,14 @@ data.put("moneyLastMonth", "---"); } else { // 我的队员 int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid); int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid); int myTeamCount = myFirstTeamCount + mySecondTeamCount; long myFirstTeamCount = threeSaleSerivce.getFirstUsersCount(Long.parseLong(uid)); long mySecondTeamCount = threeSaleSerivce.getSecondUsersCount(Long.parseLong(uid)); long myTeamCount = myFirstTeamCount + mySecondTeamCount; data.put("myTeam", myTeamCount); // 今日 本月预估收益 BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid + ""); if (moneyToday == null) { moneyToday = new BigDecimal(0); } BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid + ""); if (moneyMonth == null) { moneyMonth = new BigDecimal(0); } BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + ""); data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN).toString()); data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN).toString()); data.put("moneyLastMonth", moneyLastMonth.toString()); // 1.5.0后已经不使用此字段 data.put("moneyToday", "0"); data.put("moneyMonth", "0"); data.put("moneyLastMonth", "0"); } // 活动规则 @@ -188,8 +157,6 @@ data.put("hasCode", hasCode); com.alibaba.fastjson.JSONObject root = new com.alibaba.fastjson.JSONObject(); root.put("code", 0); root.put("data", data); @@ -231,9 +198,9 @@ out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "成功")); } /** * 邀请激活-特别提示语 * * @param callback * @param out */ @@ -259,9 +226,12 @@ /** * 激活邀请 * * @param callback * @param uid 用户id * @param inviteCode 邀请嘛 * @param uid * 用户id * @param inviteCode * 邀请嘛 * @param out */ @RequestMapping(value = "activationInvite") @@ -289,11 +259,12 @@ } } /** * 获取邀请码 * * @param callback * @param uid 用户id * @param uid * 用户id * @param out */ @RequestMapping(value = "getInviteCode") @@ -326,8 +297,10 @@ /** * 获取邀请短连接 * * @param callback * @param uid 用户id * @param uid * 用户id * @param out */ @RequestMapping(value = "getShortLink") @@ -360,8 +333,10 @@ /** * 获取邀请电话号码 * * @param callback * @param uid 用户id * @param uid * 用户id * @param out */ @RequestMapping(value = "getUserPhone") @@ -390,6 +365,7 @@ /** * 获取用户邀请上级 * * @param callback * @param uid * @param out fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -32,7 +32,6 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.BusinessSystemService; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.InviteGetMoneyService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; @@ -49,6 +48,7 @@ import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.service.inter.user.UserAccountService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.UserMoneyService; import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService; import com.yeshi.fanli.service.inter.user.UserSystemCouponService; import com.yeshi.fanli.util.Constant; @@ -76,7 +76,6 @@ @Resource private OrderService orderService; @Resource private HongBaoV2Service hongBaoV2Service; @@ -115,9 +114,6 @@ private RedisManager redisManager; @Resource private InviteGetMoneyService inviteGetMoneyService; @Resource private TBPidService tbPidService; @Resource @@ -137,6 +133,9 @@ @Resource private UserSystemCouponService userSystemCouponService; @Resource private UserMoneyService userMoneyService; private static final String PASSWORD_MAX_ERROR = "password_max_error"; private static final String EXTRACT_MIN_MONEY = "extract_min_money"; @@ -159,7 +158,8 @@ public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall, String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first, HttpSession session, HttpServletRequest request, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -265,7 +265,8 @@ @RequestMapping(value = "register") public void register(AcceptData acceptData, String tbOpenid, String tbNickName, String tbPortrait, String vcode, String phone, HttpServletRequest request, HttpSession session, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -325,7 +326,8 @@ */ @RequestMapping(value = "connect") public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -358,7 +360,8 @@ */ @RequestMapping(value = "getuid") public void getUid(AcceptData acceptData, String code, String tbOpenid, String phone, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -422,7 +425,8 @@ */ @RequestMapping(value = "bindPhone") public void bindPhone(AcceptData acceptData, Long uid, String vcode, String phone, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -485,7 +489,8 @@ */ @RequestMapping(value = "unBindPhone") public void unBindPhone(AcceptData acceptData, Long uid, String phone, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -521,7 +526,8 @@ @RequestMapping(value = "bindTaoBao") public void bindTaoBao(AcceptData acceptData, Long uid, String tbOpenid, String tbNickName, String tbPortrait, String tbSession, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -583,7 +589,8 @@ */ @RequestMapping(value = "unBindTaoBao") public void unBindTaoBao(AcceptData acceptData, Long uid, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -607,7 +614,8 @@ */ @RequestMapping(value = "changeWX") public void changeWX(AcceptData acceptData, Long uid, String code, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -654,7 +662,8 @@ */ @RequestMapping(value = "getphone") public void getPhone(AcceptData acceptData, Long uid, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -674,7 +683,8 @@ @RequestMapping(value = "verifyvcodeforbind") public void verifyVcodeForbind(AcceptData acceptData, Long uid, String vcode, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -719,7 +729,8 @@ */ @RequestMapping(value = "bindalipay") public void bindAlipay(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -774,7 +785,8 @@ @RequestMapping(value = "bindalipaywithverify") public void bindAlipayWithVerify(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -864,7 +876,8 @@ @RequestMapping(value = "bindalipaywithverifynew") public void bindAlipayWithVerifyNew(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) { BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages()); if (system == null) { out.print(JsonUtil.loadFalseResult("系统不存在")); return; @@ -984,16 +997,16 @@ out.print(JsonUtil.loadFalseResult(2, "用户不存在")); return; } BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid + ""); BigDecimal moneyToday = userMoneyService.getMoneyToday(uid); if (moneyToday == null) { moneyToday = new BigDecimal(0); } BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid + ""); BigDecimal moneyMonth = userMoneyService.getMoneyMonth(uid); if (moneyMonth == null) { moneyMonth = new BigDecimal(0); } BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + ""); BigDecimal moneyLastMonth = userMoneyService.getMoneyLastMonth(uid); BigDecimal unOpenmoney = hongBaoV2Service.getUnRecievedFanLiMoney(uid); BigDecimal totalFanMoney = hongBaoV2Service.getTotalFanLiMoney(uid); JSONObject data = new JSONObject(); fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -246,8 +246,6 @@ // 邀请关系生效 threeSaleSerivce.effective(find); // 重新计算用户等级 threeSaleSerivce.reComputeUserRank(id); // 添加用户活跃记录 UserActiveLog userActiveLog = new UserActiveLog(); fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java
File was deleted fanli/src/main/java/com/yeshi/fanli/dao/config/DailyTaskDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/dao/config/InviteGetMoneyDao.java
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/admin/InviteGetMoney.java
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/DailyTask.java
File was deleted fanli/src/main/java/com/yeshi/fanli/job/UpdateInviteRankJob.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/config/InviteGetMoneyServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -6,7 +6,6 @@ import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -26,7 +25,6 @@ import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.exception.ThreeSaleException; import com.yeshi.fanli.service.inter.config.InviteGetMoneyService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService; @@ -50,9 +48,6 @@ @Resource private UserInfoService userInfoService; @Resource private InviteGetMoneyService inviteGetMoneyService; @Resource private UserInfoMapper userInfoMapper; @@ -387,37 +382,6 @@ return Long.parseLong(count + ""); } }); } @Override public void reComputeUserRank(Long uid) { int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid + ""); int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid + ""); int count = myFirstTeamCount + mySecondTeamCount; UserInfo user = userInfoService.getUserById(uid); if (user == null) return; Map<String, String> convertMap = hongBaoManageService.convertMap(); int tong = Integer.parseInt(convertMap.get("sale_tong")); int yin = Integer.parseInt(convertMap.get("sale_yin")); int jin = Integer.parseInt(convertMap.get("sale_jin")); int rank = user.getRank(); if (count >= jin) { rank = 3; } else if (count >= yin) { rank = 2; } else if (count >= tong) { rank = 1; } if (rank > user.getRank()) { // 更新Rank UserInfo userInfo = new UserInfo(uid); userInfo.setRank(rank); userInfoMapper.updateByPrimaryKeySelective(userInfo); } } @Override fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java
@@ -23,7 +23,7 @@ import org.yeshi.utils.tencentcloud.COSManager; import com.yeshi.fanli.dao.mybatis.UserRankingsMapper; import com.yeshi.fanli.entity.admin.InviteGetMoney; import com.yeshi.fanli.dto.money.InviteGetMoney; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserRankings; import com.yeshi.fanli.exception.UserRankingsException; fanli/src/main/java/com/yeshi/fanli/service/inter/config/InviteGetMoneyService.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java
@@ -27,13 +27,6 @@ void validateTwentyFour(); /** * 重新计算用户的等级 * * @param uid */ void reComputeUserRank(Long uid); void validate365(); // 获取下级用户 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserRankingsService.java
@@ -5,7 +5,7 @@ import org.springframework.web.multipart.MultipartFile; import com.yeshi.fanli.entity.admin.InviteGetMoney; import com.yeshi.fanli.dto.money.InviteGetMoney; import com.yeshi.fanli.entity.bus.user.UserRankings; import com.yeshi.fanli.exception.UserRankingsException;