From 634a8abd408e87e58b4b8e9f52ddf309b43652d0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 十月 2019 12:42:32 +0800
Subject: [PATCH] 修改配置文件 添加系统券返利到账订阅
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 7816223..99052bb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -391,10 +391,29 @@
return;
}
+ // 鏌ヨ璇ヨ鍗曚箣鍓嶆槸鍚︽湁鍒拌处
+ List<HongBaoOrder> list = hongBaoOrderMapper.listByOrderIdAndSourceType(
+ hongBaoOrder.getCommonOrder().getOrderNo(), hongBaoOrder.getCommonOrder().getSourceType());
+ List<Long> hongBaoIdList = new ArrayList<>();
+ if (list != null) {
+ for (HongBaoOrder ho : list) {
+ hongBaoIdList.add(ho.getHongBaoV2().getId());
+ }
+ }
+
+ List<HongBaoV2> allHongBaoList = hongBaoV2Mapper.listByIds(hongBaoIdList);
+ boolean first = true;
+ for (HongBaoV2 v2 : allHongBaoList)
+ if (v2.getState() == HongBaoV2.STATE_YILINGQU) {
+ first = false;
+ break;
+ }
+
// 鑷喘鍒拌处浜嬪姟娑堟伅
OrderMoneyRecievedMQMsgDTO mqMsg = new OrderMoneyRecievedMQMsgDTO(OrderMoneyRecievedMQMsgDTO.TYPE_ZIGOU,
mainUser.getId(), hongBaoOrder.getCommonOrder().getSourceType(),
hongBaoOrder.getCommonOrder().getOrderNo(), null, new Date());
+ mqMsg.setOrderFirst(first);
Message msg = new Message(MQTopicName.TOPIC_FANLI.name(), "actual", new Gson().toJson(mqMsg).getBytes());
String key = mainUser.getId() + "-" + UUID.randomUUID().toString();
msg.setKey(key);
@@ -503,7 +522,7 @@
} catch (OrderMoneySettleException e) {
e.printStackTrace();
}
- if(1>0)
+ if (1 > 0)
return;
try {
@@ -1182,7 +1201,7 @@
Message msg = new Message(MQTopicName.TOPIC_ORDER.name(),
String.format(MQTagConstant.TAG_ORDER_STATISTIC_PREFIX + "%s-%s", sourceType, hongBaoType),
new Gson().toJson(mqMsg).getBytes());
- SendResult result= orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
+ SendResult result = orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
@Override
public TransactionStatus execute(Message arg0, Object arg1) {
int resultCode = 0;
@@ -1196,10 +1215,10 @@
}
}
return TransactionStatus.CommitTransaction;
-// if (resultCode != 0)
-// return TransactionStatus.CommitTransaction;
-// else
-// return TransactionStatus.RollbackTransaction;
+ // if (resultCode != 0)
+ // return TransactionStatus.CommitTransaction;
+ // else
+ // return TransactionStatus.RollbackTransaction;
}
}, null);
System.out.println(result);
--
Gitblit v1.8.0