消息调整

yujian

2020-04-13 817761e47af7ea7bae164d3aa47337a7442f1c14

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

@@ -37,7 +37,6 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.HongBaoV2SettleTemp;

import com.yeshi.fanli.entity.order.InviteOrderSubsidy;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.money.InviteOrderSubsidyDebtException;

import com.yeshi.fanli.exception.money.OrderMoneySettleException;

@@ -62,7 +61,6 @@
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;

import com.yeshi.fanli.util.rocketmq.MQTopicName;

import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;



@Service

public class OrderMoneySettleServiceImpl implements OrderMoneySettleService {

@@ -114,7 +112,7 @@
   @Resource

   private HongBaoV2SettleTempService hongBaoV2SettleTempService;



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

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

   private void invalidHongBaoForbidden(Long id) {

      HongBaoV2 updateHongBaoV2 = new HongBaoV2(id);

      updateHongBaoV2.setState(HongBaoV2.STATE_SHIXIAO);

@@ -336,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() {

@@ -544,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 {

@@ -842,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);

@@ -940,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);

@@ -1064,4 +1065,5 @@
      }

      return debtMoney;

   }



}