Compare commits

...

3 Commits

10 changed files with 20 additions and 18 deletions

View File

@ -725,8 +725,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
) {
// 计算奖金通过mq分发消息异步处理
saOrderExt.setCancelBool(Boolean.FALSE);
log.info("新零售秒结消息order.second.exchange{}", saOrderExt.getOrderCode());
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// log.info("新零售秒结消息order.second.exchange{}", saOrderExt.getOrderCode());
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
}
} catch (Exception e) {
log.error("新零售 pushOrderMq 推送MQ失败. order: {}", saOrderExt, e);

View File

@ -782,8 +782,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
try {
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
// 推送秒结数据
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// // 推送秒结数据
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// 2024.06.07 进行修改首购统一推送消息后面根据业务不同进行分队列消费
@ -879,8 +879,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
throw new ServiceException("保存会员失败!!!");
}
try {
// 推送秒结数据
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// // 推送秒结数据
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
@ -992,8 +992,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
try {
// 推送秒结数据
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// // 推送秒结数据
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
} catch (Exception e) {
e.printStackTrace();
}
@ -2349,8 +2349,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 撤单标记为 true
saOrderExt.setCancelBool(Boolean.TRUE);
// 计算奖金通过mq分发消息异步处理
log.info("新零售秒结消息order.second.exchange{}", saOrderExt.getOrderCode());
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
// log.info("新零售秒结消息order.second.exchange{}", saOrderExt.getOrderCode());
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
}
} catch (Exception e) {
log.error("新零售 pushOrderMq 推送MQ失败. order: {}", saOrderExt, e);

View File

@ -13,13 +13,9 @@ public enum ESysName {
MANAGE("manage", "后台管理"),
/**
* 新零售
* 众康系统
*/
BF("bf", "新零售BF"),
/**
* 新零售店铺
*/
BL("bl", "新零售店铺BL"),
ZK("zk", "众康系统"),
;

View File

@ -10,7 +10,7 @@ logging.config=classpath:logback.xml
### 执行器通讯TOKEN [选填]:非空时启用;
xxl.job.accessToken=base_token
### 执行器AppName [选填]:执行器心跳注册分组依据;为空则关闭自动注册
xxl.job.executor.appname=xxl-job-retail
xxl.job.executor.appname=xxl-job-zk
### 执行器注册 [选填]:优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
xxl.job.executor.address=
### 执行器IP [选填]默认为空表示自动获取IP多网卡时可手动设置指定IP该IP不会绑定Host仅作为通讯实用地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"

View File

@ -0,0 +1,6 @@
根据文档浏览器导出证书:
merchantCert.pfx
DEMO中的公钥证书
npp_11_API2_pro.cer

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -444,7 +444,7 @@
<!--Nacos服务地址-->
<config.server-addr>127.0.0.1:8848</config.server-addr>
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID不能使用名称,默认为空-->
<config.namespace>4d03b742-f273-4306-87c7-7dbd6000fd7c</config.namespace>
<config.namespace>8e88a6b5-94e6-4711-8a01-c5ff87ac5662</config.namespace>
<!--Nacos配置分组名称-->
<config.group>DEFAULT_GROUP</config.group>
<!--Nacos用户名-->