diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccTradeController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccTradeController.java index de38327..6ee0b93 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccTradeController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccTradeController.java @@ -3,8 +3,6 @@ package com.bonus.canteen.core.account.controller; import com.bonus.canteen.core.account.domain.AccountTrade; import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam; import com.bonus.canteen.core.account.service.IAccTradeService; -import com.bonus.canteen.core.report.domain.TradeFlowVO; -import com.bonus.canteen.core.report.service.TradeReportService; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -32,19 +30,6 @@ public class AccTradeController extends BaseController { @Autowired private IAccTradeService accTradeService; - @Autowired - private TradeReportService tradeReportService; - - @ApiOperation(value = "交易流水") - //@RequiresPermissions("health:info:list") - @GetMapping("/acct") - public TableDataInfo acct(TradeFlowVO param) { - startPage(); - List list = tradeReportService.selectTradeFlow(param); - System.out.println(list.size()); - return getDataTable(list); - } - /** * 查询账户交易记录列表 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java index f293771..50b03e7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java @@ -3,8 +3,6 @@ package com.bonus.canteen.core.health.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.bonus.canteen.core.report.domain.TradeFlowVO; -import com.bonus.canteen.core.report.service.TradeReportService; import com.bonus.common.log.enums.OperaType; //import com.bonus.canteen.core.health.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -12,14 +10,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.canteen.core.health.domain.HealthPersonInfo; import com.bonus.canteen.core.health.service.IHealthPersonInfoService; import com.bonus.common.core.web.controller.BaseController; @@ -40,9 +34,6 @@ public class HealthPersonInfoController extends BaseController { @Autowired private IHealthPersonInfoService healthPersonInfoService; - @Autowired - private TradeReportService tradeReportService; - /** * 查询人员健康情况列表 */ @@ -55,15 +46,6 @@ public class HealthPersonInfoController extends BaseController { List list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo); return getDataTable(list); } - @ApiOperation(value = "交易流水") - //@RequiresPermissions("health:info:list") - @GetMapping("/acct") - public TableDataInfo acct(TradeFlowVO param) { - startPage(); - List list = tradeReportService.selectTradeFlow(param); - System.out.println(list.size()); - return getDataTable(list); - } /** * 导出人员健康情况列表 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java index eb6abb9..dd5c774 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java @@ -8,7 +8,6 @@ import java.util.List; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; -import com.bonus.canteen.core.report.domain.TradeFlowVO; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.utils.SM4EncryptUtils; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/AccountReportController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/AccountReportController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java index ad7daf9..29aae83 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/AccountReportController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java @@ -1,9 +1,9 @@ -package com.bonus.canteen.core.report_bak.controller; +package com.bonus.canteen.core.report.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_bak.domain.*; -import com.bonus.canteen.core.report_bak.service.AccReportService; +import com.bonus.canteen.core.report.domain.*; +import com.bonus.canteen.core.report.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/controller/TradeReportController.java index 8b9d423..aafc34e 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/controller/TradeReportController.java @@ -1,7 +1,5 @@ package com.bonus.canteen.core.report.controller; -import com.bonus.canteen.core.health.domain.HealthPersonInfo; -import com.bonus.canteen.core.health.service.IHealthPersonInfoService; import com.bonus.canteen.core.report.domain.*; import com.bonus.canteen.core.report.service.TradeReportService; import com.bonus.common.core.web.controller.BaseController; @@ -9,34 +7,77 @@ import com.bonus.common.core.web.page.TableDataInfo; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; /** * 交易报表 - * - * @author jsk - * @date 2025-06-06 + * + * @author ruoyi + * @date 2025-04-14 */ @Controller -@RequestMapping("/reportTrade") +@RequestMapping("/report/trade") public class TradeReportController extends BaseController { @Autowired private TradeReportService tradeReportService; - - @Autowired - private IHealthPersonInfoService healthPersonInfoService; - - @ApiOperation(value = "交易流水") - //@RequiresPermissions("report:trade:flow") - @GetMapping("/list") - public TableDataInfo list(TradeFlowVO param) { + @ApiOperation("交易流水") + @PostMapping("/flow") + @ResponseBody + public TableDataInfo tradeFlowList(@RequestBody TradeFlowParam param) + { startPage(); List list = tradeReportService.selectTradeFlow(param); - System.out.println(list.size()); return getDataTable(list); } - + @ApiOperation("营业汇总") + @PostMapping("/revenue/operating") + @ResponseBody + public TableDataInfo selectOperatingRevenue(@RequestBody OperatingRevenueParam param) + { + startPage(); + List list = tradeReportService.selectOperatingRevenue(param); + return getDataTable(list); + } + @ApiOperation("食堂档口汇总") + @PostMapping("/revenue/canteen") + @ResponseBody + public TableDataInfo selectCanteenStallRevenue(@RequestBody CanteenStallRevenueParam param) + { + startPage(); + List list = tradeReportService.selectCanteenStallRevenue(param); + return getDataTable(list); + } + @ApiOperation("设备汇总") + @PostMapping("/revenue/device") + @ResponseBody + public TableDataInfo selectDeviceRevenue(@RequestBody DeviceRevenueParam param) + { + startPage(); + List list = tradeReportService.selectDeviceRevenue(param); + return getDataTable(list); + } + @ApiOperation("个人消费汇总") + @PostMapping("/revenue/user") + @ResponseBody + public TableDataInfo selectUserRevenue(@RequestBody UserRevenueParam param) + { + startPage(); + List list = tradeReportService.selectUserRevenue(param); + return getDataTable(list); + } + @ApiOperation("菜品销售汇总") + @PostMapping("/revenue/goods") + @ResponseBody + public TableDataInfo selectGoodsRevenue(@RequestBody GoodsRevenueParam param) + { + startPage(); + List list = tradeReportService.selectGoodsRevenue(param); + return getDataTable(list); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java index c7a9950..9e78906 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/CanteenStallRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java index 6951d2f..c1aaf1a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/CanteenStallRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java index eda71d0..dea7da5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/DeptIncomeOutcomeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java index 443adf1..db7c6c2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeptIncomeOutcomeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java index 470e338..d22f7a6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/DeviceRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java index 399eddc..3389726 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/DeviceRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java index 09c8b8f..e8f32af 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/GoodsRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java index 763d83b..286913b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/GoodsRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java index bc36858..1241940 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/OperatingRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java similarity index 88% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java index 826c0a6..da548bb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/OperatingRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java index c854940..9c16fe8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/RechargeRecordVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java index 115fbca..b8266df 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/RechargeRecordVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/TradeFlowParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java index 341a06e..e99701a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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/domain/TradeFlowVO.java index b504619..d0f1b5a 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/domain/TradeFlowVO.java @@ -1,17 +1,13 @@ package com.bonus.canteen.core.report.domain; -import com.bonus.common.core.web.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.List; @Data -public class TradeFlowVO extends BaseEntity { +public class TradeFlowVO implements Serializable { private Long userId; private String userName; private Integer userType; @@ -28,12 +24,4 @@ public class TradeFlowVO extends BaseEntity { private String createBy; private BigDecimal income; private BigDecimal outcome; - - private String searchValue; - private List deptIdList; - @ApiModelProperty("开始时间") - private String startDateTime; - @ApiModelProperty("结束时间") - private String endDateTime; - } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java index 2119b19..129b870 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/UserIncomeOutcomeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java similarity index 90% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java index b77c875..d6b5e83 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserIncomeOutcomeVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java index 001e363..724e1f2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/UserRevenueVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java similarity index 94% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java index d1190c6..85851d2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/UserRevenueVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java similarity index 93% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordParam.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java index 0185a1e..1199d90 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordParam.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.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_bak/domain/WithdrawRecordVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java similarity index 86% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordVO.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java index c387379..994daea 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/WithdrawRecordVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java @@ -1,4 +1,4 @@ -package com.bonus.canteen.core.report_bak.domain; +package com.bonus.canteen.core.report.domain; import lombok.Data; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/AccReportMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java similarity index 86% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/AccReportMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java index 911709b..8118660 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/AccReportMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java @@ -1,6 +1,6 @@ -package com.bonus.canteen.core.report_bak.mapper; +package com.bonus.canteen.core.report.mapper; -import com.bonus.canteen.core.report_bak.domain.*; +import com.bonus.canteen.core.report.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/mapper/TradeReportMapper.java index 1d70e0f..3ab5262 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/mapper/TradeReportMapper.java @@ -1,10 +1,17 @@ package com.bonus.canteen.core.report.mapper; -import com.bonus.canteen.core.report.domain.TradeFlowVO; +import com.bonus.canteen.core.report.domain.*; import org.apache.ibatis.annotations.Param; import java.util.List; public interface TradeReportMapper { - public List selectTradeFlow(@Param("param") TradeFlowVO param,@Param("encryptedSearchValue") String encryptedSearchValue); + public List selectTradeFlow(@Param("param")TradeFlowParam param, + @Param("encryptedSearchValue") String encryptedSearchValue); + public List selectOperatingRevenue(@Param("param") OperatingRevenueParam param); + public List selectCanteenStallRevenue(@Param("param")CanteenStallRevenueParam param); + public List selectDeviceRevenue(@Param("param")DeviceRevenueParam param); + public List selectUserRevenue(@Param("param")UserRevenueParam param, + @Param("encryptedSearchValue") String encryptedSearchValue); + public List selectGoodsRevenue(@Param("param")GoodsRevenueParam param); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/AccReportService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java similarity index 87% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/AccReportService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java index 8f788cf..3eb3c6f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/AccReportService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java @@ -1,8 +1,8 @@ -package com.bonus.canteen.core.report_bak.service; +package com.bonus.canteen.core.report.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_bak.domain.*; +import com.bonus.canteen.core.report.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/service/TradeReportService.java index 44f385e..0898897 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/service/TradeReportService.java @@ -1,10 +1,14 @@ package com.bonus.canteen.core.report.service; - -import com.bonus.canteen.core.report.domain.TradeFlowVO; +import com.bonus.canteen.core.report.domain.*; import java.util.List; public interface TradeReportService { - List selectTradeFlow(TradeFlowVO param); + List selectTradeFlow(TradeFlowParam param); + List selectOperatingRevenue(OperatingRevenueParam param); + List selectCanteenStallRevenue(CanteenStallRevenueParam param); + List selectDeviceRevenue(DeviceRevenueParam param); + List selectUserRevenue(UserRevenueParam param); + List selectGoodsRevenue(GoodsRevenueParam param); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/AccReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java similarity index 89% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/AccReportServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java index 4c0f079..00ad957 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/AccReportServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java @@ -1,12 +1,12 @@ -package com.bonus.canteen.core.report_bak.service.impl; +package com.bonus.canteen.core.report.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_bak.domain.*; -import com.bonus.canteen.core.report_bak.mapper.AccReportMapper; -import com.bonus.canteen.core.report_bak.service.AccReportService; +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.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/service/impl/TradeReportServiceImpl.java index a2df11d..7dd39db 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/service/impl/TradeReportServiceImpl.java @@ -1,7 +1,7 @@ package com.bonus.canteen.core.report.service.impl; import cn.hutool.core.collection.CollUtil; -import com.bonus.canteen.core.report.domain.TradeFlowVO; +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.common.houqin.utils.SM4EncryptUtils; @@ -16,9 +16,9 @@ public class TradeReportServiceImpl implements TradeReportService { TradeReportMapper tradeReportMapper; @Override - public List selectTradeFlow(TradeFlowVO param) { + public List selectTradeFlow(TradeFlowParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); - List tradeFlowVOList = tradeReportMapper.selectTradeFlow(param,encryptedSearchValue); + List tradeFlowVOList = tradeReportMapper.selectTradeFlow(param, encryptedSearchValue); if(CollUtil.isNotEmpty(tradeFlowVOList)) { for(TradeFlowVO vo : tradeFlowVOList) { vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber())); @@ -26,4 +26,29 @@ public class TradeReportServiceImpl implements TradeReportService { } return tradeFlowVOList; } + + @Override + public List selectOperatingRevenue(OperatingRevenueParam param) { + return tradeReportMapper.selectOperatingRevenue(param); + } + + @Override + public List selectCanteenStallRevenue(CanteenStallRevenueParam param) { + return tradeReportMapper.selectCanteenStallRevenue(param); + } + + @Override + public List selectDeviceRevenue(DeviceRevenueParam param) { + return tradeReportMapper.selectDeviceRevenue(param); + } + + @Override + public List selectUserRevenue(UserRevenueParam param) { + return tradeReportMapper.selectUserRevenue(param, SM4EncryptUtils.sm4Encrypt(param.getSearchValue())); + } + + @Override + public List selectGoodsRevenue(GoodsRevenueParam param) { + return tradeReportMapper.selectGoodsRevenue(param); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/TradeReportController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/TradeReportController.java deleted file mode 100644 index 8e0ed8f..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/controller/TradeReportController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.bonus.canteen.core.report_bak.controller; - -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; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; - -/** - * 交易报表 - * - * @author ruoyi - * @date 2025-04-14 - */ -@Controller -@RequestMapping("/report/trade") -public class TradeReportController extends BaseController -{ - @Autowired - private TradeReportService tradeReportService; - @ApiOperation("交易流水") - @PostMapping("/flow") - @ResponseBody - public TableDataInfo tradeFlowList(@RequestBody TradeFlowParam param) - { - startPage(); - List list = tradeReportService.selectTradeFlow(param); - return getDataTable(list); - } - @ApiOperation("营业汇总") - @PostMapping("/revenue/operating") - @ResponseBody - public TableDataInfo selectOperatingRevenue(@RequestBody OperatingRevenueParam param) - { - startPage(); - List list = tradeReportService.selectOperatingRevenue(param); - return getDataTable(list); - } - @ApiOperation("食堂档口汇总") - @PostMapping("/revenue/canteen") - @ResponseBody - public TableDataInfo selectCanteenStallRevenue(@RequestBody CanteenStallRevenueParam param) - { - startPage(); - List list = tradeReportService.selectCanteenStallRevenue(param); - return getDataTable(list); - } - @ApiOperation("设备汇总") - @PostMapping("/revenue/device") - @ResponseBody - public TableDataInfo selectDeviceRevenue(@RequestBody DeviceRevenueParam param) - { - startPage(); - List list = tradeReportService.selectDeviceRevenue(param); - return getDataTable(list); - } - @ApiOperation("个人消费汇总") - @PostMapping("/revenue/user") - @ResponseBody - public TableDataInfo selectUserRevenue(@RequestBody UserRevenueParam param) - { - startPage(); - List list = tradeReportService.selectUserRevenue(param); - return getDataTable(list); - } - @ApiOperation("菜品销售汇总") - @PostMapping("/revenue/goods") - @ResponseBody - public TableDataInfo selectGoodsRevenue(@RequestBody GoodsRevenueParam param) - { - startPage(); - List list = tradeReportService.selectGoodsRevenue(param); - return getDataTable(list); - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowVO.java deleted file mode 100644 index 5fadaca..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/domain/TradeFlowVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.bonus.canteen.core.report_bak.domain; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Data -public class TradeFlowVO implements Serializable { - private Long userId; - private String userName; - private Integer userType; - private String phonenumber; - private Long deptId; - private String deptName; - private String deptFullName; - private BigDecimal accountAllBal; - private LocalDateTime tradeTime; - private Integer tradeType; - private Integer payType; - private String machineSn; - private String deviceName; - private String createBy; - private BigDecimal income; - private BigDecimal outcome; -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/TradeReportMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/TradeReportMapper.java deleted file mode 100644 index 07b6d9b..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/mapper/TradeReportMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bonus.canteen.core.report_bak.mapper; - -import com.bonus.canteen.core.report_bak.domain.*; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TradeReportMapper { - public List selectTradeFlow(@Param("param")TradeFlowParam param, - @Param("encryptedSearchValue") String encryptedSearchValue); - public List selectOperatingRevenue(@Param("param") OperatingRevenueParam param); - public List selectCanteenStallRevenue(@Param("param")CanteenStallRevenueParam param); - public List selectDeviceRevenue(@Param("param")DeviceRevenueParam param); - public List selectUserRevenue(@Param("param")UserRevenueParam param, - @Param("encryptedSearchValue") String encryptedSearchValue); - public List selectGoodsRevenue(@Param("param")GoodsRevenueParam param); -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/TradeReportService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/TradeReportService.java deleted file mode 100644 index bc311af..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/TradeReportService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.bonus.canteen.core.report_bak.service; - -import com.bonus.canteen.core.report_bak.domain.*; - -import java.util.List; - -public interface TradeReportService { - List selectTradeFlow(TradeFlowParam param); - List selectOperatingRevenue(OperatingRevenueParam param); - List selectCanteenStallRevenue(CanteenStallRevenueParam param); - List selectDeviceRevenue(DeviceRevenueParam param); - List selectUserRevenue(UserRevenueParam param); - List selectGoodsRevenue(GoodsRevenueParam param); -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/TradeReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/TradeReportServiceImpl.java deleted file mode 100644 index 7994347..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report_bak/service/impl/TradeReportServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.bonus.canteen.core.report_bak.service.impl; - -import cn.hutool.core.collection.CollUtil; -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; - -import javax.annotation.Resource; -import java.util.List; - -@Service -public class TradeReportServiceImpl implements TradeReportService { - @Resource - TradeReportMapper tradeReportMapper; - - @Override - public List selectTradeFlow(TradeFlowParam param) { - String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); - List tradeFlowVOList = tradeReportMapper.selectTradeFlow(param, encryptedSearchValue); - if(CollUtil.isNotEmpty(tradeFlowVOList)) { - for(TradeFlowVO vo : tradeFlowVOList) { - vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber())); - } - } - return tradeFlowVOList; - } - - @Override - public List selectOperatingRevenue(OperatingRevenueParam param) { - return tradeReportMapper.selectOperatingRevenue(param); - } - - @Override - public List selectCanteenStallRevenue(CanteenStallRevenueParam param) { - return tradeReportMapper.selectCanteenStallRevenue(param); - } - - @Override - public List selectDeviceRevenue(DeviceRevenueParam param) { - return tradeReportMapper.selectDeviceRevenue(param); - } - - @Override - public List selectUserRevenue(UserRevenueParam param) { - return tradeReportMapper.selectUserRevenue(param, SM4EncryptUtils.sm4Encrypt(param.getSearchValue())); - } - - @Override - public List selectGoodsRevenue(GoodsRevenueParam param) { - return tradeReportMapper.selectGoodsRevenue(param); - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/AccReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml similarity index 96% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/AccReportMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml index 1cccf1d..8aac765 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/AccReportMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/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/TradeReportMapper.xml index 18d5fa2..feca862 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/TradeReportMapper.xml @@ -54,5 +54,342 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by at2.trade_time desc + + - + + + + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/TradeReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/TradeReportMapper.xml deleted file mode 100644 index 5fcde0a..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report_bak/TradeReportMapper.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file