Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-14 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d

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

@@ -5,12 +5,14 @@


import javax.annotation.Resource;



import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dto.push.PushContentDTO;

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

import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

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

import com.yeshi.fanli.exception.push.PushException;

@@ -39,6 +41,17 @@
      }

   }



   @Async

   @Override

   public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractAutoMsg(extractRecord, stateDesc, desc, beiZhu);

      try {

         msgMoneyDetailService.addMsgMoneyDetail(detail);

      } catch (MsgMoneyDetailException e) {

         e.printStackTrace();

      }

   }

	
   @Override

   public void extractFail(Extract extract, String stateDesc) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractFailMsg(extract, extract.getUserInfo().getId(),

@@ -262,4 +275,14 @@
      }

   }



   @Override

   public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createElmeFanliMsg(uid, orderId, money, balance, null);

      try {

         msgMoneyDetailService.addMsgMoneyDetail(detail);

      } catch (MsgMoneyDetailException e) {

         e.printStackTrace();

      }

   }



}