邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java

@@ -83,14 +83,17 @@
      

      try {

         if (slotTime != null) {

            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

             endTime= sd.format(new Date());

             startTime = convertDate(slotTime, endTime);

            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");

            endTime= sd.format(new Date());

            startTime = convertDate(slotTime, endTime);

         }

      } catch (Exception e) {

         e.printStackTrace();

      }

      

      if (endTime != null && endTime.trim().length() > 0) {

         endTime += " 23:59:59";

      }

      

      try {

         long count = 0;

@@ -99,6 +102,7 @@
         int totalInvite = 0;

         long todayTotal = 0;

         BigDecimal todayMoney = null;

			
         

         // 查询列表

         List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,

@@ -116,6 +120,7 @@
            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);

            

            todayTotal =  commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);

				
            

            // 统计有效的订单数量 、 失效订单数量 、维权订单数量

            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, 

@@ -313,7 +318,6 @@
            Object totalmoney = shareMap.get("totalmoney");

            if (totalmoney != null) {

               sharemoney = (BigDecimal) totalmoney;

               sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);

            }

         }

         

@@ -327,17 +331,16 @@
            

            Object totalmoney = inviteMap.get("totalmoney");

            if (totalmoney != null) {

               sharemoney = (BigDecimal) totalmoney;

               inviteMoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);

               inviteMoney = (BigDecimal) totalmoney;

            }

         }

         

         

         JSONObject data = new JSONObject();

         data.put("shareCount", shareCount);

         data.put("sharemoney", sharemoney);

         data.put("sharemoney",  sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         data.put("inviteCount", inviteCount);

         data.put("inviteMoney", inviteMoney);

         data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         

         data.put("showTiCheng", hongBaoV2CountService.getTotalTiChengCount(uid) > 0);

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

@@ -361,22 +364,22 @@
      

      switch (slotTime) {

         case 1: // 最近三天

            startTime = DateUtil.reduceDay(3, endTime);

            startTime = DateUtil.reduceDay(2, endTime);

            break;

         case 2: // 最近七天

            startTime = DateUtil.reduceDay(7, endTime);

            startTime = DateUtil.reduceDay(6, endTime);

            break;

         case 3: // 最近15天 （半月）

            startTime = DateUtil.reduceDay(15, endTime);

            startTime = DateUtil.reduceDay(14, endTime);

            break;

         case 4: // 最近三十天 （本月）

            startTime = DateUtil.reduceDay(30, endTime);

            startTime = DateUtil.reduceDay(29, endTime);

            break;

         case 5: // 最近九十天（近三月）

            startTime = DateUtil.reduceDay(3*30, endTime);

            startTime = DateUtil.reduceDay(3*30-1, endTime);

            break;

         case 6: // 最近一百八十天（近半年）

            startTime = DateUtil.reduceDay(6*30, endTime);

            startTime = DateUtil.reduceDay(6*30-1, endTime);

            break;

         default:

            break;