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

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/coupon/SystemCouponMessageListener.java

@@ -9,9 +9,12 @@
import com.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.MessageListener;

import com.google.gson.Gson;

import com.yeshi.fanli.dto.order.OrderMoneyRecievedMQMsgDTO;

import com.yeshi.fanli.dto.mq.BaseMQMsgBody;

import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;

import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.Constant;

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



@Component

@@ -24,9 +27,16 @@
   public Action consume(Message message, ConsumeContext context) {

      LogHelper.mqInfo("consumer-SystemCouponMessageListener", message.getTopic(), message.getTag(),

            new String(message.getBody()));

      if (MQTopicName.TOPIC_FANLI.name().equalsIgnoreCase(message.getTopic())) {

         OrderMoneyRecievedMQMsgDTO orderMoneyRecievedMQMsgDTO = new Gson().fromJson(new String(message.getBody()),

               OrderMoneyRecievedMQMsgDTO.class);

      String tag = message.getTag();

      BaseMQMsgBody baseBody = new Gson().fromJson(new String(message.getBody()), BaseMQMsgBody.class);

      if (baseBody.isTest() != Constant.IS_TEST)

         return Action.ReconsumeLater;



      if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {

         if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiActual.name()))// 实时到账

         {

            OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsgDTO = new Gson().fromJson(new String(message.getBody()),

                  OrderMoneyRecievedMQMsg.class);

         if (orderMoneyRecievedMQMsgDTO != null) {

            if (orderMoneyRecievedMQMsgDTO.getOrderFirst() != null

                  && orderMoneyRecievedMQMsgDTO.getOrderFirst() == true) {

@@ -41,6 +51,7 @@
            }

         }

      }

      }

      return Action.CommitMessage;

   }

}