yujian
2020-06-15 3579201658f94480a8421507c24d2ece83dbf0c7
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -447,30 +447,51 @@
   
   @RequestMapping(value = "countOrderInfo")
   public void countOrderInfo(String callback, Long uid, PrintWriter out) {
      JSONObject data = new JSONObject();
      /* ---------  本月累计 ------------*/
      JSONObject month = new JSONObject();
      // 自购已到账
      long selfNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, null, 1);
      month.put("selfNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 1, 1));
      // 分享已到账
      long shareNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, null, 2);
      month.put("shareNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 2, 1));
      // 邀请已到账
      month.put("inviteNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 3, 1));
      // 自购未到账
      long selfNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, null, 1);
      month.put("selfNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 1, 1));
      // 分享未到账
      long shareNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, null, 2);
      month.put("shareNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 2, 1));
      // 邀请未到账
      month.put("inviteNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 3, 1));
      data.put("month", month);
      
      
      /* ---------  历史累计 ------------*/
      JSONObject history = new JSONObject();
      // 自购已到账
      history.put("selfNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 1, null));
      // 分享已到账
      history.put("shareNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 2, null));
      // 邀请已到账
      history.put("inviteNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 3, null));
      // 自购未到账
      history.put("selfNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 1, null));
      // 分享未到账
      history.put("shareNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 2, null));
      // 邀请未到账
      history.put("inviteNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 3, null));
      data.put("history", history);
      /* ---------  付款金额大于1 ------------*/
      // 自购已到账
      long selfAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
      // 分享已到账
      long shareAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
      // 自购未到账
      long selfAccount = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1);
      long selfAccount = hongBaoV2CountService.countOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1, null);
      // 分享未到账
      long shareAccount = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2);
      JSONObject data = new JSONObject();
      data.put("selfNumEnd", selfNumEnd);
      data.put("shareNumEnd", shareNumEnd);
      data.put("selfNum", selfNum);
      data.put("shareNum", shareNum);
      long shareAccount = hongBaoV2CountService.countOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2, null);
      data.put("selfAccountEnd", selfAccountEnd);
      data.put("shareAccountEnd", shareAccountEnd);
      data.put("selfAccount", selfAccount);