延迟发送订阅消息
This commit is contained in:
parent
8aa6b1e56b
commit
7425f0a4d5
|
|
@ -9,10 +9,12 @@ import cn.hutool.core.util.StrUtil;
|
||||||
import cn.ysk.cashier.config.security.security.TokenProvider;
|
import cn.ysk.cashier.config.security.security.TokenProvider;
|
||||||
import cn.ysk.cashier.cons.RedisConstant;
|
import cn.ysk.cashier.cons.RedisConstant;
|
||||||
import cn.ysk.cashier.cons.rabbit.RabbitConstants;
|
import cn.ysk.cashier.cons.rabbit.RabbitConstants;
|
||||||
|
import cn.ysk.cashier.dto.shop.TbShopTableDto;
|
||||||
|
import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria;
|
||||||
import cn.ysk.cashier.dto.shoptable.*;
|
import cn.ysk.cashier.dto.shoptable.*;
|
||||||
import cn.ysk.cashier.enums.*;
|
import cn.ysk.cashier.enums.*;
|
||||||
import cn.ysk.cashier.exception.BadRequestException;
|
import cn.ysk.cashier.exception.BadRequestException;
|
||||||
import cn.ysk.cashier.mybatis.entity.TbShopUserFlow;
|
import cn.ysk.cashier.mapper.shop.TbShopTableMapper;
|
||||||
import cn.ysk.cashier.mybatis.mapper.*;
|
import cn.ysk.cashier.mybatis.mapper.*;
|
||||||
import cn.ysk.cashier.mybatis.service.MpCashierCartService;
|
import cn.ysk.cashier.mybatis.service.MpCashierCartService;
|
||||||
import cn.ysk.cashier.mybatis.service.MpOrderDetailService;
|
import cn.ysk.cashier.mybatis.service.MpOrderDetailService;
|
||||||
|
|
@ -29,9 +31,11 @@ import cn.ysk.cashier.repository.TbShopPayTypeRepository;
|
||||||
import cn.ysk.cashier.repository.order.TbCashierCartRepository;
|
import cn.ysk.cashier.repository.order.TbCashierCartRepository;
|
||||||
import cn.ysk.cashier.repository.product.TbProductSkuRepository;
|
import cn.ysk.cashier.repository.product.TbProductSkuRepository;
|
||||||
import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
|
import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
|
||||||
|
import cn.ysk.cashier.repository.shop.TbShopTableRepository;
|
||||||
import cn.ysk.cashier.service.PayService;
|
import cn.ysk.cashier.service.PayService;
|
||||||
import cn.ysk.cashier.service.impl.TbPayServiceImpl;
|
import cn.ysk.cashier.service.impl.TbPayServiceImpl;
|
||||||
import cn.ysk.cashier.service.order.TbOrderInfoService;
|
import cn.ysk.cashier.service.order.TbOrderInfoService;
|
||||||
|
import cn.ysk.cashier.service.shop.TbShopTableService;
|
||||||
import cn.ysk.cashier.utils.*;
|
import cn.ysk.cashier.utils.*;
|
||||||
import cn.ysk.cashier.vo.PendingCountVO;
|
import cn.ysk.cashier.vo.PendingCountVO;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
|
|
@ -39,32 +43,27 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.dianguang.cloud.ossservice.model.DateUtils;
|
import com.dianguang.cloud.ossservice.model.DateUtils;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import cn.ysk.cashier.repository.shop.TbShopTableRepository;
|
|
||||||
import cn.ysk.cashier.service.shop.TbShopTableService;
|
|
||||||
import cn.ysk.cashier.dto.shop.TbShopTableDto;
|
|
||||||
import cn.ysk.cashier.dto.shop.TbShopTableQueryCriteria;
|
|
||||||
import cn.ysk.cashier.mapper.shop.TbShopTableMapper;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.amqp.rabbit.connection.CorrelationData;
|
import org.springframework.amqp.rabbit.connection.CorrelationData;
|
||||||
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.data.domain.Page;
|
|
||||||
import org.springframework.data.domain.Pageable;
|
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.io.IOException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author lyf
|
* @author lyf
|
||||||
|
|
@ -1606,7 +1605,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
||||||
jsonObject.put("token", null);
|
jsonObject.put("token", null);
|
||||||
jsonObject.put("type", "create");
|
jsonObject.put("type", "create");
|
||||||
jsonObject.put("orderId", orderInfo.getId());
|
jsonObject.put("orderId", orderInfo.getId());
|
||||||
rabbitMsgUtils.sendOrderCollectMsg(jsonObject);
|
rabbitMsgUtils.sendOrderCollectMsg(jsonObject,3);
|
||||||
|
|
||||||
// 打印消息
|
// 打印消息
|
||||||
if (!shopEatTypeInfoDTO.isDineInAfter()) {
|
if (!shopEatTypeInfoDTO.isDineInAfter()) {
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,10 @@ public class RabbitMsgUtils implements RabbitTemplate.ConfirmCallback {
|
||||||
sendMsg(RabbitConstants.CART_ORDER_COLLECT_PUT, RabbitConstants.CART_ORDER_COLLECT_ROUTINGKEY_PUT, data, "订单信息收集", true, null);
|
sendMsg(RabbitConstants.CART_ORDER_COLLECT_PUT, RabbitConstants.CART_ORDER_COLLECT_ROUTINGKEY_PUT, data, "订单信息收集", true, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public <T> void sendOrderCollectMsg(T data, int waitTime) {
|
||||||
|
sendMsg(RabbitConstants.CART_ORDER_COLLECT_PUT, RabbitConstants.CART_ORDER_COLLECT_ROUTINGKEY_PUT, data, "订单信息收集", true, waitTime);
|
||||||
|
}
|
||||||
|
|
||||||
public void printTicket(String orderId) {
|
public void printTicket(String orderId) {
|
||||||
sendMsg(RabbitConstants.PRINT_MECHINE_COLLECT_PUT, RabbitConstants.PRINT_MECHINE_COLLECT_ROUTINGKEY_PUT, orderId, "打印票", false, null);
|
sendMsg(RabbitConstants.PRINT_MECHINE_COLLECT_PUT, RabbitConstants.PRINT_MECHINE_COLLECT_ROUTINGKEY_PUT, orderId, "打印票", false, null);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue