angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 调整在线支付使用BD配置；去掉秒结逻辑；

This commit is contained in:
cabbage 2025-08-18 11:27:15 +08:00
parent a3712c470e
commit d1236c31c7
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

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

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

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

6
bd-third/src/main/resources/jd/bak.txt Normal file
View File

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

BIN
bd-third/src/main/resources/jd/merchantCert004.pfx Normal file
View File

Binary file not shown.

BIN
bd-third/src/main/resources/jd/merchantCert005.pfx Normal file
View File

Binary file not shown.

BIN
bd-third/src/main/resources/jd/merchantCert006.pfx Normal file
View File

Binary file not shown.

BIN
bd-third/src/main/resources/jd/merchantCert011.pfx
View File

Binary file not shown.