Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -8,10 +8,12 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.msg.MsgMoneyDetailMapper;

import com.yeshi.fanli.entity.bus.msg.MsgExtra;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;

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

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

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

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

import com.yeshi.fanli.util.Constant;



@@ -23,6 +25,9 @@


   @Resource

   private UserMsgReadStateService userMsgReadStateService;

	
   @Resource

   private MsgExtraService msgExtraService;



   @Override

   public void addMsgMoneyDetail(MsgMoneyDetail detail) throws MsgMoneyDetailException {

@@ -38,6 +43,7 @@
            detail.setUpdateTime(new Date());

            detail.setRead(false);

            msgMoneyDetailMapper.insertSelective(detail);

            msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);

         } else {

            MsgMoneyDetail update = new MsgMoneyDetail();

            update.setId(msg.getId());

@@ -45,8 +51,8 @@
            update.setRead(false);

            update.setStateDesc(detail.getStateDesc());

            msgMoneyDetailMapper.updateByPrimaryKeySelective(update);

            msgExtraService.updateMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);

         }



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

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

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

@@ -57,6 +63,7 @@
            detail.setUpdateTime(new Date());

            detail.setRead(false);

            msgMoneyDetailMapper.insertSelective(detail);

            msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);

         } else {

            MsgMoneyDetail update = new MsgMoneyDetail();

            update.setId(msg.getId());

@@ -64,87 +71,10 @@
            update.setRead(false);

            update.setStateDesc(detail.getStateDesc());

            msgMoneyDetailMapper.updateByPrimaryKeySelective(update);

            msgExtraService.updateMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_MONEY);

         }



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

         if (detail.getMoney() == null || detail.getGoodsCount() == 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.invite

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

         if (detail.getMoney() == null || detail.getGoodsCount() == null || detail.getOrderCount() == 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.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);

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

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

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



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

               MsgTypeMoneyTypeEnum.extractAutoWX);

         if (msg == null) {

            detail.setCreateTime(new Date());

            detail.setUpdateTime(new Date());

            detail.setRead(false);

            msgMoneyDetailMapper.insertSelective(detail);

         } else {

            MsgMoneyDetail update = new MsgMoneyDetail();

            update.setId(msg.getId());

            update.setUpdateTime(new Date());

            update.setRead(false);

            update.setStateDesc(detail.getStateDesc());

            msgMoneyDetailMapper.updateByPrimaryKeySelective(update);

         }

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

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

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

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

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

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

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

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

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

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

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

         if (detail.getUser() == null)

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

         detail.setCreateTime(new Date());

         detail.setUpdateTime(new Date());

         detail.setRead(false);

         msgMoneyDetailMapper.insertSelective(detail);

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

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

      }  else {

         if(detail.getUser() == null)

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

         detail.setCreateTime(new Date());

         detail.setUpdateTime(new Date());