diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 56c36fa5..5a06e8a1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -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); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 98f77dd8..a61166b8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -782,8 +782,8 @@ public class SaOrderServiceImpl extends ServiceImpl 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 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 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 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); diff --git a/bd-third/src/main/resources/jd/bak.txt b/bd-third/src/main/resources/jd/bak.txt new file mode 100644 index 00000000..d930d8ab --- /dev/null +++ b/bd-third/src/main/resources/jd/bak.txt @@ -0,0 +1,6 @@ + +根据文档浏览器导出证书: +merchantCert.pfx + +DEMO中的公钥证书: +npp_11_API2_pro.cer diff --git a/bd-third/src/main/resources/jd/merchantCert004.pfx b/bd-third/src/main/resources/jd/merchantCert004.pfx new file mode 100644 index 00000000..a0dd4913 Binary files /dev/null and b/bd-third/src/main/resources/jd/merchantCert004.pfx differ diff --git a/bd-third/src/main/resources/jd/merchantCert005.pfx b/bd-third/src/main/resources/jd/merchantCert005.pfx new file mode 100644 index 00000000..084c88ba Binary files /dev/null and b/bd-third/src/main/resources/jd/merchantCert005.pfx differ diff --git a/bd-third/src/main/resources/jd/merchantCert006.pfx b/bd-third/src/main/resources/jd/merchantCert006.pfx new file mode 100644 index 00000000..7b30c6af Binary files /dev/null and b/bd-third/src/main/resources/jd/merchantCert006.pfx differ diff --git a/bd-third/src/main/resources/jd/merchantCert011.pfx b/bd-third/src/main/resources/jd/merchantCert011.pfx deleted file mode 100644 index 76e35682..00000000 Binary files a/bd-third/src/main/resources/jd/merchantCert011.pfx and /dev/null differ