From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 5bfd4be..5052e81 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
@@ -45,6 +45,7 @@
import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
@@ -128,6 +129,9 @@
@Resource
private RedisManager redisManager;
+ @Resource
+ private LostOrderService lostOrderService;
+
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -163,6 +167,7 @@
/**
* 鍒╃敤redis鐨勫師瀛愭�у皢璁㈠崟鍙烽攣浣忥紝涓嶈鍏朵粬澶勭悊
+ *
* @param orderId
*/
private void redisLockOrder(String orderId) {
@@ -172,6 +177,7 @@
/**
* 璁㈠崟瑙ｉ攣
+ *
* @param orderId
*/
private void redisUnlockOrder(String orderId) {
@@ -181,6 +187,7 @@
/**
* 璁㈠崟鏄惁琚攣浣忎簡
+ *
* @param orderId
* @return
*/
@@ -202,12 +209,16 @@
try {
String orderId = its.next();
// 澶勭悊绾㈠寘涓庡瓙绾㈠寘
-// if (isRedisLockOrder(orderId))
-// continue;
-// redisLockOrder(orderId);
+ // if (isRedisLockOrder(orderId))
+ // continue;
+ // redisLockOrder(orderId);
processShopingFanliOrder(orderId, orders.get(orderId));
-// redisUnlockOrder(orderId);
+ // redisUnlockOrder(orderId);
// 鍑洪敊浜嗗氨涓嶅鐞嗚璁㈠崟浜嗭紝闇�瑕佸畾鏈熸鏌�
+
+ // 鏇存敼涓㈠け璁㈠崟鐨勭姸鎬�
+ lostOrderService.processSuceess(orderId);
+
} catch (HongBaoException e1) {
e1.printStackTrace();
} catch (OrderItemException e2) {
@@ -383,8 +394,13 @@
} else// 璁＄畻璁㈠崟鐨勬�婚噾棰�
{
BigDecimal money = new BigDecimal(0);
- for (TaoBaoOrder o : orderList)
- money = money.add(o.getPayment());
+ for (TaoBaoOrder o : orderList) {
+ if (o.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
+ money = money.add(o.getSettlement());
+ else {
+ money = money.add(o.getPayment());
+ }
+ }
updateOrder.setMoney(money);
String thirdState = null;
for (TaoBaoOrder o : orderList)
--
Gitblit v1.8.0