Skip to content

O
order-group
Commit 5aed9206 by ping.wu
Options

Merge branch 'feature/20221021_小程序外卖单取消订单同步取消配送单_wuping' of… 

Merge branch 'feature/20221021_小程序外卖单取消订单同步取消配送单_wuping' of https://gitlab.freemud.com/order-group-application/order-group
parents 1e210723 5894c2c8
Showing with 116 additions and 127 deletions
order-application-service/pom.xml
...@@ -374,16 +374,16 @@ ...@@ -374,16 +374,16 @@
<!-- <artifactId>assortment-payment-sdk</artifactId>--> <!-- <artifactId>assortment-payment-sdk</artifactId>-->
<!-- <version>2.6.10.RELEASE</version>--> <!-- <version>2.6.10.RELEASE</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.rocketmq</groupId> <!-- <groupId>org.apache.rocketmq</groupId>-->
<artifactId>rocketmq-spring-boot-starter</artifactId> <!-- <artifactId>rocketmq-spring-boot-starter</artifactId>-->
<version>2.0.4</version> <!-- <version>2.0.4</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>com.alibaba</groupId> <!-- <groupId>com.alibaba</groupId>-->
<artifactId>fastjson</artifactId> <!-- <artifactId>fastjson</artifactId>-->
<version>1.2.51</version> <!-- <version>1.2.51</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>tk.mybatis</groupId> <groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId> <artifactId>mapper-spring-boot-starter</artifactId>
......
order-application-service/src/main/java/cn/freemud/amp/config/RocketMQConfig.java
package cn.freemud.amp.config; //package cn.freemud.amp.config;
//
import cn.freemud.constant.RocketMQConst; //import cn.freemud.constant.RocketMQConst;
import com.alibaba.fastjson.support.spring.messaging.MappingFastJsonMessageConverter; //import com.alibaba.fastjson.support.spring.messaging.MappingFastJsonMessageConverter;
import org.apache.rocketmq.acl.common.AclClientRPCHook; //import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.SessionCredentials; //import org.apache.rocketmq.acl.common.SessionCredentials;
import org.apache.rocketmq.client.AccessChannel; //import org.apache.rocketmq.client.AccessChannel;
import org.apache.rocketmq.client.producer.DefaultMQProducer; //import org.apache.rocketmq.client.producer.DefaultMQProducer;
import org.apache.rocketmq.client.producer.selector.SelectMessageQueueByHash; //import org.apache.rocketmq.client.producer.selector.SelectMessageQueueByHash;
import org.apache.rocketmq.spring.core.RocketMQTemplate; //import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.util.Assert; //import org.springframework.util.Assert;
import org.springframework.util.StringUtils; //import org.springframework.util.StringUtils;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
//
@Configuration //@Configuration
public class RocketMQConfig { //public class RocketMQConfig {
//
@Resource // @Resource
private RocketMQProperties rocketMQProperties; // private RocketMQProperties rocketMQProperties;
//
@Bean(name = "deliveryRocketMqTemplate", destroyMethod = "destroy") // @Bean(name = "deliveryRocketMqTemplate", destroyMethod = "destroy")
public RocketMQTemplate rocketMQTemplate() { // public RocketMQTemplate rocketMQTemplate() {
DefaultMQProducer defaultMQProducer = createMQProducer(RocketMQConst.ORDER_THIRD_PUSH_PRODUCER_GROUP); // DefaultMQProducer defaultMQProducer = createMQProducer(RocketMQConst.ORDER_THIRD_PUSH_PRODUCER_GROUP);
RocketMQTemplate rocketMQTemplate = new RocketMQTemplate(); // RocketMQTemplate rocketMQTemplate = new RocketMQTemplate();
rocketMQTemplate.setProducer(defaultMQProducer); // rocketMQTemplate.setProducer(defaultMQProducer);
rocketMQTemplate.setMessageConverter(new MappingFastJsonMessageConverter()); // rocketMQTemplate.setMessageConverter(new MappingFastJsonMessageConverter());
rocketMQTemplate.setMessageQueueSelector(new SelectMessageQueueByHash()); // MessageQueueSelector, default SelectMessageQueueByHash // rocketMQTemplate.setMessageQueueSelector(new SelectMessageQueueByHash()); // MessageQueueSelector, default SelectMessageQueueByHash
return rocketMQTemplate; // return rocketMQTemplate;
} // }
//
/** // /**
* @return // * @return
*/ // */
public DefaultMQProducer createMQProducer(String producerGroupName) { // public DefaultMQProducer createMQProducer(String producerGroupName) {
RocketMQProperties.Producer producerConfig = rocketMQProperties.getProducer(); // RocketMQProperties.Producer producerConfig = rocketMQProperties.getProducer();
String nameServer = rocketMQProperties.getNameServer(); // String nameServer = rocketMQProperties.getNameServer();
String groupName = StringUtils.isEmpty(producerGroupName) ? producerConfig.getGroup() : producerGroupName; // String groupName = StringUtils.isEmpty(producerGroupName) ? producerConfig.getGroup() : producerGroupName;
Assert.hasText(nameServer, "rocketmq.name-server must not be null"); // Assert.hasText(nameServer, "rocketmq.name-server must not be null");
Assert.hasText(groupName, "rocketmq.producer.group must not be null"); // Assert.hasText(groupName, "rocketmq.producer.group must not be null");
//
String accessChannel = rocketMQProperties.getAccessChannel(); // String accessChannel = rocketMQProperties.getAccessChannel();
String accessKey = rocketMQProperties.getProducer().getAccessKey(); // String accessKey = rocketMQProperties.getProducer().getAccessKey();
String secretKey = rocketMQProperties.getProducer().getSecretKey(); // String secretKey = rocketMQProperties.getProducer().getSecretKey();
//
DefaultMQProducer producer = null; // DefaultMQProducer producer = null;
// 密码模式 // // 密码模式
if (!StringUtils.isEmpty(accessKey) && !StringUtils.isEmpty(secretKey)) { // if (!StringUtils.isEmpty(accessKey) && !StringUtils.isEmpty(secretKey)) {
producer = new DefaultMQProducer(groupName, new AclClientRPCHook(new SessionCredentials(accessKey, secretKey)) // producer = new DefaultMQProducer(groupName, new AclClientRPCHook(new SessionCredentials(accessKey, secretKey))
, rocketMQProperties.getProducer().isEnableMsgTrace() // , rocketMQProperties.getProducer().isEnableMsgTrace()
, rocketMQProperties.getProducer().getCustomizedTraceTopic()); // , rocketMQProperties.getProducer().getCustomizedTraceTopic());
producer.setVipChannelEnabled(false); // producer.setVipChannelEnabled(false);
} else { // } else {
producer = new DefaultMQProducer(groupName // producer = new DefaultMQProducer(groupName
, rocketMQProperties.getProducer().isEnableMsgTrace() // , rocketMQProperties.getProducer().isEnableMsgTrace()
, rocketMQProperties.getProducer().getCustomizedTraceTopic()); // , rocketMQProperties.getProducer().getCustomizedTraceTopic());
} // }
//
producer.setNamesrvAddr(nameServer); // producer.setNamesrvAddr(nameServer);
//
if (!StringUtils.isEmpty(accessChannel)) { // if (!StringUtils.isEmpty(accessChannel)) {
producer.setAccessChannel(AccessChannel.valueOf(accessChannel)); // producer.setAccessChannel(AccessChannel.valueOf(accessChannel));
} // }
//
producer.setSendMsgTimeout(producerConfig.getSendMessageTimeout()); // producer.setSendMsgTimeout(producerConfig.getSendMessageTimeout());
producer.setRetryTimesWhenSendFailed(producerConfig.getRetryTimesWhenSendFailed()); // producer.setRetryTimesWhenSendFailed(producerConfig.getRetryTimesWhenSendFailed());
producer.setRetryTimesWhenSendAsyncFailed(producerConfig.getRetryTimesWhenSendAsyncFailed()); // producer.setRetryTimesWhenSendAsyncFailed(producerConfig.getRetryTimesWhenSendAsyncFailed());
producer.setMaxMessageSize(producerConfig.getMaxMessageSize()); // producer.setMaxMessageSize(producerConfig.getMaxMessageSize());
producer.setCompressMsgBodyOverHowmuch(producerConfig.getCompressMessageBodyThreshold()); // producer.setCompressMsgBodyOverHowmuch(producerConfig.getCompressMessageBodyThreshold());
producer.setRetryAnotherBrokerWhenNotStoreOK(producerConfig.isRetryNextServer()); // producer.setRetryAnotherBrokerWhenNotStoreOK(producerConfig.isRetryNextServer());
producer.setPollNameServerInterval(rocketMQProperties.getPollNameServerInteval()); // producer.setPollNameServerInterval(rocketMQProperties.getPollNameServerInteval());
producer.setHeartbeatBrokerInterval(rocketMQProperties.getHeartbeatBrokerInterval()); // producer.setHeartbeatBrokerInterval(rocketMQProperties.getHeartbeatBrokerInterval());
producer.setPersistConsumerOffsetInterval(rocketMQProperties.getPersistConsumerOffsetInterval()); // producer.setPersistConsumerOffsetInterval(rocketMQProperties.getPersistConsumerOffsetInterval());
//
return producer; // return producer;
} // }
//
} //}
order-application-service/src/main/java/cn/freemud/amp/service/ProduceMQService.java
...@@ -5,23 +5,12 @@ import cn.freemud.amqp.Header; ...@@ -5,23 +5,12 @@ import cn.freemud.amqp.Header;
import cn.freemud.amqp.MQAction; import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage; import cn.freemud.amqp.MQMessage;
import cn.freemud.amqp.MQService; import cn.freemud.amqp.MQService;
import cn.freemud.constant.RocketMQConst;
import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto; import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
import com.alibaba.fastjson.JSON;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.google.common.base.Throwables;
import org.apache.commons.lang.BooleanUtils;
import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/** /**
* mq发送方 * mq发送方
*/ */
...@@ -30,8 +19,8 @@ public class ProduceMQService { ...@@ -30,8 +19,8 @@ public class ProduceMQService {
@Autowired @Autowired
private MQService mqService; private MQService mqService;
@Resource // @Resource
private RocketMQTemplate deliveryRocketMqTemplate; // private RocketMQTemplate deliveryRocketMqTemplate;
@Value("${rocketmq.delivery.enable:false}") @Value("${rocketmq.delivery.enable:false}")
private Boolean rocketMQDeliveryEnable; private Boolean rocketMQDeliveryEnable;
...@@ -54,26 +43,26 @@ public class ProduceMQService { ...@@ -54,26 +43,26 @@ public class ProduceMQService {
* @param deliveryRequest * @param deliveryRequest
* @Description 发送配送信息到rocketMq: * @Description 发送配送信息到rocketMq:
*/ */
public void sendRocketMqOfDeliveryInfo(CallbackUrlRequestDto deliveryRequest) { // public void sendRocketMqOfDeliveryInfo(CallbackUrlRequestDto deliveryRequest) {
//
if (BooleanUtils.isNotTrue(rocketMQDeliveryEnable)) { // if (BooleanUtils.isNotTrue(rocketMQDeliveryEnable)) {
return; // return;
} // }
//
Header header = new Header(MQAction.UPDATE.getAction(), "delivery/callbackUrl", deliveryRequest.getOrderId(), RocketMQConst.ORDER_THIRD_PUSH_TOPIC); // Header header = new Header(MQAction.UPDATE.getAction(), "delivery/callbackUrl", deliveryRequest.getOrderId(), RocketMQConst.ORDER_THIRD_PUSH_TOPIC);
MQMessage<CallbackUrlRequestDto> mqMessage = new MQMessage(header, deliveryRequest); // MQMessage<CallbackUrlRequestDto> mqMessage = new MQMessage(header, deliveryRequest);
String destination = String.format("%s:%s", RocketMQConst.ORDER_THIRD_PUSH_TOPIC, RocketMQConst.OrderSubsidiaryTag.delivery); // String destination = String.format("%s:%s", RocketMQConst.ORDER_THIRD_PUSH_TOPIC, RocketMQConst.OrderSubsidiaryTag.delivery);
Message message = MessageBuilder // Message message = MessageBuilder
.withPayload(mqMessage) // .withPayload(mqMessage)
.setHeader("partnerId", deliveryRequest.getPartnerId()) // .setHeader("partnerId", deliveryRequest.getPartnerId())
.setHeader(MessageConst.PROPERTY_KEYS, deliveryRequest.getDeliveryId()) // .setHeader(MessageConst.PROPERTY_KEYS, deliveryRequest.getDeliveryId())
.build(); // .build();
//
try { // try {
SendResult sendResult = deliveryRocketMqTemplate.syncSendOrderly(destination, message, deliveryRequest.getOrderId()); // SendResult sendResult = deliveryRocketMqTemplate.syncSendOrderly(destination, message, deliveryRequest.getOrderId());
// log.debug("sendDelivery of status:{}, message:{},", sendResult.toString(), JSON.toJSONString(message)); //// log.debug("sendDelivery of status:{}, message:{},", sendResult.toString(), JSON.toJSONString(message));
} catch (Exception e) { // } catch (Exception e) {
ErrorLog.printErrorLog("sendDelivery.error","delivery/callbackUrl",message,e); // ErrorLog.printErrorLog("sendDelivery.error","delivery/callbackUrl",message,e);
} // }
} // }
} }
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
...@@ -194,7 +194,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService { ...@@ -194,7 +194,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
// 订单配送状态变化时发送到MQ // 订单配送状态变化时发送到MQ
if (DeliveryStatus.checkDeliveryStatueForPlatform(deliveryStatus)) { if (DeliveryStatus.checkDeliveryStatueForPlatform(deliveryStatus)) {
produceMQService.sendOfDeliveryInfo(request); produceMQService.sendOfDeliveryInfo(request);
produceMQService.sendRocketMqOfDeliveryInfo(request); // produceMQService.sendRocketMqOfDeliveryInfo(request);
} }
//配送订阅消息 //配送订阅消息
sendMicroMessage(partnerId, request.getOrderId(), deliveryStatus); sendMicroMessage(partnerId, request.getOrderId(), deliveryStatus);
......
order-application-service/src/test/java/cn/freemud/amp/service/ProduceMQServiceTest.java
...@@ -37,7 +37,7 @@ public class ProduceMQServiceTest { ...@@ -37,7 +37,7 @@ public class ProduceMQServiceTest {
@Test @Test
public void send() { public void send() {
CallbackUrlRequestDto callbackUrlRequestDto = buildCallbackUrlRequestDto(); CallbackUrlRequestDto callbackUrlRequestDto = buildCallbackUrlRequestDto();
produceMQService.sendRocketMqOfDeliveryInfo(callbackUrlRequestDto); // produceMQService.sendRocketMqOfDeliveryInfo(callbackUrlRequestDto);
} }
public MQMessage buildMQMessage() { public MQMessage buildMQMessage() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment