From ebb3551170b255defc25fe93bbf6eb1e84cd321d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 29 十一月 2018 17:46:47 +0800
Subject: [PATCH] 清理多余引用
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
index 274515f..b25417e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
@@ -89,6 +89,9 @@
@Resource
private RedisManager redisManager;
+ // @Resource
+ // private LostOrderService lostOrderService;
+
@Override
@Transactional
public void addPidOrderFromTaoBao(Map<String, List<PidOrder>> map) {
@@ -201,11 +204,13 @@
while (its.hasNext()) {
String orderId = its.next();
// 璁㈠崟閿佸畾
-// if (isRedisLockOrder(orderId))
-// continue;
-// redisLockOrder(orderId);
+ // if (isRedisLockOrder(orderId))
+ // continue;
+ // redisLockOrder(orderId);
doPidOrder(orderId);
-// redisUnlockOrder(orderId);
+ // 澶勭悊璁㈠崟鎵惧洖
+ // lostOrderService.processSuceess(orderId);
+ // redisUnlockOrder(orderId);
}
}
@@ -267,7 +272,10 @@
HongBao.TYPE_SHARE_GOODS, HongBao.STATE_BUKELINGQU, new Date().getTime(),
new Date().getTime(), 0, "192.168.1.1", "绯荤粺娣诲姞");
hongBao.setOrderId(order.getOrderId());
- hongBao.setPayMoney(order.getPayMoney());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(order.getState()))
+ hongBao.setPayMoney(order.getFinalMoney());
+ else
+ hongBao.setPayMoney(order.getPayMoney());
if (order.getBalanceTime() != null)
hongBao.setBalanceTime(order.getBalanceTime());
--
Gitblit v1.8.0