bug修复

admin

2022-04-16 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3

 src/main/java/com/yeshi/buwan/controller/api/GoldCornController.java

@@ -14,14 +14,20 @@
import com.yeshi.buwan.domain.goldcorn.GoldCornTaskActionDetail;
import com.yeshi.buwan.domain.jump.JumpDetail;
import com.yeshi.buwan.domain.jump.JumpTypeEnum;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.dto.goldcorn.SignInGoldCornDateData;
import com.yeshi.buwan.exception.goldcorn.SignInException;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.service.inter.goldcorn.GoldCornTaskActionDetailService;
import com.yeshi.buwan.service.inter.goldcorn.SignInService;
import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.manager.GoldCornManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.JsonUtil;
import com.yeshi.buwan.util.JsonUtilV2;
import com.yeshi.buwan.util.TimeUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.goldcorn.GoldCornCouponVideoVO;
import com.yeshi.buwan.vo.goldcorn.GoldCornRecordVO;
@@ -55,6 +61,9 @@

    @Resource
    private GoldCornTaskActionDetailService goldCornTaskActionDetailService;

    @Resource
    private DetailSystemConfigService configService;


    /**
@@ -109,11 +118,10 @@
                st += h + "小时";
            }
            if (m != 0 || h > 0)
                st += m + "分";
            if (s > 0)
                st += m + "分钟";
            if (s > 0 && st.length() == 0)
                st += s + "秒";
            return JsonUtil.loadFalseJson(String.format("请等待 %s 后再做任务", st));

            return JsonUtil.loadFalseJson(String.format("请%s后再试", st));
        }

    }
@@ -128,9 +136,10 @@
            jsonObject.put("goldCorn", goldCorn);
            return JsonUtil.loadTrueJson(jsonObject.toString());
        } catch (LoginUserException e) {
            return JsonUtil.loadFalseJson("签到出错");
            return JsonUtil.loadFalseJson("签到出错,请稍后再试");
        } catch (SignInException e) {
            e.printStackTrace();
            logger.error("签到出错：", e);
            return JsonUtil.loadFalseJson(e.getMessage());
        }

@@ -148,11 +157,19 @@
            SignInInfoVO.SignInConfig config = new SignInInfoVO.SignInConfig();
            config.setRecordUrl(systemConfigService.getConfigValueByKeyCache("goldCornRecordUrl"));
            config.setRuleUrl(systemConfigService.getConfigValueByKeyCache("goldCornRuleUrl"));

            String action = systemConfigService.getConfigValueByKeyCache("useGoldCornAction");
            JSONObject actionJSON = JSONObject.fromObject(action);
            Gson gson = new Gson();
            config.setUserJump(gson.fromJson(actionJSON.optJSONObject("jumpDetail").toString(), JumpDetail.class));
            config.setUserJumpParams(actionJSON.optString("params"));

            signInInfo.setSignInConfig(config);
            signInInfo.setCanSignIn(!signInService.isTodaySignIned(loginUid, new Date()));
            return JsonUtil.loadTrueJson(new Gson().toJson(signInInfo));
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("获取签到信息异常：", e);
        }
        return JsonUtil.loadFalseJson("服务器内部错误");
    }
@@ -202,8 +219,8 @@
        voList.add(new GoldCornCouponVideoVO("https://r1.ykimg.com/058400005FA60E6A14187C0791817503?x-oss-process=image/resize,w_290/interlace,1/quality,Q_80", jumpDetail, params.toString().replace("\"", "\\" + "\"")));
        voList.add(new GoldCornCouponVideoVO("https://r1.ykimg.com/058400005F2BA59B6AEB660E907A2B99?x-oss-process=image/resize,w_290/interlace,1/quality,Q_80", jumpDetail, params.toString().replace("\"", "\\" + "\"")));
        voList.add(new GoldCornCouponVideoVO("https://r1.ykimg.com/052700005DC9247B1B769182B50A8C21?x-oss-process=image/resize,w_290/interlace,1/quality,Q_80", jumpDetail, params.toString().replace("\"", "\\" + "\"")));
        if (voList.size() < 3)
            voList.clear();
//        if (voList.size() < 3)
        voList.clear();
        JSONObject data = new JSONObject();
        data.put("list", new Gson().toJson(voList));
        data.put("count", voList.size());
@@ -217,7 +234,28 @@
        List<GoldCornTaskVO> voList = new ArrayList<>();
        try {
            //登录
            List<GoldCornGetSource> list = goldCornManager.listGetCornSource(1, 20);
            List<GoldCornGetSource> list1 = goldCornManager.listGetCornSource(1, 20);

            List<GoldCornGetSource> list = new ArrayList<>();
            list.addAll(list1);

            //删除华为渠道的看激励视频任务
            if (acceptData.getChannel().equalsIgnoreCase("huawei")) {
                if (list != null && list.size() > 0)
                    for (int i = 0; i < list.size(); i++) {
                        if (list.get(i).getSourceCode().equalsIgnoreCase(CodeCornGetSourceType.watchRewardAd.name())) {
                            //华为是否正在上线
                            DetailSystemConfig onLiningVersionInfo = configService.getConfigByKey("ad_hw_online_version_info", new DetailSystem("44"), 1);
                            JSONObject onLiningVersionInfoJson = JSONObject.fromObject(onLiningVersionInfo.getValue());
                            int onLiningVersionCode = onLiningVersionInfoJson.optInt("versionCode");
                            if (acceptData.getVersion() >= onLiningVersionCode) {
                                list.remove(i);
                                break;
                            }
                        }
                    }
            }


            List<String> sourceCodes = new ArrayList<>();
            for (GoldCornGetSource source : list) {