From 444da68b958e53c7fa122db62723fce25368ee1d Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期五, 29 十一月 2019 11:17:57 +0800 Subject: [PATCH] vip 配置信息 + 会员验证 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java index 1e5ebec..f41e8ae 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java @@ -30,9 +30,9 @@ import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum; import com.yeshi.fanli.exception.user.UserInfoExtraException; import com.yeshi.fanli.service.inter.config.ConfigService; -import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.money.UserMoneyDetailService; import com.yeshi.fanli.service.inter.money.extract.ExtractService; +import com.yeshi.fanli.service.inter.order.HongBaoV2Service; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.StringUtil; @@ -82,11 +82,14 @@ * 骞翠唤 * @param month * 鏈堜唤 + * @param type + * 1-鏀跺叆 2-鏀嚭 0-鍏ㄩ儴 + * * @param out */ @RequestMapping(value = "getUserMoneyDetailList") public void getUserMoneyDetailList(AcceptData acceptData, Long uid, Long index, Integer year, Integer month, - PrintWriter out) { + Integer type, PrintWriter out) { if (uid == null || uid == 0) { out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�")); return; @@ -107,8 +110,8 @@ date = new Date(ca.getTimeInMillis() - 1); } - List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date); - long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date); + List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, type, date); + long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, type, date); GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation(); gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() { @Override @@ -393,6 +396,7 @@ UserInfoExtra update = new UserInfoExtra(); update.setId(userExtra.getId()); update.setAutoExtract(false); + update.setCloseTimeExtract(new Date()); try { userInfoExtraService.saveUserInfoExtra(update); } catch (UserInfoExtraException e) { -- Gitblit v1.8.0