yujian
2019-01-11 92ae99aa5c1915bc0f8402ddc0a97ca5957c554d
订单接口优化
1个文件已修改
18 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -83,7 +83,7 @@
        
        try {
            if (slotTime != null) {
                SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
                 endTime= sd.format(new Date());
                 startTime = convertDate(slotTime, endTime);
            }
@@ -113,9 +113,21 @@
            // 需要统计筛选信息 :未失效的总金额 以及订单
            if (needCount && page == 1) {
                
                todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
                Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, type,
                        dateType, startTime, endTime);
                
                todayTotal =  commonOrderService.countBonusOrderNumber(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;
                    }
                }
                
                // 统计有效的订单数量 、 失效订单数量 、维权订单数量
                Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,