消息修改

admin

2020-04-10 d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

@@ -46,7 +46,6 @@
import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2SettleTempService;

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

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

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

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

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

@@ -112,10 +111,6 @@


   @Resource

   private HongBaoV2SettleTempService hongBaoV2SettleTempService;





   @Resource

   private OrderTeamRewardDebtService orderTeamRewardDebtService;



   // 下级被封禁，红包失效

   private void invalidHongBaoForbidden(Long id) {

@@ -339,6 +334,7 @@
      Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderFanLiActual, mqMsg);

      String taskKey = getTaskKey(uid);

      msg.setKey(taskKey);



      // 添加事务消息

      try {

         orderTransactionProducer.send(msg, new LocalTransactionExecuter() {

@@ -547,8 +543,9 @@
         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);



         // 新版通知



         userMoneyMsgNotificationService.fanliOrderReceived(uid, orderId, sourceType, userGoodsCount.get(uid), money,

               user.getMyHongBao());

               user.getMyHongBao(), orderList.get(0).getThirdCreateTime());

      }

      // 通知免单到账

      try {

@@ -845,7 +842,8 @@


         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,

               null);



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);

@@ -943,8 +941,8 @@


         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());



               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,

               null);

      }



      hongBaoV2SettleTempService.addTemp(recieveHongBaoIds, key);