yujian
2020-05-21 1e1ae4f19489644c9ff35125d075a30f89536d16
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -802,13 +802,12 @@
    *    type 类型:0全部、1淘宝 2京东、拼多多
    * @param out
    */
   @RequestMapping(value = "teamOrderSearch", method = RequestMethod.POST)
   @RequestMapping(value = "teamOrderSearch")
   public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, String key, PrintWriter out) {
      if (uid == null) {
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));
         return;
      }
      
      List<TeamOrderVO> resultList = new ArrayList<>();
      if (StringUtil.isNullOrEmpty(key)) {
@@ -917,6 +916,14 @@
                        }
                     }
                  }
                  String orderTime = "下单" + teamVO.getDownTime() ;
                  if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {
                     orderTime += "\n收货" + teamVO.getSettleTime();
                  }
                  if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {
                     orderTime += "\n售后" + teamVO.getServiceTime();
                  }
                  teamVO.setOrderTime(orderTime);
                  map.put(mapKey, teamVO);
               }