From da83e04ec1e2d710ce5acb1ab6d8dd4ce8511f8e Mon Sep 17 00:00:00 2001 From: zt Date: Mon, 20 Jan 2025 14:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/business/vo/StatisticsVo.java | 1 + .../CustomizeExcelController.java | 12 +++++ .../customizeExcel/vo/SubsidyExcelVO.java | 45 +++++++++++++++++++ .../customizeExcel/CustomizeExcelMapper.java | 3 ++ .../service/amount/DeductionServiceImpl.java | 1 + .../service/business/BusinessServiceImpl.java | 5 +++ .../customizeExcel/CustomizeExcelService.java | 2 + .../CustomizeExcelServiceImpl.java | 5 +++ .../customizeExcel/CustomizeExcelMapper.xml | 24 ++++++++++ 9 files changed, 98 insertions(+) create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/SubsidyExcelVO.java diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java index 508d8800..8404ce92 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/business/vo/StatisticsVo.java @@ -13,5 +13,6 @@ public class StatisticsVo { private Long carteenId; private LocalDateTime time; private int orderSum; + private BigDecimal subsidyPurse; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/CustomizeExcelController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/CustomizeExcelController.java index dba2d041..3e2fcb5d 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/CustomizeExcelController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/CustomizeExcelController.java @@ -192,4 +192,16 @@ public class CustomizeExcelController { orderExcelVOS); } + + @GetMapping("/subsidyExcel") + @Operation(summary = "三峡路社区食堂补贴") + @OperateLog(type = EXPORT) + public void exportSubsidyExcel(String startTime,String endTime,Long carteenId, + HttpServletResponse response) throws IOException { + List orderExcelVOS = excelService.exportSubsidyExcel(startTime, endTime,carteenId); + // 导出 Excel + ExcelUtils.write(response, "部门订单详情统计.xlsx", "数据", SubsidyExcelVO.class, + orderExcelVOS); + } + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/SubsidyExcelVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/SubsidyExcelVO.java new file mode 100644 index 00000000..dbcc7aef --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/SubsidyExcelVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.NumberFormat; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class SubsidyExcelVO { + + @ExcelProperty("姓名") + private String name; + + @ExcelProperty("手机") + private String mobile; + + @ExcelProperty("身份证号码") + private String identityCard; + + @ExcelProperty("地址") + private String address; + + @ExcelProperty("类别") + private String tagName; + + @ExcelProperty("市场价格(元)") + @NumberFormat("#0.00") + private BigDecimal marketPrice; + + @ExcelProperty("自付(元)") + @NumberFormat("#0.00") + private BigDecimal totalMoney; + + @ExcelProperty("补助(元)") + @NumberFormat("#0.00") + private BigDecimal subsidyAmount; + + @ExcelProperty("时间段") + private String timeSlot; + + @ExcelProperty("日期") + private String createTime; +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/customizeExcel/CustomizeExcelMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/customizeExcel/CustomizeExcelMapper.java index 60985d02..308a0c87 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/customizeExcel/CustomizeExcelMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/customizeExcel/CustomizeExcelMapper.java @@ -20,4 +20,7 @@ public interface CustomizeExcelMapper { List exportGroupOrderExcel(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("carteenId")Long carteenId, @Param("groupId")Long groupId); List exportGroupStoreOrderExcel(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("carteenId")Long carteenId, @Param("groupId")Long groupId); + + List exportSubsidyExcel(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("carteenId")Long carteenId); + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java index a67e1bc5..23e8958c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java @@ -191,6 +191,7 @@ public class DeductionServiceImpl implements DeductionService { statisticsVo.setReduceMoney(dishOrderDO.getReductionAmount()); statisticsVo.setTime(dishOrderDO.getCreateTime()); statisticsVo.setOrderId(dishOrderDO.getId()); + statisticsVo.setSubsidyPurse(dishOrderDO.getSubsidyAmount()); businessService.updateStatistics(statisticsVo); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java index bc0f901a..e7d7eb24 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/business/BusinessServiceImpl.java @@ -170,6 +170,11 @@ public class BusinessServiceImpl implements BusinessService { } } + //补贴金额 + if(ObjectUtil.isNotEmpty(vo.getSubsidyPurse())){ + businessDO.setSubsidyPurse(businessDO.getSubsidyPurse().add(vo.getSubsidyPurse())); + } + businessMapper.updateById(businessDO); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelService.java index 56e491e9..10915bcd 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelService.java @@ -19,4 +19,6 @@ public interface CustomizeExcelService { List exportGroupOrderExcel(String startTime, String endTime, Long carteenId, Long groupId); List exportGroupStoreOrderExcel(String startTime, String endTime, Long carteenId, Long groupId); + + List exportSubsidyExcel(String startTime,String endTime,Long carteenId); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelServiceImpl.java index e8525b9e..77565c26 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelServiceImpl.java @@ -40,4 +40,9 @@ public class CustomizeExcelServiceImpl implements CustomizeExcelService { public List exportGroupStoreOrderExcel(String startTime, String endTime, Long carteenId, Long groupId) { return customizeExcelMapper.exportGroupStoreOrderExcel(startTime,endTime,carteenId,groupId); } + + @Override + public List exportSubsidyExcel(String startTime, String endTime, Long carteenId) { + return customizeExcelMapper.exportSubsidyExcel(startTime,endTime,carteenId); + } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml index cb27245f..217b8699 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml @@ -121,4 +121,28 @@ and DATE_FORMAT(o.create_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} + + \ No newline at end of file