|
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.sun.org.apache.xpath.internal.operations.Bool;
|
|
|
import com.usky.dxtop.common.core.domain.model.LoginUser;
|
|
|
import com.usky.dxtop.common.core.page.CommonPage;
|
|
|
import com.usky.dxtop.common.exception.CustomException;
|
|
@@ -20,12 +19,9 @@ import com.usky.dxtop.mapper.OrderMapper;
|
|
|
import com.usky.dxtop.model.*;
|
|
|
import com.usky.dxtop.service.*;
|
|
|
import com.usky.dxtop.service.api.TopApiConfiger;
|
|
|
-import com.usky.dxtop.service.config.rabbitmq.charge.ChargeConsumeConfig;
|
|
|
+import com.usky.dxtop.service.config.rabbitmq.RabbitmqUtils;
|
|
|
import com.usky.dxtop.service.constant.MsgLogBusinessCode;
|
|
|
-import com.usky.dxtop.service.emun.AsyncResultType;
|
|
|
-import com.usky.dxtop.service.emun.OrderPayType;
|
|
|
-import com.usky.dxtop.service.emun.OrderSceneCode;
|
|
|
-import com.usky.dxtop.service.emun.OrderStatus;
|
|
|
+import com.usky.dxtop.service.emun.*;
|
|
|
import com.usky.dxtop.service.vo.ChargeVO;
|
|
|
import com.usky.dxtop.service.vo.OrderExport;
|
|
|
import com.usky.dxtop.service.vo.OrderReport;
|
|
@@ -36,13 +32,10 @@ import ma.glasnost.orika.MapperFactory;
|
|
|
import ma.glasnost.orika.impl.DefaultMapperFactory;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.springframework.amqp.rabbit.connection.CorrelationData;
|
|
|
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
|
|
import org.springframework.aop.framework.AopContext;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Isolation;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
@@ -50,8 +43,6 @@ import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
-import java.util.concurrent.Future;
|
|
|
-import java.util.concurrent.FutureTask;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -76,10 +67,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
@Autowired
|
|
|
private CallApiLogService callApiLogService;
|
|
|
|
|
|
- @Autowired
|
|
|
- @Qualifier(ChargeConsumeConfig.TEMPLATE)
|
|
|
- private RabbitTemplate rabbitTemplate;
|
|
|
-
|
|
|
@Autowired
|
|
|
private StaffRadioService staffRadioService;
|
|
|
@Autowired
|
|
@@ -205,15 +192,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
chargeVo.setCard(order.getCard());
|
|
|
MsgLog msgLog = new MsgLog();
|
|
|
msgLog.setBusinessId(String.format("%s%s",MsgLogBusinessCode.ORDER,order.getId()));
|
|
|
- msgLog.setExchange(ChargeConsumeConfig.NAME);
|
|
|
- msgLog.setRoutingKey(ChargeConsumeConfig.NAME);
|
|
|
+ msgLog.setExchange(RabbitmqBeenCode.CART_CHARGE_CONSUMER.getName());
|
|
|
+ msgLog.setRoutingKey(RabbitmqBeenCode.CART_CHARGE_CONSUMER.getName());
|
|
|
msgLog.setMsg(JSON.toJSONString(chargeVo));
|
|
|
msgLog.setId(System.currentTimeMillis());
|
|
|
msgLog.setCreateTime(new Date());
|
|
|
msgLogService.save(msgLog);
|
|
|
chargeVo.setSeq(msgLog.getId());
|
|
|
CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
|
|
|
- rabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), chargeVo,correlationData);
|
|
|
+ RabbitmqUtils.getRabbitmqTemplate(RabbitmqBeenCode.CART_CHARGE_CONSUMER).convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), chargeVo,correlationData);
|
|
|
}catch (Exception e){
|
|
|
b = false;
|
|
|
log.error("---order---卡充值消息发送异常"+ e.getMessage());
|