From a6f34b99ee20e528b766c8ed5a61bd9c5aa0e7ae Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 16 十一月 2019 18:10:33 +0800 Subject: [PATCH] 淘宝相似商品推荐接口优化,根据商品ID搜索商品基本信息优化 --- fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 235 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 170 insertions(+), 65 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java index 0ce5c0d..2af35c3 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java @@ -14,7 +14,11 @@ import com.yeshi.fanli.dao.mybatis.redpack.RedPackWinInviteMapper; import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO; import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum; +import com.yeshi.fanli.entity.bus.user.ThreeSale; +import com.yeshi.fanli.entity.bus.user.UserActiveLog; +import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo; import com.yeshi.fanli.entity.bus.user.UserInfo; +import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.redpack.RedPackWinInvite; import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum; import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService; @@ -22,9 +26,16 @@ import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService; import com.yeshi.fanli.service.inter.redpack.RedPackConfigService; import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService; +import com.yeshi.fanli.service.inter.user.UserActiveLogService; +import com.yeshi.fanli.service.inter.user.UserInfoService; +import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService; import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce; +import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; +import com.yeshi.fanli.util.StringUtil; +import com.yeshi.fanli.util.VersionUtil; +import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService; import com.yeshi.fanli.util.factory.RedPackDetailFactory; import com.yeshi.fanli.vo.order.CommonOrderVO; @@ -49,64 +60,75 @@ @Resource private UserMoneyMsgNotificationService userMoneyMsgNotificationService; + @Resource + private UserInfoService userInfoService; + + @Resource + private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService; + + @Resource + private IntegralTaskRecordService integralTaskRecordService; + + @Resource + private UserActiveLogService userActiveLogService; + @Override + public List<RedPackWinInvite> getRewardList(int start, int count, Long uid) { + return redPackWinInviteMapper.getRewardList(start, count, uid); + } + + + @Override + public Long countRewardRecord(Long uid) { + return redPackWinInviteMapper.countRewardRecord(uid); + } + + @Override + public BigDecimal getRewardMoney(Long uid) { + return redPackWinInviteMapper.getRewardMoney(uid); + } + + + @RequestSerializableByKeyService(key = "#uid") @Transactional(rollbackFor = Exception.class) + @Override public void orderArriveReward(Long uid, Integer source, String orderNo) throws Exception { - if (uid == null || source == null || orderNo == null) + if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo)) return; - // 鑷繁鐨勫鍔� - firstReward(uid, source, orderNo); + ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(uid, Constant.RED_PACK_REWARD_TIME); + if(threeSale == null) + return; + + Long bossId = threeSale.getBoss().getId(); + UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId); + if (activeLog == null) + return; - // 涓婁竴绾х殑濂栧姳 - UserInfo boss = threeSaleSerivce.getBoss(uid); - if(boss != null) { - firstSharedOrderRewardToBoss(boss.getId(), uid, source, orderNo); - firstSharedOrderRewardTheMonthToBoss(boss.getId(), uid, source, orderNo); - } + // 灏忎簬2.0.2鐗堟湰涓嶅鍔� + if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", + activeLog.getVersionCode())) + return; + + // 濂栧姳涓婄骇 + bossReward(bossId, uid, source, orderNo); } + /** - * 鏂颁汉濂栧姳锛氬畬鎴愰绗旇鍗� 锛堝凡鍒拌处锛� 棣栧崟=涓嶉檺鍒堕噾棰濄�佷笉闄愬埗鍟嗗搧銆佷笉闄愬埗鏁伴噺銆佷笉闄愬埗璁㈠崟绫诲瀷锛� + * 涓婄骇濂栧姳 * @param uid + * @param teamUid * @param source * @param orderNo - * @param bossId + * @throws Exception */ @Transactional - private void firstReward(Long uid, Integer source, String orderNo) throws Exception{ - // 1銆佸垽鏂槸鍚︾敤鎴烽涓鍗� - CommonOrderVO order = commonOrderService.firstValidOrderByUid(uid); - if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo())) - return; - - // 閲戦 - BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("new_user_first_order")); - - // 3銆佽幏寰楃孩鍖呰褰� - RedPackWinInvite winInvite = new RedPackWinInvite(); - winInvite.setCreateTime(new Date()); - winInvite.setUpdateTime(new Date()); - winInvite.setType(RedPackWinInviteTypeEnum.newUserReward); - winInvite.setUid(uid); - winInvite.setTeamUid(null); - winInvite.setMoney(money); - winInvite.setSource(source); - winInvite.setOrderNo(orderNo); - redPackWinInviteMapper.insertSelective(winInvite); - - // 4銆佸鍔犵孩鍖� - redPackBalanceService.addRedPack(uid, money, RedPackDetailFactory.createNewUserReward(winInvite)); - - //娑堟伅 - MsgRedPackAddContentDTO dto = new MsgRedPackAddContentDTO(); - dto.setTitle("绾㈠寘澧炲姞"); - dto.setMoney("楼" + money.setScale(2)); - dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2)); - userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackNewUserReward, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�"); + private void bossReward(Long uid, Long teamUid, Integer source, String orderNo) throws Exception { + firstSharedOrderRewardToBoss(uid, teamUid, source, orderNo); + firstSharedOrderRewardTheMonthToBoss(uid, teamUid, source, orderNo); } - /** * 涓婄骇濂栧姳锛氳閭�璇蜂汉瀹屾垚棣栫瑪鍒嗕韩璁㈠崟 锛堝凡鍒拌处锛� @@ -117,9 +139,19 @@ */ @Transactional private void firstSharedOrderRewardToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{ - // 1銆佸垽鏂槸鍚︽槸鏀圭敤鎴烽涓垎浜鍗� - CommonOrderVO order = commonOrderService.firstValidOrderByUidAndType(inviteeUid, 2); - if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo())) + // 1銆佸悓涓�闃熷憳濂栧姳涓�娆� + long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(uid, inviteeUid, RedPackWinInviteTypeEnum.firstSharedOrder.name()); + if (totalReward > 0) + return; + + // 2銆佹槸鍚︿笅绾х殑棣栦釜鍒嗕韩璁㈠崟 + CommonOrder commonOrder = commonOrderService.getFirstShareOrderByUid(inviteeUid); + if (commonOrder == null || !orderNo.equals(commonOrder.getOrderNo()) || source != commonOrder.getSourceType()) + return ; + + // 3銆佸埌璐﹀鍔遍噾棰� 鏄惁澶т簬5 + BigDecimal totalRewardMoney = commonOrderService.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, source); + if (totalRewardMoney == null || totalRewardMoney.compareTo(Constant.RED_PACK_ORDER_REWARD_MIN) < 0) return; // 2銆佸垽鏂槸绗嚑涓汉 @@ -153,10 +185,11 @@ dto.setTitle("绾㈠寘澧炲姞"); dto.setMoney("楼" + money.setScale(2)); dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2)); - userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackFirstSharedOrder, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�"); + userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackFirstSharedOrder, + new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅"); } - + /** * 涓婄骇濂栧姳锛氭鏈堝紑濮嬩骇鐢熸弧瓒虫潯浠剁殑鍒嗕韩璁㈠崟锛堝垎浜鍗曞疄浠樻鈮�10鍏冿級 杩炵画15涓湀 鑷劧鏈堣幏寰楋紙宸插埌璐︼級姣忔湀鏈�楂�2鍏� * @param uid @@ -166,9 +199,10 @@ */ @Transactional private void firstSharedOrderRewardTheMonthToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{ - // 1銆佸垽鏂槸鍚︽槸鏈湀棣栧崟 - CommonOrderVO order = commonOrderService.firstValidOrderTheMonthByUidAndType(inviteeUid, 2); - if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo()) || + + // 1銆佸垽鏂槸鍚︽槸涓婁釜鏈堥鍗� + CommonOrderVO order = commonOrderService.firstValidOrderLastMonthByUidAndType(inviteeUid, 2); + if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo()) || order.getAccountTime() == null) return; @@ -176,15 +210,15 @@ if (order.getPayment() == null || order.getPayment().compareTo(Constant.RED_PACK_PAY_MIN) < 0) return; - // 鏌ヨ棣栧崟濂栧姳鏃堕棿 - CommonOrderVO firstorder = commonOrderService.firstValidOrderByUidAndType(inviteeUid, 2); - if (firstorder == null || firstorder.getAccountTime() == null) - return; + // 2銆佹槸鍚︿笅绾х殑棣栦釜鍒嗕韩璁㈠崟 +// CommonOrder firstorder = commonOrderService.getFirstShareOrderByUid(inviteeUid); +// if (firstorder == null || (orderNo.equals(firstorder.getOrderNo()) && source == firstorder.getSourceType())); +// return; // 绗竴娆″埌璐︾殑娆℃湀寮�濮嬭繛缁�15涓湀 鑷劧鏈堣幏寰楋紙宸插埌璐︼級 - int monthSpace = DateUtil.getMonthSpace( order.getAccountTime(), firstorder.getAccountTime()); - if (monthSpace == 0 || monthSpace > Constant.RED_PACK_REWARd_MONTH) - return; +// int monthSpace = DateUtil.getMonthSpace(order.getThirdCreateTime(), firstorder.getThirdCreateTime()); +// if (monthSpace == 0 || monthSpace > Constant.RED_PACK_REWARD_MONTH) +// return; // 璁$畻闅忔満濂栧姳 @@ -203,6 +237,7 @@ winInvite.setSource(source); winInvite.setOrderNo(orderNo); redPackWinInviteMapper.insertSelective(winInvite); + // 4銆佸鍔犵孩鍖� redPackBalanceService.addRedPack(uid, money, RedPackDetailFactory.createSeriesReward(winInvite)); @@ -211,23 +246,93 @@ dto.setTitle("绾㈠寘澧炲姞"); dto.setMoney("楼" + money.setScale(2)); dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2)); - userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackMonthSharedOrder, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�"); + userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackMonthSharedOrder, + new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅"); } - public List<RedPackWinInvite> getRewardList() { + @Override + @RequestSerializableByKeyService(key = "#uid") + @Transactional(rollbackFor = Exception.class) + public void inviteSucceedReward(Long uid) throws Exception{ + // 楠岃瘉鏄惁瀛樺湪涓婄骇 + ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(uid, Constant.RED_PACK_REWARD_TIME); + if (threeSale == null) + return; + // 涓婄骇id + Long bossId = threeSale.getBoss().getId(); + + UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId); + if (activeLog == null) + return; + + // 灏忎簬2.0.2鐗堟湰涓嶅鍔� + if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", + activeLog.getVersionCode())) + return; + + // 鍚屼竴闃熷憳濂栧姳涓�娆� + long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(bossId, uid, RedPackWinInviteTypeEnum.inviteSucceed.name()); + if (totalReward > 0) + return; + + // 1銆佺粦瀹氱數璇濆彿鐮� + UserInfo userInfo = userInfoService.selectByPKey(uid); + if (userInfo == null || StringUtil.isNullOrEmpty(userInfo.getPhone())) + return; + + // 2銆佹巿鏉冩窐瀹� + UserExtraTaoBaoInfo taoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid); + if (taoBaoInfo == null || StringUtil.isNullOrEmpty(taoBaoInfo.getTaoBaoUid())) + return; + boolean finishTask = false; + // 3.1銆佷骇鐢熶换鎰忔湁鏁堣鍗曪紙鏃犻渶鍒拌处锛� + CommonOrder commonOrder = commonOrderService.selectLatestValidByUid(uid); + if (commonOrder != null) + finishTask = true; + // 3.2銆佸崟浣嶆椂闂寸被绱浜х敓鈮�200閲戝竵 + if (!finishTask) { + long totalGoldCoin = integralTaskRecordService.getTotalGoldCoinByUid(uid); + if (totalGoldCoin >= Constant.RED_PACK_GOLD_COIN) + finishTask = true; + } + // 3.3銆佹垚鍔熼個璇蜂竴涓ソ鍙� + if (!finishTask) { + long countTeam = threeSaleSerivce.countSuccessFirstTeam(uid); + if (countTeam >= 1) + finishTask = true; + } - - - return null; + if (finishTask) { + // 濂栧姳閲戦 + BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("invite_succeed")); + + // 鑾峰緱绾㈠寘璁板綍 + RedPackWinInvite winInvite = new RedPackWinInvite(); + winInvite.setCreateTime(new Date()); + winInvite.setUpdateTime(new Date()); + winInvite.setType(RedPackWinInviteTypeEnum.inviteSucceed); + winInvite.setUid(bossId); + winInvite.setTeamUid(uid); + winInvite.setMoney(money); + redPackWinInviteMapper.insertSelective(winInvite); + + // 澧炲姞绾㈠寘 + redPackBalanceService.addRedPack(bossId, money, RedPackDetailFactory.createInvite(winInvite)); + + // 娑堟伅 + MsgRedPackAddContentDTO dto = new MsgRedPackAddContentDTO(); + dto.setTitle("绾㈠寘澧炲姞"); + dto.setMoney("楼" + money.setScale(2)); + dto.setBalance("楼" + redPackBalanceService.getBalance(bossId).setScale(2)); + userMoneyMsgNotificationService.redPackMsg(bossId, MsgTypeMoneyTypeEnum.redPackInviteSucceed, + new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅"); + } } - - - } -- Gitblit v1.8.0