3.9.2完善

admin

2021-04-22 745320cbb4edfa4fbc8f0f95483a4ee7893d5769

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

@@ -109,11 +109,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,7 +127,7 @@
            jsonObject.put("goldCorn", goldCorn);
            return JsonUtil.loadTrueJson(jsonObject.toString());
        } catch (LoginUserException e) {
            return JsonUtil.loadFalseJson("签到出错");
            return JsonUtil.loadFalseJson("签到出错,请稍后再试");
        } catch (SignInException e) {
            e.printStackTrace();
            return JsonUtil.loadFalseJson(e.getMessage());
@@ -148,6 +147,13 @@
            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));
@@ -202,7 +208,7 @@
        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)
//        if (voList.size() < 3)
            voList.clear();
        JSONObject data = new JSONObject();
        data.put("list", new Gson().toJson(voList));