diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/AccountReportController.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/AccountReportController.java index 29aae83..ad7daf9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/AccountReportController.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.core.report.controller; +package com.bonus.canteen.core.report_bak.controller; import com.bonus.canteen.core.account.domain.param.AccountInfoQueryParam; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; -import com.bonus.canteen.core.report.domain.*; -import com.bonus.canteen.core.report.service.AccReportService; +import com.bonus.canteen.core.report_bak.domain.*; +import com.bonus.canteen.core.report_bak.service.AccReportService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import io.swagger.annotations.ApiOperation; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/TradeReportController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/TradeReportController.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/TradeReportController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/TradeReportController.java index aafc34e..8e0ed8f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/TradeReportController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/TradeReportController.java @@ -1,7 +1,7 @@ -package com.bonus.canteen.core.report.controller; +package com.bonus.canteen.core.report_bak.controller; -import com.bonus.canteen.core.report.domain.*; -import com.bonus.canteen.core.report.service.TradeReportService; +import com.bonus.canteen.core.report_bak.domain.*; +import com.bonus.canteen.core.report_bak.service.TradeReportService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import io.swagger.annotations.ApiOperation; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueParam.java index 9e78906..c7a9950 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueVO.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueVO.java index c1aaf1a..6951d2f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeParam.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeParam.java index dea7da5..eda71d0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeVO.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeVO.java index db7c6c2..443adf1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueParam.java index d22f7a6..470e338 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueVO.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueVO.java index 3389726..399eddc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueParam.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueParam.java index e8f32af..09c8b8f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueVO.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueVO.java index 286913b..763d83b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueParam.java index 1241940..bc36858 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueVO.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueVO.java index da548bb..826c0a6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordParam.java index 9c16fe8..c854940 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordVO.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordVO.java index b8266df..115fbca 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowParam.java index e99701a..341a06e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowVO.java similarity index 92% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowVO.java index d0f1b5a..5fadaca 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeParam.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeParam.java index 129b870..2119b19 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeVO.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeVO.java index d6b5e83..b77c875 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueParam.java index 724e1f2..001e363 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueVO.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueVO.java index 85851d2..d1190c6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordParam.java index 1199d90..0185a1e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordVO.java similarity index 86% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordVO.java index 994daea..c387379 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report.domain; +package com.bonus.canteen.core.report_bak.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/AccReportMapper.java similarity index 86% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/AccReportMapper.java index 8118660..911709b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/AccReportMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.core.report.mapper; +package com.bonus.canteen.core.report_bak.mapper; -import com.bonus.canteen.core.report.domain.*; +import com.bonus.canteen.core.report_bak.domain.*; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/TradeReportMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/TradeReportMapper.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/TradeReportMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/TradeReportMapper.java index 3ab5262..07b6d9b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/TradeReportMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/TradeReportMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.core.report.mapper; +package com.bonus.canteen.core.report_bak.mapper; -import com.bonus.canteen.core.report.domain.*; +import com.bonus.canteen.core.report_bak.domain.*; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/AccReportService.java similarity index 87% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/AccReportService.java index 3eb3c6f..8f788cf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/AccReportService.java @@ -1,8 +1,8 @@ -package com.bonus.canteen.core.report.service; +package com.bonus.canteen.core.report_bak.service; import com.bonus.canteen.core.account.domain.param.AccountInfoQueryParam; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; -import com.bonus.canteen.core.report.domain.*; +import com.bonus.canteen.core.report_bak.domain.*; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/TradeReportService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/TradeReportService.java similarity index 83% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/TradeReportService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/TradeReportService.java index 0898897..bc311af 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/TradeReportService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/TradeReportService.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.core.report.service; +package com.bonus.canteen.core.report_bak.service; -import com.bonus.canteen.core.report.domain.*; +import com.bonus.canteen.core.report_bak.domain.*; import java.util.List; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/AccReportServiceImpl.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/AccReportServiceImpl.java index 00ad957..4c0f079 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/AccReportServiceImpl.java @@ -1,12 +1,12 @@ -package com.bonus.canteen.core.report.service.impl; +package com.bonus.canteen.core.report_bak.service.impl; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.account.domain.param.AccountInfoQueryParam; import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO; import com.bonus.canteen.core.account.service.IAccInfoService; -import com.bonus.canteen.core.report.domain.*; -import com.bonus.canteen.core.report.mapper.AccReportMapper; -import com.bonus.canteen.core.report.service.AccReportService; +import com.bonus.canteen.core.report_bak.domain.*; +import com.bonus.canteen.core.report_bak.mapper.AccReportMapper; +import com.bonus.canteen.core.report_bak.service.AccReportService; import com.bonus.common.houqin.utils.SM4EncryptUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/TradeReportServiceImpl.java similarity index 87% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/TradeReportServiceImpl.java index 7dd39db..7994347 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/TradeReportServiceImpl.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.core.report.service.impl; +package com.bonus.canteen.core.report_bak.service.impl; import cn.hutool.core.collection.CollUtil; -import com.bonus.canteen.core.report.domain.*; -import com.bonus.canteen.core.report.mapper.TradeReportMapper; -import com.bonus.canteen.core.report.service.TradeReportService; +import com.bonus.canteen.core.report_bak.domain.*; +import com.bonus.canteen.core.report_bak.mapper.TradeReportMapper; +import com.bonus.canteen.core.report_bak.service.TradeReportService; import com.bonus.common.houqin.utils.SM4EncryptUtils; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/AccReportMapper.xml similarity index 96% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/AccReportMapper.xml index 8aac765..1cccf1d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/AccReportMapper.xml @@ -2,8 +2,8 @@ - - select DATE_FORMAT(atwd.trade_time , '%Y-%m-%d') AS statistic_date, count(IF(atwd.trade_type = 10, 1, NULL)) AS recharge_num, @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" statistic_date desc - select atwd.user_id, su.nick_name, @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by user_id - SELECT c.dept_id, c.dept_name, @@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by c.dept_id - SELECT b.user_id, b.phonenumber, diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/TradeReportMapper.xml similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/TradeReportMapper.xml index 307a8a6..5fcde0a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/TradeReportMapper.xml @@ -2,8 +2,8 @@ - - select su.user_id, su.user_name, @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by at2.trade_time desc - select count(distinct oi.user_id) as user_count, count(oi.order_id) as order_count, @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select oi.canteen_id, oi.stall_id, @@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oi.stall_id - select di.device_number, di.device_sn, @@ -245,7 +245,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oi.device_num - select oi.user_id, su.nick_name, @@ -321,7 +321,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oi.user_id - select od.goods_id, od.goods_name,