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

admin

2020-05-21 49ed4f4521ce433a14810a0119bf3f2f7f6e606a

 fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java

@@ -429,10 +429,6 @@
   }

   

	
	

   @RequestMapping(value = "uploadTaoBaoWeiQuanOrder")
   public void uploadWeiQuanOrder(String callback, HttpServletRequest request, PrintWriter out) {
      try {
@@ -453,5 +449,25 @@
   }
   
    
   @RequestMapping(value = "countOrderInfo")
   public void countOrderInfo(String callback, Long uid, PrintWriter out) {
      // 自购已到账
      long selfNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
      // 分享已到账
      long shareNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
		
      // 自购未到账
      long selfNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1);
      // 分享未到账
      long shareNum = 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("description", shareNum);
      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
   }
	

}