From a8c566a3b274058fe31feaf8e980b2334b9bf83a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 14:22:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 5 ++++-
1 files changed, 4 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 8976440..91110aa 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
@@ -112,6 +112,9 @@
String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,
PrintWriter out) {
+ if (Constant.IS_TEST)
+ uid = 389677L;
+
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -495,7 +498,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