fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -30,6 +30,7 @@ import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.InviteGetMoneyService; import com.yeshi.fanli.service.inter.config.SystemService; import com.yeshi.fanli.service.inter.goods.ShareGoodsService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.hongbao.HongBaoService; import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; @@ -44,9 +45,11 @@ import com.yeshi.fanli.service.inter.user.BindingAccountService; import com.yeshi.fanli.service.inter.user.ExtractService; import com.yeshi.fanli.service.inter.user.ShamUserService; import com.yeshi.fanli.service.inter.user.SpreadUserImgService; 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.UserShareGoodsRecordService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.RedisManager; @@ -128,6 +131,12 @@ @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; @Resource private SpreadUserImgService spreadUserImgService; @Resource private UserShareGoodsRecordService userShareGoodsRecordService; private static final String PASSWORD_MAX_ERROR = "password_max_error"; private static final String EXTRACT_MIN_MONEY = "extract_min_money"; @@ -839,6 +848,7 @@ */ @RequestMapping(value = "getusermoney") public void getMoneyDetail(AcceptData acceptData, Long uid, PrintWriter out) { UserInfo user = userInfoService.getUserByIdWithMybatis(uid); if (user == null) { out.print(JsonUtil.loadFalseResult(2, "用户不存在")); @@ -857,29 +867,39 @@ BigDecimal unOpenmoney = hongBaoV2Service.getUnRecievedFanLiMoney(uid); BigDecimal totalFanMoney = hongBaoV2Service.getTotalFanLiMoney(uid); JSONObject data = new JSONObject(); int spreadImgCount = spreadUserImgService.countUserSpreadImg(uid); long shareCount = userShareGoodsRecordService.countShareRecordByUid(uid); // IOS端数字按照字符串处理 if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 33) { 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()); data.put("money", user.getMyHongBao().toString()); data.put("unGetMoney", unOpenmoney.toString()); data.put("totalFanLiMoney", totalFanMoney.toString());// 累计返利 data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid).toString());// 累计提成 data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid).toString()); // 未到账提成 data.put("moneyLastMonth", moneyLastMonth.setScale(2, BigDecimal.ROUND_DOWN).toString()); data.put("money", user.getMyHongBao().setScale(2, BigDecimal.ROUND_DOWN).toString()); data.put("unGetMoney", unOpenmoney.setScale(2, BigDecimal.ROUND_DOWN).toString()); data.put("totalFanLiMoney", totalFanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());// 累计返利 data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString());// 累计提成 data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString()); // 未到账提成 // 展示提成数据 data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0); if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) data.put("showTiCheng", false); else data.put("showTiCheng", spreadImgCount + shareCount > 0); } else { data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN)); data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN)); data.put("moneyLastMonth", moneyLastMonth); data.put("money", user.getMyHongBao()); data.put("unGetMoney", unOpenmoney); data.put("totalFanLiMoney", totalFanMoney);// 累计返利 data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid));// 累计提成 data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid)); // 未到账提成 data.put("moneyLastMonth", moneyLastMonth.setScale(2, BigDecimal.ROUND_DOWN)); data.put("money", user.getMyHongBao().setScale(2, BigDecimal.ROUND_DOWN)); data.put("unGetMoney", unOpenmoney.setScale(2, BigDecimal.ROUND_DOWN)); data.put("totalFanLiMoney", totalFanMoney.setScale(2, BigDecimal.ROUND_DOWN));// 累计返利 data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN));// 累计提成 data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN)); // 未到账提成 // 展示提成数据 data.put("showTiCheng", hongBaoV2Service.getTotalTiChengCount(uid) > 0); data.put("showTiCheng", spreadImgCount + shareCount > 0); } user.setNoOpenHongBao(unOpenmoney); fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsRecordMapper.java
@@ -22,6 +22,7 @@ /** * 查询用户对应的分享记录 * * @param start * @param count * @param uid @@ -34,6 +35,7 @@ /** * 统计记录 * * @param list * @return */ @@ -41,6 +43,7 @@ /** * 统计今日浏览记录 * * @param list * @return */ fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
@@ -236,4 +236,10 @@ return null; } @Override public int countUserSpreadImg(Long uid) { return (int) (spreadUserImgDao.getCount("select count(*) from SpreadUserImg u where u.uid=" + uid)); } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -109,7 +109,6 @@ return userShareGoodsRecordMapper.updateByPrimaryKeySelective(record); } @Override public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source) { return userShareGoodsRecordMapper.listQueryByUid(start, count, uid, source); @@ -119,7 +118,6 @@ public long countQueryByUid(Long uid, String source) { return userShareGoodsRecordMapper.countQueryByUid(uid, source); } @Override public List<UserShareGoodsRecord> listCountRecord(List<Long> list) { @@ -148,7 +146,6 @@ if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) { userShareGoodsRecord.setPicture(TbImgUtil.getTBSize320Img(pictUrl)); } } @@ -189,7 +186,6 @@ } shareRecord.setRevenueMoney(null); Integer totalGoods = goodsRecord.getTotalGoods(); shareRecord.setTotalGoods(totalGoods); if (totalGoods > 1) { @@ -207,7 +203,6 @@ return list; } @Override public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException { @@ -236,7 +231,8 @@ } @Override public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException { public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException { if (taoBaoGoodsBrief == null) { throw new UserShareGoodsRecordException(1, "分享商品不能为空"); @@ -258,14 +254,16 @@ singleGoodsShare(userShareGoodsRecord, taoBaoGoodsBrief); } /** * 保存分享记录 * @param userShareGoodsRecord 分享记录： uid、picture、source 为必输入 * * @param userShareGoodsRecord * 分享记录： uid、picture、source 为必输入 * @throws UserShareGoodsRecordException */ @Override public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { public Map<String, Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { if (listGoods == null || listGoods.size() < 0) { throw new UserShareGoodsRecordException(1, "分享商品数量不足"); @@ -292,7 +290,6 @@ userShareGoodsRecord.setUpdateTime(date); userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord); Map<String,Object> map = new HashMap<String,Object>(); // 多个商品分享 FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods); @@ -304,6 +301,7 @@ /** * 单个商品分享生成记录 * * @param userShareGoodsRecord * @param taoBaoGoodsBrief */ @@ -319,7 +317,6 @@ return; } UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(), userShareGoodsRecord.getUid()); @@ -334,8 +331,7 @@ singleGoods.setUpdateTime(new Date()); userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods); } else { } else { // 单个商品第一次分享 Date date = new Date(); userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl()); @@ -362,14 +358,15 @@ } /** * 多个商品分享生成记录 * * @param userShareGoodsRecord * @param listGoods */ @Transactional public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { // 分享记录 Date date = new Date(); @@ -398,7 +395,6 @@ shareGoodsGroup.setCommonGoods(resultCommonGoods); shareGoodsGroup.setRecordId(userShareGoodsRecord.getId()); listGroup.add(shareGoodsGroup); } catch (CommonGoodsException e) { @@ -418,9 +414,13 @@ /** * 生成分享图 * @param uid 用户id * @param shareId 分享记录id * @param source 来源 * * @param uid * 用户id * @param shareId * 分享记录id * @param source * 来源 * @param listGoods * @return * @throws UserShareGoodsRecordException @@ -432,8 +432,9 @@ Long shareId = shareRecord.getId(); String source = shareRecord.getSource().name(); String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s", configService.getH5Host(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "", source +""); String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s", configService.getH5Host(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "", source + ""); String shortLink = HttpUtil.getShortLink(url); if (!StringUtil.isNullOrEmpty(shortLink)) { @@ -482,7 +483,6 @@ return shareImg; } @Override public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException { @@ -510,7 +510,6 @@ } catch (Exception e) { e.printStackTrace(); } Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); @@ -545,7 +544,6 @@ goodsGroup.setTodayBrowse(0); // 不是同一天浏览记录设置0 } JSONObject dataObject = new JSONObject(); dataObject.put("todayBrowse",goodsGroup.getTodayBrowse() ); dataObject.put("totalBrowse",goodsGroup.getTotalBrowse() ); @@ -567,7 +565,6 @@ data.put("result_list", array); return data; } @Override public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException { @@ -599,7 +596,6 @@ e.printStackTrace(); } Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); @@ -630,7 +626,8 @@ goodsBrief.setState(1); // 已抢光 } TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate +"", null); TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate + "", null); array.add(gson.toJson(taoBaoGoodsBriefExtra)); } @@ -662,4 +659,11 @@ // 更新商品为已分享 userGoodsStorageService.updateShareState(shareId); } @Override public long countShareRecordByUid(Long uid) { return userShareGoodsRecordMapper.countQueryByUid(uid, null); } } fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java
@@ -21,6 +21,13 @@ List<String> getUserSpreadImg(Long uid); /** * 用户分享图的数量 * @param uid * @return */ int countUserSpreadImg(Long uid); /** * 获取以某张图片为背景的邀请分享图 * * @param uid fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
@@ -22,6 +22,7 @@ /** * 查询用户对应的选品库 * * @param start * @param count * @param uid @@ -31,17 +32,17 @@ public long countQueryByUid(Long uid, String source); /** * 统计记录 * * @param list * @return */ public List<UserShareGoodsRecord> listCountRecord(List<Long> list); /** * 获取分享记录 * * @param start * @param count * @param uid @@ -52,28 +53,37 @@ /** * 多个商品分享 * @param uid 用户id * @param source 来源 * @param title 标题内容 * @param listGoods 商品集合 * * @param uid * 用户id * @param source * 来源 * @param title * 标题内容 * @param listGoods * 商品集合 * @throws UserShareGoodsRecordException */ public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException; public Map<String, Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException; /** * 单个商品分享 * @param uid 用户id * @param source 来源 * @param taoBaoGoodsBrief 商品 * * @param uid * 用户id * @param source * 来源 * @param taoBaoGoodsBrief * 商品 * @throws UserShareGoodsRecordException */ public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException; /** * 查询已分享商品 * * @param recordId * @return * @throws UserShareGoodsRecordException @@ -82,6 +92,7 @@ /** * h5分享商品列表 * * @param recordId * @return * @throws UserShareGoodsRecordException @@ -90,6 +101,7 @@ /** * 更新分享记录 * * @param shareId * @throws UserShareGoodsRecordException */ @@ -104,4 +116,11 @@ */ public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException; /** * 分享记录计数 * @param uid * @return */ public long countShareRecordByUid(Long uid); }
