订单确认收货消息新增下单时间

admin

2020-03-28 379e7b99ff3ca1e02d3847de0581ba1f89312113

订单确认收货消息新增下单时间

 fanli/src/main/java/com/yeshi/fanli/dto/mq/order/body/OrderConfirmMQMsg.java

@@ -17,14 +17,17 @@
    private BigDecimal settleMent;// 确认收货金额

    private Long sourceUid;// 产生该订单的用户

    private Date createTime;// 创建时间

    private Date placeOrderTime;// 下单时间



    public OrderConfirmMQMsg(String orderNo, int sourceType, BigDecimal settleMent, Long sourceUid, Date createTime) {

    public OrderConfirmMQMsg(String orderNo, int sourceType, BigDecimal settleMent, Long sourceUid, Date placeOrderTime,

            Date createTime) {

        super();

        this.orderNo = orderNo;

        this.sourceType = sourceType;

        this.settleMent = settleMent;

        this.sourceUid = sourceUid;

        this.createTime = createTime;

        this.placeOrderTime = placeOrderTime;

    }



    public String getOrderNo() {

@@ -67,4 +70,12 @@
        this.createTime = createTime;

    }



    public Date getPlaceOrderTime() {

        return placeOrderTime;

    }



    public void setPlaceOrderTime(Date placeOrderTime) {

        this.placeOrderTime = placeOrderTime;

    }



}


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

@@ -1071,15 +1071,21 @@
            if (!Constant.IS_TEST) {
                // 统计结算金额
                BigDecimal settlement = new BigDecimal("0");
                CommonOrder firstOrder = null;
                for (CommonOrderAddResultDTO dto : resultList)
                    if (dto.getCommonOrder().getSettlement() != null)
                    if (dto.getCommonOrder().getSettlement() != null) {
                        settlement = settlement.add(dto.getCommonOrder().getSettlement());
                CommonOrder firstOrder=resultList.get(0).getCommonOrder();
                OrderConfirmMQMsg mqMsg = new OrderConfirmMQMsg(firstOrder.getOrderNo(),
                        firstOrder.getSourceType(), settlement, firstOrder.getUserInfo().getId(),
                        new Date());
                Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm, mqMsg);
                orderProducer.send(msg);
                        if (firstOrder == null)
                            firstOrder = dto.getCommonOrder();
                    }
                if (firstOrder != null) {
                    Date placeDate = firstOrder.getThirdCreateTime();
                    OrderConfirmMQMsg mqMsg = new OrderConfirmMQMsg(firstOrder.getOrderNo(), firstOrder.getSourceType(),
                            settlement, firstOrder.getUserInfo().getId(), placeDate, new Date());
                    Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderConfirm,
                            mqMsg);
                    orderProducer.send(msg);
                }
            }
        }