From 449e58e820a51054b9f98ae48e4412dc18f036b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 14:25:47 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index 9950a2f..6137af1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -639,7 +639,7 @@
 							try {
 								isS = orderService.addOrder(or);
 								if (isS) {
-									CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
+									CMQManager.getInstance().addTaoBaoOrderMsg(order);
 									// 鍔犲叆鍒癓ostOrder
 									LostOrder lo = new LostOrder();
 									lo.setCreateTime(System.currentTimeMillis());

--
Gitblit v1.8.0