Merge branch 'div1'

yujian

2019-01-08 a79be5c75d4409bd14a36b648c1a398b409cad65

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

@@ -105,8 +105,9 @@
            // 统计总数

            count = commonOrderService.countGroupOrderNoByUid(uid,  state, type, orderState, orderNo, 

                  startTime, endTime, dateType);

         }

            

            // 需要统计信息

         // 需要统计筛选信息 ：未失效的总金额 以及订单

            if (needCount && page == 1) {

               Map<String, Object> countMap = commonOrderService.countMoneyGroupOrderNoByUid(uid, type,

                     orderNo, startTime, endTime, dateType);

@@ -120,7 +121,7 @@
                  todayTotal  = (long) countMap.get("totalRow");

               }

            }

         }

			
         

         int totalValid = 0;

         int totalProces = 0;