Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java

@@ -18,6 +18,7 @@
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;

@@ -28,6 +29,13 @@


   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Override

   public void addUserMoneyDetail(UserMoneyDetail detail) throws UserMoneyDetailException {

      if (detail == null || detail.getMoney() == null || detail.getType() == null || detail.getUserInfo() == null)

         throw new UserMoneyDetailException(1, "信息不完整");

      userMoneyDetailMapper.insertSelective(detail);

   }



   @Override

   public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {

@@ -95,7 +103,19 @@
         list = tempList;

      }



      if (list != null)

      if (list != null) {

         if (userMoneyDetailId != null && list.size() > 0) {

            UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);

            if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")

                  .equalsIgnoreCase(TimeUtil.getGernalTime(list.get(0).getCreateTime().getTime(), "yyyy-MM"))) {

               Calendar calendar = Calendar.getInstance();

               calendar.setTimeInMillis(list.get(0).getCreateTime().getTime());

               UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();

               vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));

               finalList.add(vo);

            }



         }

         for (int i = 0; i < list.size(); i++) {

            if (i > 0 && !TimeUtil.getGernalTime(list.get(i - 1).getCreateTime().getTime(), "yyyy-MM")

                  .equalsIgnoreCase(TimeUtil.getGernalTime(list.get(i).getCreateTime().getTime(), "yyyy-MM"))) {// 本条数据与上条数据不是同一月则插入月份

@@ -109,6 +129,7 @@
            vo.setDetail(list.get(i));

            finalList.add(vo);

         }

      }



      // 统计月资金



@@ -137,7 +158,8 @@
         keys = monthMap.keySet().iterator();

         while (keys.hasNext()) {

            Integer key = keys.next();

            finalList.get(key).getMonth().setExpend(voList.get(p).getExpend());

            // 去除支出负号

            finalList.get(key).getMonth().setExpend(voList.get(p).getExpend().replace("-", ""));

            finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());

            p++;

         }

@@ -185,4 +207,10 @@
      return money == null ? new BigDecimal(0) : money;

   }



   @Override

   public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,

         Long sourceIdentifyId) {

      return userMoneyDetailMapper.selectByTypeAndUidAndIdentifyCode(type, uid, sourceIdentifyId);

   }



}