yujian
2020-04-26 4a901a88c00c4c48d5b6f4fef55de2a2fd82749a
用户授权激活限制
2个文件已修改
49 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -30,6 +31,9 @@
    @Resource
    private ConfigService configService;
    @Resource
    private UserInfoExtraService userInfoExtraService;
    /**
     * 获取淘宝授权信息
@@ -62,6 +66,13 @@
            return;
        }
        String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
        if (StringUtil.isNullOrEmpty(inviteCode)) {
            out.print(JsonUtil.loadFalseResult(3, "请激活邀请码"));
            return;
        }
        UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);
        if ("share".equalsIgnoreCase(source)) {
            if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) {
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
@@ -246,19 +246,15 @@
                    continue;
                }
                Long wid = firstTeam.getWorker().getId();
                Long succeedTime = firstTeam.getSucceedTime();
                if (succeedTime == null) {
                    succeedTime = firstTeam.getCreateTime();
                }
                // 单(分享 + 自购)实付款大于1元
                String uniqueKey = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_ONE);
                UserInviteValidRecord record = userInviteValidRecordMapper.selectByUniqueKey(uniqueKey);
                if (record != null) {
                    countTeam1 ++;
                } else {
                long countValid = commonOrderService.countOrderByUidAndSettled(wid, Constant.VIP_ORDER_PAY);
                if (countValid > 0) {
                    countTeam1 ++;
                    try {
                        String uniqueKey = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_ONE);
                        UserInviteValidRecord record = userInviteValidRecordMapper.selectByUniqueKey(uniqueKey);
                        if (record == null) {
                            record = new UserInviteValidRecord();
                            record.setUid(uid);
                            record.setWorkerId(wid);
@@ -266,9 +262,6 @@
                            record.setUniqueKey(uniqueKey);
                            record.setCreateTime(new Date());
                            userInviteValidRecordMapper.insertSelective(record);
                        }
                    } catch (Exception e) {
                    }
                }
            }
@@ -309,18 +302,15 @@
                    continue;
                }
                Long wid = team.getWorker().getId();
                Long succeedTime = team.getSucceedTime();
                if (succeedTime == null) {
                    succeedTime = team.getCreateTime();
                }
                // 单(分享 + 自购)实付款大于1元
                String uniqueKeySuper = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_TWO);
                UserInviteValidRecord recordSuper = userInviteValidRecordMapper.selectByUniqueKey(uniqueKeySuper);
                if (recordSuper != null) {
                    countTeam2 ++;
                } else {
                long countValid = commonOrderService.countOrderByUidAndSettled(wid, Constant.VIP_ORDER_PAY);
                if (countValid > 0) {
                    countTeam2 ++;
                    try {
                        String uniqueKeySuper = StringUtil.Md5(wid + "#" + UserInviteValidRecord.TYPE_TWO);
                        UserInviteValidRecord recordSuper = userInviteValidRecordMapper.selectByUniqueKey(uniqueKeySuper);
                        if (recordSuper == null) {
                            recordSuper = new UserInviteValidRecord();
                            recordSuper.setUid(superUid);
                            recordSuper.setWorkerId(wid);
@@ -329,10 +319,6 @@
                            recordSuper.setCreateTime(new Date());
                            userInviteValidRecordMapper.insertSelective(recordSuper);
                        }
                    } catch (Exception e) {
                    }
                }
            }
        }