新人红包功能

yujian

2019-12-03 2442c923fd35ef864be1cfe07e039eebfaf24ffc

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java

@@ -30,11 +30,11 @@
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.user.ExtractService;

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.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

@@ -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) {