红包消息修改

admin

2019-12-12 04f4e0d92da6fe05601123768afa6ca7ff857735

红包消息修改

 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java

@@ -121,6 +121,17 @@
    @Column(name = "co_update_time")

    private Date updateTime;



    @Column(name = "co_urank")

    private Integer urank;// 用户等级 100-为超级会员



    public Integer getUrank() {

        return urank;

    }



    public void setUrank(Integer urank) {

        this.urank = urank;

    }



    public CommonOrder() {



    }


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

@@ -156,6 +156,7 @@
        // 邀请赚到账事务消息

        OrderMoneyRecievedMQMsg mqMsg = new OrderMoneyRecievedMQMsg(OrderMoneyRecievedMQMsg.TYPE_INVITE, uid,

                sourceType, null, null, new Date(), 0);



        Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderFanLiActual, mqMsg);

        String taskKey = getTaskKey(uid);

        msg.setKey(taskKey);

@@ -175,6 +176,7 @@
        } catch (Exception e) {

            LogHelper.mqError(e.getMessage(), msg.getTopic(), msg.getTag(), new Gson().toJson(mqMsg));

        }

        System.out.println(new Gson().toJson(mqMsg));

    }



    @Transactional

@@ -574,7 +576,7 @@
        return hongBao;

    }



    @Transactional

    @Transactional(rollbackFor = Exception.class)

    private void fanliInviteTB(List<HongBaoV2> hongBaoList, Long uid, String key) throws TaoBaoWeiQuanException {

        List<Long> hbIdList = new ArrayList<>();

        BigDecimal invitemoney = new BigDecimal(0);


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

@@ -525,7 +525,7 @@
    }



    @Override

    @Transactional

    @Transactional(rollbackFor=Exception.class)

    public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {

        // 邀请赚到账

        try {

@@ -533,6 +533,8 @@
        } catch (OrderMoneySettleException e) {

            e.printStackTrace();

        }

        if(1>0)

            return;

        //

        try {

            orderMoneySettleService.inviteSettleJD(uid);


 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderMoneyRecievedMessageListener.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

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

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

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

@@ -65,6 +66,8 @@


    @Override

    public Action consume(Message message, ConsumeContext context) {

        LogHelper.mqInfo("consumer:OrderMoneyRecievedMessageListener", message.getMsgID(), message.getTopic(),

                message.getTag(), new String(message.getBody()));

        // 根据红包做订单分发

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

            if (OrderTopicTagEnum.orderFanLiActual.name().equalsIgnoreCase(message.getTag())) {


 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java

@@ -72,38 +72,38 @@
                    msg.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60);

                producer.send(msg);

                return Action.CommitMessage;

            }

        } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 订单统计

            OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);

            int hour = 24;

            if (Constant.IS_TEST) {

                hour = 1;

            }

            } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 订单统计

                OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);

                int hour = 24;

                if (Constant.IS_TEST) {

                    hour = 1;

                }



            if (orderMQMsg.getDelayHour() == hour) {

                try {// 邀请奖励

                    redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());

                } catch (Exception e) {

                    e.printStackTrace();

                if (orderMQMsg.getDelayHour() == hour) {

                    try {// 邀请奖励

                        redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());

                    } catch (Exception e) {

                        e.printStackTrace();

                    }

                }

            }

            return Action.CommitMessage;

        } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiSeparateByOrderNo.name())) {// 订单到账（按订单号处理）

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

                    OrderMoneyRecievedMQMsg.class);


            if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_INVITE) {

                if (!StringUtil.isNullOrEmpty(orderMoneyRecievedMQMsg.getOrderId())

                        && orderMoneyRecievedMQMsg.getUid() != null) {

                     try {

                         redPackWinInviteService.inviteOrderArriveReward(orderMoneyRecievedMQMsg.getUid(), 
                                 orderMoneyRecievedMQMsg.getSourceType(), orderMoneyRecievedMQMsg.getOrderId());
                     } catch (Exception e) {

                         e.printStackTrace();

                     }

                return Action.CommitMessage;

            } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiSeparateByOrderNo.name())) {// 订单到账（按订单号处理）

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

                        OrderMoneyRecievedMQMsg.class);



                if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_INVITE) {

                    if (!StringUtil.isNullOrEmpty(orderMoneyRecievedMQMsg.getOrderId())

                            && orderMoneyRecievedMQMsg.getUid() != null) {

                        try {

                            redPackWinInviteService.inviteOrderArriveReward(orderMoneyRecievedMQMsg.getUid(),

                                    orderMoneyRecievedMQMsg.getSourceType(), orderMoneyRecievedMQMsg.getOrderId());

                        } catch (Exception e) {

                            e.printStackTrace();

                        }

                    }

                }

                return Action.CommitMessage;

            }

            return Action.CommitMessage;

        } else if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {

            boolean inviteSucceedReward = false;

            Long uid = null;