admin
2018-12-19 588fa97648aac589731c1aae60dce37a666b6fec
删除定向计划相关代码
3个文件已删除
3个文件已修改
196 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/CommonCampaignInfoMapper.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/taobao/CommonCampaignInfo.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/CommonCampaignInfoMapper.xml 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -42,8 +42,6 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -76,16 +74,10 @@
    private HongBaoService hongBaoService;
    @Resource
    private MoneyRecordService moneyRecordService;
    @Resource
    private BindingAccountService bindingAccountService;
    @Resource
    private ExtractService extractService;
    @Resource
    private PassWordErrorRecordService passWordErrorRecordService;
    @Resource
    private ConfigService configService;
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -699,16 +699,9 @@
        JSONObject data = new JSONObject();
        data.put("user", user);
        Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
        String maxError = "5";
        maxError = configService.get(PASSWORD_MAX_ERROR); // 当日输错密码最多次数
        PassWordErrorRecord record = passWordErrorRecordService.getRecord(uid);
        int max = Integer.parseInt(maxError);
        if (record.getCount() >= max) {
            data.put("error", "1"); // 达到最多限制
        } else {
            data.put("error", "0");
        }
        data.put("maxError", maxError);
        data.put("error", "0");
        data.put("maxError", 1);
        String minMoney = configService.get(EXTRACT_MIN_MONEY); // 单笔提现的最小金额
        String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 单笔提现的最大金额
        int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -40,7 +40,6 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -68,8 +67,7 @@
    @Resource
    private HongBaoService hongBaoService;
    @Resource
    private MoneyRecordService moneyRecordService;
    @Resource
    private BindingAccountService bindingAccountService;
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/CommonCampaignInfoMapper.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/taobao/CommonCampaignInfo.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/CommonCampaignInfoMapper.xml
File was deleted