From af3432fd7b5734ba4199f15b942bb7b060205b84 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 30 May 2025 13:48:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AccountReportController.java | 86 ++++ .../controller/TradeReportController.java | 83 ++++ .../domain/CanteenStallRevenueParam.java | 25 ++ .../report/domain/CanteenStallRevenueVO.java | 28 ++ .../report/domain/DeptIncomeOutcomeParam.java | 26 ++ .../report/domain/DeptIncomeOutcomeVO.java | 19 + .../report/domain/DeviceRevenueParam.java | 26 ++ .../core/report/domain/DeviceRevenueVO.java | 28 ++ .../core/report/domain/GoodsRevenueParam.java | 28 ++ .../core/report/domain/GoodsRevenueVO.java | 25 ++ .../report/domain/OperatingRevenueParam.java | 25 ++ .../report/domain/OperatingRevenueVO.java | 17 + .../report/domain/RechargeRecordParam.java | 24 ++ .../core/report/domain/RechargeRecordVO.java | 20 + .../core/report/domain/TradeFlowParam.java | 26 ++ .../core/report/domain/TradeFlowVO.java | 27 ++ .../report/domain/UserIncomeOutcomeParam.java | 27 ++ .../report/domain/UserIncomeOutcomeVO.java | 21 + .../core/report/domain/UserRevenueParam.java | 26 ++ .../core/report/domain/UserRevenueVO.java | 28 ++ .../report/domain/WithdrawRecordParam.java | 25 ++ .../core/report/domain/WithdrawRecordVO.java | 16 + .../core/report/mapper/AccReportMapper.java | 14 + .../core/report/mapper/TradeReportMapper.java | 17 + .../core/report/service/AccReportService.java | 16 + .../report/service/TradeReportService.java | 14 + .../service/impl/AccReportServiceImpl.java | 59 +++ .../service/impl/TradeReportServiceImpl.java | 54 +++ .../mapper/report/AccReportMapper.xml | 254 +++++++++++ .../mapper/report/TradeReportMapper.xml | 395 ++++++++++++++++++ 30 files changed, 1479 insertions(+) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/TradeReportController.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/TradeReportMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/TradeReportService.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml 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/controller/AccountReportController.java new file mode 100644 index 0000000..29aae83 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/AccountReportController.java @@ -0,0 +1,86 @@ +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.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; +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/acc") +public class AccountReportController extends BaseController +{ + @Autowired + private AccReportService accReportService; + + @ApiOperation("查询交易流水") + @PostMapping("/balance") + @ResponseBody + public TableDataInfo balanceList(@RequestBody AccountInfoQueryParam accountInfoQueryParam) + { + startPage(); + List list = accReportService.balanceList(accountInfoQueryParam); + return getDataTable(list); + } + +// @ApiOperation("账户余额汇总") +// @PostMapping({"/balance/sum"}) +// public AjaxResult queryAccInfoBalanceSum(@RequestBody AccountInfoQueryParam accountInfoQueryParam) { +// return AjaxResult.success(this.accReportService.balanceListSum(accountInfoQueryParam)); +// } + @ApiOperation("充值方式汇总") + @PostMapping("/recharge") + @ResponseBody + public TableDataInfo rechargeCount(@RequestBody RechargeRecordParam param) + { + startPage(); + List list = accReportService.rechargeCount(param); + return getDataTable(list); + } + + @ApiOperation("取款汇总") + @PostMapping("/withdraw") + @ResponseBody + public TableDataInfo withdrawCount(@RequestBody WithdrawRecordParam param) + { + startPage(); + List list = accReportService.selectWithdrawRecord(param); + return getDataTable(list); + } + + @ApiOperation("组织收支汇总") + @PostMapping("/dept/income-outcome") + @ResponseBody + public TableDataInfo deptIncomeOutcome(@RequestBody DeptIncomeOutcomeParam param) + { + startPage(); + List list = accReportService.selectDeptIncomeOutcome(param); + return getDataTable(list); + } + + @ApiOperation("个人收支汇总") + @PostMapping("/user/income-outcome") + @ResponseBody + public TableDataInfo userIncomeOutcome(@RequestBody UserIncomeOutcomeParam param) + { + startPage(); + List list = accReportService.selectUserIncomeOutcome(param); + return getDataTable(list); + } +} 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 new file mode 100644 index 0000000..aafc34e --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/TradeReportController.java @@ -0,0 +1,83 @@ +package com.bonus.canteen.core.report.controller; + +import com.bonus.canteen.core.report.domain.*; +import com.bonus.canteen.core.report.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/domain/CanteenStallRevenueParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java new file mode 100644 index 0000000..9e78906 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueParam.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class CanteenStallRevenueParam implements Serializable { + private List deptIdList; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + public CanteenStallRevenueParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } +} 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/domain/CanteenStallRevenueVO.java new file mode 100644 index 0000000..c1aaf1a --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/CanteenStallRevenueVO.java @@ -0,0 +1,28 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class CanteenStallRevenueVO implements Serializable { + private Long canteenId; + private Long stallId; + private String canteenAndStallName; + private int breakfastUserCount; + private int breakfastOrderCount; + private BigDecimal breakfastConsumeCount; + private int lunchUserCount; + private int lunchOrderCount; + private BigDecimal lunchConsumeCount; + private int afternoonTeaUserCount; + private int afternoonTeaOrderCount; + private BigDecimal afternoonTeaConsumeCount; + private int dinnerUserCount; + private int dinnerOrderCount; + private BigDecimal dinnerConsumeCount; + private int midnightSnackUserCount; + private int midnightSnackOrderCount; + private BigDecimal midnightSnackConsumeCount; +} 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/domain/DeptIncomeOutcomeParam.java new file mode 100644 index 0000000..dea7da5 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeParam.java @@ -0,0 +1,26 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + +@Data +public class DeptIncomeOutcomeParam implements Serializable { + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + private List deptIdList; + + public DeptIncomeOutcomeParam() { + this.endDateTime = LocalDateTime.now().plusDays(7).with(LocalTime.MAX); + this.startDateTime = LocalDateTime.now().minusDays(7).with(LocalTime.MIN); + } +} 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/domain/DeptIncomeOutcomeVO.java new file mode 100644 index 0000000..db7c6c2 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java @@ -0,0 +1,19 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class DeptIncomeOutcomeVO implements Serializable { + private Long deptId; + private String deptName; + private String deptFullName; + private BigDecimal walletBal; + private BigDecimal income; + private BigDecimal outcome; + private BigDecimal lastWalletBal; + private BigDecimal otherIncome; + private BigDecimal otherOutcome; +} 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/domain/DeviceRevenueParam.java new file mode 100644 index 0000000..d22f7a6 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueParam.java @@ -0,0 +1,26 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class DeviceRevenueParam implements Serializable { + private List deptIdList; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + private String searchValue; + + public DeviceRevenueParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } +} 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/domain/DeviceRevenueVO.java new file mode 100644 index 0000000..3389726 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeviceRevenueVO.java @@ -0,0 +1,28 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class DeviceRevenueVO implements Serializable { + private String deviceNumber; + private String deviceSn; + private String deviceName; + private int breakfastUserCount; + private int breakfastOrderCount; + private BigDecimal breakfastConsumeCount; + private int lunchUserCount; + private int lunchOrderCount; + private BigDecimal lunchConsumeCount; + private int afternoonTeaUserCount; + private int afternoonTeaOrderCount; + private BigDecimal afternoonTeaConsumeCount; + private int dinnerUserCount; + private int dinnerOrderCount; + private BigDecimal dinnerConsumeCount; + private int midnightSnackUserCount; + private int midnightSnackOrderCount; + private BigDecimal midnightSnackConsumeCount; +} 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/domain/GoodsRevenueParam.java new file mode 100644 index 0000000..e8f32af --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueParam.java @@ -0,0 +1,28 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class GoodsRevenueParam implements Serializable { + private List orderDetailTypeList; + // 1:食堂 2:档口 +// private Integer countType; + private List deptIdList; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + public GoodsRevenueParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } +} 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/domain/GoodsRevenueVO.java new file mode 100644 index 0000000..286913b --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/GoodsRevenueVO.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class GoodsRevenueVO implements Serializable { + private Long goodsId; + private String goodsName; + private BigDecimal salePrice; + private int breakfastQuantityCount; + private BigDecimal breakfastConsumeCount; + private int lunchQuantityCount; + private BigDecimal lunchConsumeCount; + private int afternoonTeaQuantityCount; + private BigDecimal afternoonTeaConsumeCount; + private int dinnerQuantityCount; + private BigDecimal dinnerConsumeCount; + private int midnightSnackQuantityCount; + private BigDecimal midnightSnackConsumeCount; + private int otherQuantityCount; + private BigDecimal otherConsumeCount; +} 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/domain/OperatingRevenueParam.java new file mode 100644 index 0000000..1241940 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueParam.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class OperatingRevenueParam implements Serializable { + private List deptIdList; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + public OperatingRevenueParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } +} 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/domain/OperatingRevenueVO.java new file mode 100644 index 0000000..da548bb --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/OperatingRevenueVO.java @@ -0,0 +1,17 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class OperatingRevenueVO implements Serializable { + private int userCount; + private int orderCount; + private BigDecimal payableAmount; + private BigDecimal discountsAmount; + private BigDecimal realAmount; + private BigDecimal personalWalletCount; + private BigDecimal subWalletCount; +} 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/domain/RechargeRecordParam.java new file mode 100644 index 0000000..9c16fe8 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordParam.java @@ -0,0 +1,24 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.time.LocalTime; + +@Data +public class RechargeRecordParam implements Serializable { + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + public RechargeRecordParam() { + this.endDateTime = LocalDateTime.now().plusDays(7).with(LocalTime.MAX); + this.startDateTime = LocalDateTime.now().minusDays(7).with(LocalTime.MIN); + } +} 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/domain/RechargeRecordVO.java new file mode 100644 index 0000000..b8266df --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/RechargeRecordVO.java @@ -0,0 +1,20 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class RechargeRecordVO implements Serializable { + private String statisticDate; + @JsonIgnore + private Long rechargeNum; + @JsonIgnore + private Long subNum; + private BigDecimal cashRechargeAmount; + @JsonIgnore + private BigDecimal aliRechargeAmount; + private BigDecimal subRechargeAmount; +} 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/domain/TradeFlowParam.java new file mode 100644 index 0000000..e99701a --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowParam.java @@ -0,0 +1,26 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class TradeFlowParam implements Serializable { + private String searchValue; + private List deptIdList; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + public TradeFlowParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } +} 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 new file mode 100644 index 0000000..d0f1b5a --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/TradeFlowVO.java @@ -0,0 +1,27 @@ +package com.bonus.canteen.core.report.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/domain/UserIncomeOutcomeParam.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java new file mode 100644 index 0000000..129b870 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeParam.java @@ -0,0 +1,27 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + +@Data +public class UserIncomeOutcomeParam implements Serializable { + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + private List deptIdList; + private String searchValue; + + public UserIncomeOutcomeParam() { + this.endDateTime = LocalDateTime.now().plusDays(7).with(LocalTime.MAX); + this.startDateTime = LocalDateTime.now().minusDays(7).with(LocalTime.MIN); + } +} 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/domain/UserIncomeOutcomeVO.java new file mode 100644 index 0000000..d6b5e83 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java @@ -0,0 +1,21 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class UserIncomeOutcomeVO implements Serializable { + private Long userId; + private String phonenumber; + private Long deptId; + private String deptName; + private String deptFullName; + private String nickName; + private BigDecimal walletBal; + private BigDecimal walletBalNow; + private BigDecimal income; + private BigDecimal outcome; + private BigDecimal lastWalletBal; +} 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/domain/UserRevenueParam.java new file mode 100644 index 0000000..724e1f2 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueParam.java @@ -0,0 +1,26 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class UserRevenueParam implements Serializable { + private String searchValue; + private List deptIdList; + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + + public UserRevenueParam() { + this.endDateTime = LocalDateTime.now().plusDays(7); + this.startDateTime = LocalDateTime.now().minusDays(7); + } +} 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/domain/UserRevenueVO.java new file mode 100644 index 0000000..85851d2 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserRevenueVO.java @@ -0,0 +1,28 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class UserRevenueVO implements Serializable { + private Long userId; + private String nickName; + private String deptFullName; + private int breakfastUserCount; + private int breakfastOrderCount; + private BigDecimal breakfastConsumeCount; + private int lunchUserCount; + private int lunchOrderCount; + private BigDecimal lunchConsumeCount; + private int afternoonTeaUserCount; + private int afternoonTeaOrderCount; + private BigDecimal afternoonTeaConsumeCount; + private int dinnerUserCount; + private int dinnerOrderCount; + private BigDecimal dinnerConsumeCount; + private int midnightSnackUserCount; + private int midnightSnackOrderCount; + private BigDecimal midnightSnackConsumeCount; +} 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/domain/WithdrawRecordParam.java new file mode 100644 index 0000000..1199d90 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordParam.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.report.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.time.LocalTime; + +@Data +public class WithdrawRecordParam implements Serializable { + @ApiModelProperty("开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDateTime; + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDateTime; + private String searchValue; + + public WithdrawRecordParam() { + this.endDateTime = LocalDateTime.now().plusDays(7).with(LocalTime.MAX); + this.startDateTime = LocalDateTime.now().minusDays(7).with(LocalTime.MIN); + } +} 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/domain/WithdrawRecordVO.java new file mode 100644 index 0000000..994daea --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/WithdrawRecordVO.java @@ -0,0 +1,16 @@ +package com.bonus.canteen.core.report.domain; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WithdrawRecordVO implements Serializable { + private Long userId; + private String nickName; + private Long deptId; + private String deptName; + private String deptFullName; + private int withdrawNum; + private double withdrawAmount; +} 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/mapper/AccReportMapper.java new file mode 100644 index 0000000..8118660 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/AccReportMapper.java @@ -0,0 +1,14 @@ +package com.bonus.canteen.core.report.mapper; + +import com.bonus.canteen.core.report.domain.*; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface AccReportMapper { + public List selectRechargeRecord(@Param("param") RechargeRecordParam param); + public List selectWithdrawRecord(@Param("param") WithdrawRecordParam param); + public List selectDeptIncomeOutcome(@Param("param") DeptIncomeOutcomeParam param); + public List selectUserIncomeOutcome(@Param("param") UserIncomeOutcomeParam param, + @Param("encryptedSearchValue") String encryptedSearchValue); +} 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 new file mode 100644 index 0000000..3ab5262 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/mapper/TradeReportMapper.java @@ -0,0 +1,17 @@ +package com.bonus.canteen.core.report.mapper; + +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")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/service/AccReportService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java new file mode 100644 index 0000000..3eb3c6f --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/AccReportService.java @@ -0,0 +1,16 @@ +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.domain.*; + +import java.util.List; + +public interface AccReportService { + List balanceList(AccountInfoQueryParam accountInfoQueryParam); + AccInfoDetailsVO balanceListSum(AccountInfoQueryParam accountInfoQueryParam); + List rechargeCount(RechargeRecordParam param); + List selectWithdrawRecord(WithdrawRecordParam param); + List selectDeptIncomeOutcome(DeptIncomeOutcomeParam param); + List selectUserIncomeOutcome(UserIncomeOutcomeParam param); +} 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 new file mode 100644 index 0000000..0898897 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/TradeReportService.java @@ -0,0 +1,14 @@ +package com.bonus.canteen.core.report.service; + +import com.bonus.canteen.core.report.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/service/impl/AccReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java new file mode 100644 index 0000000..00ad957 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java @@ -0,0 +1,59 @@ +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.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; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class AccReportServiceImpl implements AccReportService { + @Resource + AccReportMapper accReportMapper; + @Autowired + IAccInfoService accInfoService; + + @Override + public List balanceList(AccountInfoQueryParam accountInfoQueryParam) { + return accInfoService.selectAccInfoList(accountInfoQueryParam); + } + + @Override + public AccInfoDetailsVO balanceListSum(AccountInfoQueryParam accountInfoQueryParam) { + return accInfoService.queryAccInfoBalanceSum(accountInfoQueryParam); + } + + @Override + public List rechargeCount(RechargeRecordParam param) { + return accReportMapper.selectRechargeRecord(param); + } + @Override + public List selectWithdrawRecord(WithdrawRecordParam param) { + return accReportMapper.selectWithdrawRecord(param); + } + + @Override + public List selectDeptIncomeOutcome(DeptIncomeOutcomeParam param) { + return accReportMapper.selectDeptIncomeOutcome(param); + } + + @Override + public List selectUserIncomeOutcome(UserIncomeOutcomeParam param) { + String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); + List list = accReportMapper.selectUserIncomeOutcome(param, encryptedSearchValue); + if(CollUtil.isNotEmpty(list)) { + for (UserIncomeOutcomeVO userIncomeOutcomeVO : list) { + userIncomeOutcomeVO.setPhonenumber(SM4EncryptUtils.sm4Decrypt(userIncomeOutcomeVO.getPhonenumber())); + } + } + return list; + } +} 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 new file mode 100644 index 0000000..7dd39db --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java @@ -0,0 +1,54 @@ +package com.bonus.canteen.core.report.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.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/AccReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml new file mode 100644 index 0000000..8aac765 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml @@ -0,0 +1,254 @@ + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..307a8a6 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml @@ -0,0 +1,395 @@ + + + + + + + + + + + + + + + + \ No newline at end of file From 461447636c9c1fef84b30d4fc2f0a8ebfe8c420f Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 3 Jun 2025 09:45:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/cook/CookRecipeDishesMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml index 02d01c6..266d4e4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml @@ -144,4 +144,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remanent_num = remanent_num + #{quantity} where recipe_detail_id = #{dish.recipeDetailId} and dishes_id = #{dish.dishesId} - + \ No newline at end of file From d663ed25212f98853550a786e2058a6b5a52bcc3 Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Mon, 9 Jun 2025 08:50:46 +0800 Subject: [PATCH 3/8] =?UTF-8?q?jsk=20=20=E5=95=86=E8=B6=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SupermarketProductController.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java index f703fd2..935953d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java @@ -26,7 +26,7 @@ import com.bonus.common.core.web.page.TableDataInfo; /** * 超市商城商品Controller - * + * * @author xsheng * @date 2025-06-03 */ @@ -48,7 +48,17 @@ public class SupermarketProductController extends BaseController { List list = supermarketProductService.selectSupermarketProductList(supermarketProduct); return getDataTable(list); } - + /** + * 查询超市商城商品列表 + */ + @ApiOperation(value = "查询商品列表") + //@RequiresPermissions("supermarket:product:list") + @GetMapping("/getAddList") + public TableDataInfo getAddList(SupermarketProduct supermarketProduct) { + startPage(); + List list = supermarketProductService.selectSupermarketProductList(supermarketProduct); + return getDataTable(list); + } /** * 导出超市商城商品列表 */ From c7bec95298220f79eba54c1613c8ebc5fcb2686f Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Mon, 9 Jun 2025 08:53:57 +0800 Subject: [PATCH 4/8] =?UTF-8?q?jsk=20=E5=95=86=E8=B6=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarket/domain/SupermarketProduct.java | 4 ++-- .../mapper/SupermarketProductMapper.java | 14 +++++++------- .../service/ISupermarketProductService.java | 14 +++++++------- .../impl/SupermarketProductServiceImpl.java | 14 +++++++------- .../supermarket/SupermarketProductMapper.xml | 10 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java index 2c0f6c5..0eb31ab 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java @@ -10,7 +10,7 @@ import com.bonus.common.core.web.domain.BaseEntity; /** * 超市商城商品对象 supermarket_product - * + * * @author xsheng * @date 2025-06-03 */ @@ -20,7 +20,7 @@ import com.bonus.common.core.web.domain.BaseEntity; @ToString public class SupermarketProduct extends BaseEntity { private static final long serialVersionUID = 1L; - + /** 商城商品明细id */ private Long productId; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java index ffb466c..5a88419 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java @@ -5,14 +5,14 @@ import com.bonus.canteen.core.supermarket.domain.SupermarketProduct; /** * 超市商城商品Mapper接口 - * + * * @author xsheng * @date 2025-06-03 */ public interface SupermarketProductMapper { /** * 查询超市商城商品 - * + * * @param productId 超市商城商品主键 * @return 超市商城商品 */ @@ -22,7 +22,7 @@ public interface SupermarketProductMapper { /** * 查询超市商城商品列表 - * + * * @param supermarketProduct 超市商城商品 * @return 超市商城商品集合 */ @@ -30,7 +30,7 @@ public interface SupermarketProductMapper { /** * 新增超市商城商品 - * + * * @param supermarketProduct 超市商城商品 * @return 结果 */ @@ -38,7 +38,7 @@ public interface SupermarketProductMapper { /** * 修改超市商城商品 - * + * * @param supermarketProduct 超市商城商品 * @return 结果 */ @@ -46,7 +46,7 @@ public interface SupermarketProductMapper { /** * 删除超市商城商品 - * + * * @param productId 超市商城商品主键 * @return 结果 */ @@ -54,7 +54,7 @@ public interface SupermarketProductMapper { /** * 批量删除超市商城商品 - * + * * @param productIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java index 8dd3a6f..f5b24e1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java @@ -5,14 +5,14 @@ import com.bonus.canteen.core.supermarket.domain.SupermarketProduct; /** * 超市商城商品Service接口 - * + * * @author xsheng * @date 2025-06-03 */ public interface ISupermarketProductService { /** * 查询超市商城商品 - * + * * @param productId 超市商城商品主键 * @return 超市商城商品 */ @@ -20,7 +20,7 @@ public interface ISupermarketProductService { /** * 查询超市商城商品列表 - * + * * @param supermarketProduct 超市商城商品 * @return 超市商城商品集合 */ @@ -28,7 +28,7 @@ public interface ISupermarketProductService { /** * 新增超市商城商品 - * + * * @param supermarketProduct 超市商城商品 * @return 结果 */ @@ -36,7 +36,7 @@ public interface ISupermarketProductService { /** * 修改超市商城商品 - * + * * @param supermarketProduct 超市商城商品 * @return 结果 */ @@ -44,7 +44,7 @@ public interface ISupermarketProductService { /** * 批量删除超市商城商品 - * + * * @param productIds 需要删除的超市商城商品主键集合 * @return 结果 */ @@ -52,7 +52,7 @@ public interface ISupermarketProductService { /** * 删除超市商城商品信息 - * + * * @param productId 超市商城商品主键 * @return 结果 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java index 4929c60..e60c925 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java @@ -12,7 +12,7 @@ import com.bonus.canteen.core.supermarket.service.ISupermarketProductService; /** * 超市商城商品Service业务层处理 - * + * * @author xsheng * @date 2025-06-03 */ @@ -23,7 +23,7 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService /** * 查询超市商城商品 - * + * * @param productId 超市商城商品主键 * @return 超市商城商品 */ @@ -34,7 +34,7 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService /** * 查询超市商城商品列表 - * + * * @param supermarketProduct 超市商城商品 * @return 超市商城商品 */ @@ -45,7 +45,7 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService /** * 新增超市商城商品 - * + * * @param supermarketProduct 超市商城商品 * @return 结果 */ @@ -62,7 +62,7 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService /** * 修改超市商城商品 - * + * * @param supermarketProduct 超市商城商品 * @return 结果 */ @@ -79,7 +79,7 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService /** * 批量删除超市商城商品 - * + * * @param productIds 需要删除的超市商城商品主键 * @return 结果 */ @@ -90,7 +90,7 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService /** * 删除超市商城商品信息 - * + * * @param productId 超市商城商品主键 * @return 结果 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml index d3e28cd..7fa052d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into supermarket_product @@ -123,9 +123,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from supermarket_product where product_id in + delete from supermarket_product where product_id in #{productId} - \ No newline at end of file + From 07aa60180135d53903b5f5127bb93e7487033128 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Mon, 9 Jun 2025 09:23:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AccountReportController.java | 6 +++--- .../controller/TradeReportController.java | 6 +++--- .../domain/CanteenStallRevenueParam.java | 2 +- .../domain/CanteenStallRevenueVO.java | 2 +- .../domain/DeptIncomeOutcomeParam.java | 2 +- .../domain/DeptIncomeOutcomeVO.java | 2 +- .../domain/DeviceRevenueParam.java | 2 +- .../domain/DeviceRevenueVO.java | 2 +- .../domain/GoodsRevenueParam.java | 2 +- .../domain/GoodsRevenueVO.java | 2 +- .../domain/OperatingRevenueParam.java | 2 +- .../domain/OperatingRevenueVO.java | 2 +- .../domain/RechargeRecordParam.java | 2 +- .../domain/RechargeRecordVO.java | 2 +- .../domain/TradeFlowParam.java | 2 +- .../{report => report_bak}/domain/TradeFlowVO.java | 2 +- .../domain/UserIncomeOutcomeParam.java | 2 +- .../domain/UserIncomeOutcomeVO.java | 2 +- .../domain/UserRevenueParam.java | 2 +- .../domain/UserRevenueVO.java | 2 +- .../domain/WithdrawRecordParam.java | 2 +- .../domain/WithdrawRecordVO.java | 2 +- .../mapper/AccReportMapper.java | 4 ++-- .../mapper/TradeReportMapper.java | 4 ++-- .../service/AccReportService.java | 4 ++-- .../service/TradeReportService.java | 4 ++-- .../service/impl/AccReportServiceImpl.java | 8 ++++---- .../service/impl/TradeReportServiceImpl.java | 8 ++++---- .../{report => report_bak}/AccReportMapper.xml | 10 +++++----- .../{report => report_bak}/TradeReportMapper.xml | 14 +++++++------- 30 files changed, 54 insertions(+), 54 deletions(-) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/controller/AccountReportController.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/controller/TradeReportController.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/CanteenStallRevenueParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/CanteenStallRevenueVO.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/DeptIncomeOutcomeParam.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/DeptIncomeOutcomeVO.java (89%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/DeviceRevenueParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/DeviceRevenueVO.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/GoodsRevenueParam.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/GoodsRevenueVO.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/OperatingRevenueParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/OperatingRevenueVO.java (88%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/RechargeRecordParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/RechargeRecordVO.java (90%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/TradeFlowParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/TradeFlowVO.java (92%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/UserIncomeOutcomeParam.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/UserIncomeOutcomeVO.java (90%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/UserRevenueParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/UserRevenueVO.java (94%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/WithdrawRecordParam.java (93%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/domain/WithdrawRecordVO.java (86%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/mapper/AccReportMapper.java (86%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/mapper/TradeReportMapper.java (89%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/service/AccReportService.java (87%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/service/TradeReportService.java (83%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/service/impl/AccReportServiceImpl.java (89%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/{report => report_bak}/service/impl/TradeReportServiceImpl.java (87%) rename bonus-modules/bonus-smart-canteen/src/main/resources/mapper/{report => report_bak}/AccReportMapper.xml (96%) rename bonus-modules/bonus-smart-canteen/src/main/resources/mapper/{report => report_bak}/TradeReportMapper.xml (98%) 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, From a82e3df139b1a43d0fdd3a6951a0c296724923ac Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Mon, 9 Jun 2025 09:43:16 +0800 Subject: [PATCH 6/8] jsk --- .../controller/SupermarketProductController.java | 2 +- .../supermarket/domain/SupermarketProduct.java | 10 +++++++++- .../mapper/SupermarketProductMapper.java | 1 + .../service/ISupermarketProductService.java | 2 ++ .../impl/SupermarketProductServiceImpl.java | 4 ++++ .../supermarket/SupermarketProductMapper.xml | 16 ++++++++++++++++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java index 935953d..ec9724c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java @@ -56,7 +56,7 @@ public class SupermarketProductController extends BaseController { @GetMapping("/getAddList") public TableDataInfo getAddList(SupermarketProduct supermarketProduct) { startPage(); - List list = supermarketProductService.selectSupermarketProductList(supermarketProduct); + List list = supermarketProductService.selectSupermarketAddProductList(supermarketProduct); return getDataTable(list); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java index 0eb31ab..28858f5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java @@ -20,7 +20,7 @@ import com.bonus.common.core.web.domain.BaseEntity; @ToString public class SupermarketProduct extends BaseEntity { private static final long serialVersionUID = 1L; - + /** 商城商品明细id */ private Long productId; @@ -76,6 +76,14 @@ public class SupermarketProduct extends BaseEntity { private String materialName; + private String materialType; + + private String materialTypeName; + + private String areaId; + + private String areaName; + private String unitName; public String getImgUrl() { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java index 5a88419..e524bc8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java @@ -28,6 +28,7 @@ public interface SupermarketProductMapper { */ public List selectSupermarketProductList(SupermarketProduct supermarketProduct); + public List selectSupermarketAddProductList(SupermarketProduct supermarketProduct); /** * 新增超市商城商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java index f5b24e1..72da950 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java @@ -26,6 +26,8 @@ public interface ISupermarketProductService { */ public List selectSupermarketProductList(SupermarketProduct supermarketProduct); + public List selectSupermarketAddProductList(SupermarketProduct supermarketProduct); + /** * 新增超市商城商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java index e60c925..5edba79 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java @@ -43,6 +43,10 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService return supermarketProductMapper.selectSupermarketProductList(supermarketProduct); } + @Override + public List selectSupermarketAddProductList(SupermarketProduct supermarketProduct) { + return supermarketProductMapper.selectSupermarketAddProductList(supermarketProduct); + } /** * 新增超市商城商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml index 7fa052d..27493eb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml @@ -48,6 +48,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - 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 From c8b0e17366ec8fc139955c62f972245b431b06bf Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Mon, 9 Jun 2025 13:26:56 +0800 Subject: [PATCH 8/8] jsk --- .../SupermarketProductController.java | 56 +++++++++++++++++-- .../domain/SupermarketProduct.java | 5 +- .../mapper/SupermarketProductMapper.java | 2 + .../service/ISupermarketProductService.java | 4 +- .../impl/SupermarketProductServiceImpl.java | 26 ++++++++- .../supermarket/SupermarketProductMapper.xml | 21 ++++++- 6 files changed, 105 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java index ec9724c..ad74017 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java @@ -45,6 +45,7 @@ public class SupermarketProductController extends BaseController { @GetMapping("/list") public TableDataInfo list(SupermarketProduct supermarketProduct) { startPage(); + System.out.println(supermarketProduct.getMaterialName()); List list = supermarketProductService.selectSupermarketProductList(supermarketProduct); return getDataTable(list); } @@ -78,9 +79,9 @@ public class SupermarketProductController extends BaseController { */ @ApiOperation(value = "获取超市商城商品详细信息") //@RequiresPermissions("supermarket:product:query") - @GetMapping(value = "/{productId}") - public AjaxResult getInfo(@PathVariable("productId") Long productId) { - return success(supermarketProductService.selectSupermarketProductByProductId(productId)); + @PostMapping(value = "/getInfo") + public AjaxResult getInfo(@RequestBody SupermarketProduct supermarketProduct) { + return success(supermarketProductService.selectSupermarketProductByProductId(supermarketProduct.getProductId())); } /** @@ -89,7 +90,7 @@ public class SupermarketProductController extends BaseController { @ApiOperation(value = "新增超市商城商品") //@PreventRepeatSubmit //@RequiresPermissions("supermarket:product:add") - @SysLog(title = "超市商城商品", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增超市商城商品") + @SysLog(title = "超市商城商品", businessType = OperaType.INSERT, logType = 1,module = "超市管理->新增超市商城商品") @PostMapping public AjaxResult add(@RequestBody SupermarketProduct supermarketProduct) { try { @@ -98,7 +99,50 @@ public class SupermarketProductController extends BaseController { return error(e.getMessage()); } } - + /** + * 新增超市商城商品 + */ + @ApiOperation(value = "新增超市商城商品") + //@PreventRepeatSubmit + //@RequiresPermissions("supermarket:product:add") + @SysLog(title = "超市商城商品", businessType = OperaType.INSERT, logType = 1,module = "超市管理->新增超市商城商品") + @PostMapping("/addProducts") + public AjaxResult adds(@RequestBody SupermarketProduct supermarketProduct) { + try { + return toAjax(supermarketProductService.insertSupermarketProducts(supermarketProduct)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + /** + * 新增超市商城商品 + */ + @ApiOperation(value = "删除超市商城商品") + //@PreventRepeatSubmit + //@RequiresPermissions("supermarket:product:add") + @SysLog(title = "超市商城商品", businessType = OperaType.INSERT, logType = 1,module = "超市管理->删除超市商城商品") + @PostMapping("/delProduct") + public AjaxResult delProduct(@RequestBody SupermarketProduct supermarketProduct) { + try { + String[] productIds=supermarketProduct.getProductIds().split(","); + return toAjax(supermarketProductService.deleteSupermarketProductByProductIdss(productIds)); + } catch (Exception e) { + return error(e.getMessage()); + } + } + @ApiOperation(value = "超市商城商品批量上线") + //@PreventRepeatSubmit + //@RequiresPermissions("supermarket:product:add") + @SysLog(title = "超市商城商品批量上线", businessType = OperaType.INSERT, logType = 1,module = "超市管理->超市商城商品批量上线") + @PostMapping("/onlines") + public AjaxResult online(@RequestBody SupermarketProduct supermarketProduct) { + try { + String[] productIds=supermarketProduct.getProductIds().split(","); + return toAjax(supermarketProductService.onlineSupermarketProductByProductIdss(productIds)); + } catch (Exception e) { + return error(e.getMessage()); + } + } /** * 修改超市商城商品 */ @@ -109,6 +153,8 @@ public class SupermarketProductController extends BaseController { @PostMapping("/edit") public AjaxResult edit(@RequestBody SupermarketProduct supermarketProduct) { try { + System.out.println(supermarketProduct.getPutawayState()); + System.out.println(supermarketProduct.getIfOnline()); return toAjax(supermarketProductService.updateSupermarketProduct(supermarketProduct)); } catch (Exception e) { return error(e.getMessage()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java index 28858f5..5c138c4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketProduct.java @@ -74,6 +74,8 @@ public class SupermarketProduct extends BaseEntity { @ApiModelProperty(value = "库存数") private BigDecimal inventoryNum; + private String materialIds; + private String materialName; private String materialType; @@ -85,7 +87,8 @@ public class SupermarketProduct extends BaseEntity { private String areaName; private String unitName; - + private String productIds; + private String barCode; public String getImgUrl() { return FileUrlUtil.getFileUrl(this.imgUrl); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java index e524bc8..7458cb5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java @@ -60,4 +60,6 @@ public interface SupermarketProductMapper { * @return 结果 */ public int deleteSupermarketProductByProductIds(Long[] productIds); + public int deleteSupermarketProductByProductIdss(String[] productIds); + public int onlineSupermarketProductByProductIdss(String[] productIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java index 72da950..dbc3375 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/ISupermarketProductService.java @@ -36,6 +36,7 @@ public interface ISupermarketProductService { */ public int insertSupermarketProduct(SupermarketProduct supermarketProduct); + public int insertSupermarketProducts(SupermarketProduct supermarketProduct); /** * 修改超市商城商品 * @@ -51,7 +52,8 @@ public interface ISupermarketProductService { * @return 结果 */ public int deleteSupermarketProductByProductIds(Long[] productIds); - + public int deleteSupermarketProductByProductIdss(String[] productIds); + public int onlineSupermarketProductByProductIdss(String[] productIds); /** * 删除超市商城商品信息 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java index 5edba79..87d1311 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.canteen.core.supermarket.service.impl; +import java.util.ArrayList; import java.util.List; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; @@ -64,6 +65,22 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService } } + @Override + public int insertSupermarketProducts(SupermarketProduct supermarketProduct) { + supermarketProduct.setCreateTime(DateUtils.getNowDate()); + supermarketProduct.setCreateBy(SecurityUtils.getUsername()); + try { + List sps=new ArrayList<>(); + sps=supermarketProductMapper.selectSupermarketAddProductList(supermarketProduct); + for(SupermarketProduct vo:sps){ + vo.setSupermarketId(supermarketProduct.getSupermarketId()); + supermarketProductMapper.insertSupermarketProduct(vo); + } + return 1; + } catch (Exception e) { + throw new ServiceException(e.getMessage()); + } + } /** * 修改超市商城商品 * @@ -91,7 +108,14 @@ public class SupermarketProductServiceImpl implements ISupermarketProductService public int deleteSupermarketProductByProductIds(Long[] productIds) { return supermarketProductMapper.deleteSupermarketProductByProductIds(productIds); } - + @Override + public int deleteSupermarketProductByProductIdss(String[] productIds) { + return supermarketProductMapper.deleteSupermarketProductByProductIdss(productIds); + } + @Override + public int onlineSupermarketProductByProductIdss(String[] productIds) { + return supermarketProductMapper.onlineSupermarketProductByProductIdss(productIds); + } /** * 删除超市商城商品信息 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml index 27493eb..47d2568 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml @@ -26,16 +26,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select sp.product_id, sp.supermarket_id, sp.material_id, sp.putaway_state, sp.if_online, sp.sale_price, sp.pref_price, sp.person_limit, sp.one_day_limit, sp.img_url, sp.inventory_num, sp.create_by, - sp.create_time, sp.update_by, sp.update_time, sm.material_name, spu.unit_name + sp.create_time, sp.update_by, sp.update_time, sm.material_name,smt.material_type_name, spu.unit_name from supermarket_product sp left join supermarket_material sm on sm.material_id = sp.material_id left join supply_product_unit spu on spu.unit_id = sm.unit_id + left join supermarket_material_type smt on smt.material_type_id = sm.material_type_id