Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyServiceImpl.java

@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;



@Service

@@ -53,8 +54,9 @@
      userMoneyDetailMapper.insertSelective(detail);

      userInfoMapper.subHongBaoByUid(uid, money);

      try {

         UserMoneyChangeCMQManager.getInstance()

               .addUserMoneyChangeMsg(new UserMoneyChangeDTO(uid, new BigDecimal(0).subtract(money)));

         if (!Constant.IS_TEST)

            UserMoneyChangeCMQManager.getInstance()

                  .addUserMoneyChangeMsg(new UserMoneyChangeDTO(uid, new BigDecimal(0).subtract(money)));

      } catch (Exception e) {

         try {

            LogHelper.errorDetailInfo(e);

@@ -70,6 +72,7 @@
      userMoneyDetailMapper.insertSelective(detail);

      userInfoMapper.addHongBaoByUid(uid, money);

      try {

         if (!Constant.IS_TEST)

         UserMoneyChangeCMQManager.getInstance().addUserMoneyChangeMsg(new UserMoneyChangeDTO(uid, money));

      } catch (Exception e) {

         try {