Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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);

                           // 加入到LostOrder

                           LostOrder lo = new LostOrder();

                           lo.setCreateTime(System.currentTimeMillis());