后台订单、用户信息调整

yujian

2019-01-12 42b206d89cf0a6f4c2bb2567d867d7c479d6edf1

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

@@ -113,20 +113,9 @@
         // 需要统计筛选信息 ：未失效的总金额 以及订单

         if (needCount && page == 1) {

            

            Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, type,

                  dateType, startTime, endTime);

            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);

            

            if (shareMap != null) {

               Object totalNum = shareMap.get("totalNum");

               if (totalNum != null) {

                  todayTotal = (long) totalNum;

               }

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

               if (totalmoney != null) {

                  todayMoney = (BigDecimal) totalmoney;

               }

            }

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

            

            

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

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

            if (totalmoney != null) {

               sharemoney = (BigDecimal) totalmoney;

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

            }

         }

         

@@ -339,17 +327,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));