fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -41,7 +41,6 @@ import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TaoBaoConstant; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.factory.MonitorFactory; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; @@ -119,10 +118,7 @@ data.put("link", link); out.print(JsonUtil.loadTrueResult(data)); // 1.6.5 自购立减添加 金币 if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) integralGetService.addTaoLiJinBuy(uid, auctionId); integralGetService.addTaoLiJinBuy(uid, auctionId); } /** @@ -288,8 +284,7 @@ out.print(JsonUtil.loadTrueResult(data)); // 获得金币 if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) integralGetService.addCouponRebate(uid); integralGetService.addCouponRebate(uid); } catch (Exception e) { @@ -424,8 +419,7 @@ out.print(JsonUtil.loadTrueResult("")); // 获得金币 if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) integralGetService.addCloseRecommendGoods(uid); integralGetService.addCloseRecommendGoods(uid); } } fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -33,6 +33,7 @@ import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.bus.user.UserRank; import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.integral.CodePublishRecord; import com.yeshi.fanli.entity.integral.IntegralExchange; import com.yeshi.fanli.entity.integral.IntegralTask; @@ -42,6 +43,7 @@ import com.yeshi.fanli.exception.integral.IntegralGetException; import com.yeshi.fanli.exception.integral.IntegralTaskRecordException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.common.JumpDetailV2Service; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.integral.CodePublishRecordService; import com.yeshi.fanli.service.inter.integral.IntegralDetailService; @@ -105,6 +107,10 @@ @Resource private IntegralGetService integralGetService; @Resource private JumpDetailV2Service jumpDetailV2Service; /** * 获取任务列表 * @@ -181,6 +187,17 @@ } for (IntegralTaskClassVO taskClassVO : list) { UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey(); UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid); if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) { JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate", Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())); taskClassVO.setJumpDetail(jumpDetailV2); } String progress = taskClassVO.getProgress(); if (StringUtil.isNullOrEmpty(progress)) continue; @@ -189,7 +206,6 @@ if (taskNum == null) continue; UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey(); if (uniqueKey == UniqueKeyEnum.dailySign) { if (signState == 0) { taskClassVO.setLightUp(true); // 签到失败 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCoupon.java
@@ -40,7 +40,7 @@ public final static String SOURCE_NEWBIES = "新人抽奖"; public final static String SOURCE_YAOQING = "邀请奖励"; public final static String SOURCE_SYSTEM_PUSH = "系统赠送"; public final static String SOURCE_DAILY_REBATE = "奖励券天天抽"; public final static String SOURCE_DAILY_REBATE = "天天抽"; public final static String SOURCE_EXCHANGE = "金币兑换"; public final static String SOURCE_GIVE = "好友赠送";
@@ -589,22 +589,8 @@ LogHelper.errorDetailInfo(e); } if (activeLog != null && !StringUtil.isNullOrEmpty(activeLog.getVersionCode()) ) { String versionCode = activeLog.getVersionCode(); String channel = activeLog.getChannel(); boolean result = false; if (!StringUtil.isNullOrEmpty(channel) && "appstore".equalsIgnoreCase(channel)) { result = VersionUtil.greaterThan_1_6_5("ios", versionCode); } else { result = VersionUtil.greaterThan_1_6_5("android", versionCode); } if (result) { // 邀请金币 integralGetService.addInviteLevelOne(inviter.getId(), invitee.getId()); } } // 邀请金币 integralGetService.addInviteLevelOne(inviter.getId(), invitee.getId()); } });
@@ -21,6 +21,7 @@ import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService; import com.yeshi.fanli.service.inter.integral.IntegralTaskService; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit; import net.sf.json.JSONObject; @@ -123,6 +124,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() private void addInShopLevelOne(Long uid) { try { @@ -135,6 +137,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() private void addInShopLevelTwo(Long uid) { try { @@ -175,6 +178,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addTaoLiJinBuy(Long uid, Long goodsId) { @@ -185,6 +189,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addInviteLevelOne(Long uid, Long workerId) { @@ -202,6 +207,7 @@ * 间接邀请 * @param uid */ @IntegralGetVersionLimit(uid="#uid") @Async() private void addInviteLevelTwo(Long uid) { try { @@ -211,6 +217,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addShareSingleGoods(Long uid) { @@ -222,6 +229,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addShareMultipleGoods(Long uid) { @@ -233,6 +241,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addShareTLJGoods(Long uid) { @@ -243,6 +252,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addGiveRebateCoupon(Long uid) { @@ -253,7 +263,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addGiveFreeCoupon(Long uid) { @@ -265,6 +275,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addGiveTaoLiJin(Long uid) { @@ -276,6 +287,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addCloseRecommendGoods(Long uid) { @@ -286,7 +298,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addCouponRebate(Long uid) { @@ -305,6 +317,7 @@ * 一级队员领券返利 * @param uid */ @IntegralGetVersionLimit(uid="#uid") @Async() private void addCouponRebateLevelOne(Long uid) { try { @@ -321,6 +334,7 @@ * 二级队员领券返利 * @param uid */ @IntegralGetVersionLimit(uid="#uid") @Async() private void addCouponRebateLevelTwo(Long uid) { try { @@ -330,6 +344,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addRebateOrder(Long uid) { @@ -348,6 +363,7 @@ * 一级队员邀请订单 * @param uid */ @IntegralGetVersionLimit(uid="#uid") @Async() private void addInviteOrderLevelOne(Long uid) { try { @@ -365,6 +381,7 @@ * 二级队员邀请订单 * @param uid */ @IntegralGetVersionLimit(uid="#uid") @Async() private void addInviteOrderLevelTwo(Long uid) { try { @@ -374,6 +391,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addShareOrder(Long uid) { @@ -385,6 +403,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addBindWeiXin(Long uid) { @@ -395,6 +414,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addBindPhone(Long uid) { @@ -406,6 +426,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addBindTaoBao(Long uid) { @@ -416,7 +437,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addSetWeiXinNum(Long uid) { @@ -427,6 +448,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addSetGender(Long uid) { @@ -438,6 +460,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addSetPortrait(Long uid) { @@ -449,6 +472,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addSetNickname(Long uid) { @@ -460,6 +484,7 @@ } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addBindAlipay(Long uid) { @@ -470,7 +495,7 @@ } } @IntegralGetVersionLimit(uid="#uid") @Async() @Override public void addInviteActivate(Long uid) { fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -53,7 +53,6 @@ import com.yeshi.fanli.util.ImageUtil; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.factory.CommonGoodsFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; @@ -917,16 +916,14 @@ // 清理缓存 redisManager.removeCommonString(shareKey); if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) { if (singleGoods) { if (taolijin) { integralGetService.addShareTLJGoods(uid); } else { integralGetService.addShareSingleGoods(uid); } if (singleGoods) { if (taolijin) { integralGetService.addShareTLJGoods(uid); } else { integralGetService.addShareMultipleGoods(uid); integralGetService.addShareSingleGoods(uid); } } else { integralGetService.addShareMultipleGoods(uid); } }
@@ -204,7 +204,7 @@ coupon = systemCouponService.getCouponByType(couponType); } else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) { // 随机奖励券 if (percent == null || percent.compareTo(new BigDecimal(0)) > 0) { if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) { randomRewardCoupon(1, uid, source); return; } else { @@ -1729,7 +1729,12 @@ continue; // 券信息不完整 } userCouponVO.setSource("来源：" + userCouponVO.getSource()); String source = userCouponVO.getSource(); if (source != null && "奖励券天天抽".equals(source)) { source = "天天抽"; } userCouponVO.setSource("来源：" + source); userCouponVO.setCouponName(systemCoupon.getName()); userCouponVO.setCouponEffect(systemCoupon.getEffect()); userCouponVO.setCouponRule(systemCoupon.getRule());
