Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgMoneyDetailServiceImpl.java

@@ -12,12 +12,17 @@
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;

import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;

import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;

import com.yeshi.fanli.util.Constant;



@Service

public class MsgMoneyDetailServiceImpl implements MsgMoneyDetailService {



   @Resource

   private MsgMoneyDetailMapper msgMoneyDetailMapper;



   @Resource

   private UserMsgReadStateService userMsgReadStateService;



   @Override

   public void addMsgMoneyDetail(MsgMoneyDetail detail) throws MsgMoneyDetailException {

@@ -43,9 +48,9 @@
         }



      } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractValid) {

         if (detail.getExtract() == null || detail.getUser() == null)

         if (detail.getAlipayAccountValid() == null || detail.getUser() == null)

            throw new MsgMoneyDetailException(2, "消息信息不全");

         MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getExtract().getId(),

         MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getAlipayAccountValid().getId(),

               MsgTypeMoneyTypeEnum.extractValid);

         if (msg == null) {

            detail.setCreateTime(new Date());

@@ -62,8 +67,8 @@
         }



      } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.fanli) {

         if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderCount() == null

               || detail.getOrderId() == null || detail.getBalance() == null)

         if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderId() == null

               || detail.getBalance() == null)

            throw new MsgMoneyDetailException(2, "消息信息不全");



         detail.setCreateTime(new Date());

@@ -79,17 +84,47 @@
         detail.setUpdateTime(new Date());

         detail.setRead(false);

         msgMoneyDetailMapper.insertSelective(detail);

      } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.fanliWeiQuan

            || detail.getMsgType() == MsgTypeMoneyTypeEnum.inviteWeiQuan

            || detail.getMsgType() == MsgTypeMoneyTypeEnum.shareWeiQuan) {

         if (detail.getMoney() == null || detail.getOrderId() == null || detail.getBalance() == null)

            throw new MsgMoneyDetailException(2, "消息信息不全");

         detail.setCreateTime(new Date());

         detail.setUpdateTime(new Date());

         detail.setRead(false);

         msgMoneyDetailMapper.insertSelective(detail);

      } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.orderReward) {

         if (detail.getMoney() == null || detail.getOrderId() == null || detail.getBalance() == null)

            throw new MsgMoneyDetailException(2, "消息信息不全");

         detail.setCreateTime(new Date());

         detail.setUpdateTime(new Date());

         detail.setRead(false);

         msgMoneyDetailMapper.insertSelective(detail);

      } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {

         if (detail.getMoney() == null || detail.getOrderId() == null || detail.getBalance() == null)

            throw new MsgMoneyDetailException(2, "消息信息不全");

         detail.setCreateTime(new Date());

         detail.setUpdateTime(new Date());

         detail.setRead(false);

         msgMoneyDetailMapper.insertSelective(detail);

      }



      userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);

   }



   @Override

   public List<MsgMoneyDetail> listMsgMoneyDetail(Long uid, int page) {

      return null;

      return msgMoneyDetailMapper.listByUid(uid, (page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE);

   }



   @Override

   public long countMsgMoneyDetail(Long uid) {

      return 0;

      return msgMoneyDetailMapper.countByUid(uid);

   }



   @Override

   public void readMsgByUid(Long uid) {

      msgMoneyDetailMapper.setMsgReadByUid(uid);

   }



}