Merge branch 'developer' into alpha

Helius

2022-03-14 938d37e96dc00f8fc3c7036d818e87d51624e0a9

 zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java

@@ -154,6 +154,10 @@
                            return tjVipSumDao.selectProjConsumeCnt(timeSpaceParam, shopId, null);
                        case "20" :
                            return tjVipSumDao.selectTimeLength(timeSpaceParam, shopId, null);
                        case "21" :
                            return tjVipSumDao.selectCardAmount(timeSpaceParam, shopId, null);
                        case "22" :
                            return tjVipSumDao.selectFreeAmount(timeSpaceParam, shopId, null);
                        default :
                            return tjVipSumDao.selectBusinessInCome(timeSpaceParam, shopId, null);
                    }
@@ -205,6 +209,10 @@
                            return tjVipSumDao.selectProjConsumeCnt(timeSpaceParam, null, companyId);
                        case "20" :
                            return tjVipSumDao.selectTimeLength(timeSpaceParam, null, companyId);
                        case "21" :
                            return tjVipSumDao.selectCardAmount(timeSpaceParam, null, companyId);
                        case "22" :
                            return tjVipSumDao.selectFreeAmount(timeSpaceParam, null, companyId);
                        default :
                            return tjVipSumDao.selectBusinessInCome(timeSpaceParam, null, companyId);
                    }