Merge remote-tracking branch 'origin/div' into div

admin

2019-11-29 32f8ab2806fb088335e24983477f5179064ada9d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -167,15 +167,14 @@
         data.put("count", count);

         data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));

         data.put("helpUrl", configService.get("order_list_help"));

         data.put("validMoney", validMoney);

         data.put("invalidMoney", invalidMoney);

         data.put("validMoney", "¥" + validMoney);

         data.put("invalidMoney", "¥" + invalidMoney);

         data.put("findOrderHelpUrl", orderFindUrl);

         out.print(JsonUtil.loadTrueResult(data));

      } catch (CommonOrderException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult(1, "查询失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }

@@ -228,11 +227,11 @@
    */

   @RequestMapping(value = "getOrderCount", method = RequestMethod.POST)

   public void getOrderCount(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {

      if (uid == null || type == null) {

      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "请求参数不正确"));

         return;

      }



		
      try {

         UserInfo user = userInfoService.selectByPKey(uid);

         if (user == null) {

@@ -248,9 +247,9 @@
         }

         JSONObject data = new JSONObject();

         data.put("userInfo", userInfo);



         if (type == 0) {

            OrderCountVO total = commonOrderService.getOrderCount(uid, 1, type);

			
         if (type == null || type == 0) {

            OrderCountVO total = commonOrderService.getOrderCount(uid, null, type);

            data.put("total", total.getSelf() + total.getShared() + total.getInvite());

            data.put("self", total.getSelf());

            data.put("shared", total.getShared());