From c26669d0daa35914ce3abd7a3fc38600894c28c7 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Fri, 17 Jan 2025 09:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=EF=BC=8C=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomizeExcelController.java             | 18 ++++++++---
 .../customizeExcel/vo/GroupStoreOrderVO.java  | 31 +++++++++++++++++++
 .../admin/user/vo/MemberUserAddVO.java        |  5 +++
 .../admin/user/vo/MemberUserBaseVO.java       |  6 ++++
 .../app/user/vo/AppMemberUserInfoRespVO.java  |  8 +++++
 .../app/user/vo/AppMemberUserUpdateReqVO.java |  6 +++-
 .../dal/dataobject/user/MemberUserDO.java     | 10 ++++++
 .../customizeExcel/CustomizeExcelMapper.java  |  6 ++--
 .../customizeExcel/CustomizeExcelService.java |  7 ++---
 .../CustomizeExcelServiceImpl.java            | 10 +++---
 .../module/member/util/MemberConstants.java   |  2 +-
 .../customizeExcel/CustomizeExcelMapper.xml   | 24 ++++++++++++++
 12 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/GroupStoreOrderVO.java

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 5b6e1ead..dba2d041 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
@@ -4,10 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.GroupOrderVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.OrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreOrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreSaleGoodsVO;
+import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.*;
 import cn.iocoder.yudao.module.member.service.customizeExcel.CustomizeExcelService;
 import cn.iocoder.yudao.module.member.util.CustomMergeStrategy;
 import com.alibaba.excel.EasyExcel;
@@ -173,7 +170,7 @@ public class CustomizeExcelController {
 
 
     @GetMapping("/groupOrderExcel")
-    @Operation(summary = "导出部门订单详情")
+    @Operation(summary = "导出部门食堂订单详情")
     @OperateLog(type = EXPORT)
     public void exportGroupOrderExcel(String startTime,String endTime,Long carteenId,Long groupId,
                                           HttpServletResponse response) throws IOException {
@@ -184,4 +181,15 @@ public class CustomizeExcelController {
                 orderExcelVOS);
     }
 
+    @GetMapping("/groupStoreOrderExcel")
+    @Operation(summary = "导出部门超市订单详情")
+    @OperateLog(type = EXPORT)
+    public void exportGroupStoreOrderExcel(String startTime,String endTime,Long carteenId,Long groupId,
+                                      HttpServletResponse response) throws IOException {
+        List<GroupStoreOrderVO> orderExcelVOS = excelService.exportGroupStoreOrderExcel(startTime, endTime,carteenId,groupId);
+        // 导出 Excel
+        ExcelUtils.write(response, "部门订单详情统计.xlsx", "数据", GroupStoreOrderVO.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/GroupStoreOrderVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/GroupStoreOrderVO.java
new file mode 100644
index 00000000..e9181bf9
--- /dev/null
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/GroupStoreOrderVO.java
@@ -0,0 +1,31 @@
+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 GroupStoreOrderVO {
+
+
+    @ExcelProperty("昵称")
+    private String nickName;
+
+    @ExcelProperty("手机")
+    private String mobile;
+
+    @ExcelProperty("总金额（元）")
+    @NumberFormat("#0.00")
+    private BigDecimal totalPrice;
+
+    @ExcelProperty("时间")
+    private String createTime;
+
+    @ExcelProperty("就餐餐别")
+    private String timeSlot;
+
+    @ExcelProperty("状态")
+    private String orderStatus;
+}
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserAddVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserAddVO.java
index 729f8b86..395c8bac 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserAddVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserAddVO.java
@@ -63,4 +63,9 @@ public class MemberUserAddVO {
     @Schema(description = "限定金额")
     private BigDecimal limitAmount;
 
+    @Schema(description = "身份证")
+    private String identityCard;
+
+    @Schema(description = "地址")
+    private String address;
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
index 49482940..d47e3d1a 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
@@ -74,4 +74,10 @@ public class MemberUserBaseVO {
 
     @Schema(description = "限定金额")
     private BigDecimal limitAmount;
+
+    @Schema(description = "身份证")
+    private String identityCard;
+
+    @Schema(description = "地址")
+    private String address;
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
index 32230918..a2eca003 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
@@ -90,4 +90,12 @@ public class AppMemberUserInfoRespVO {
      */
     private BigDecimal debtAmount;
 
+    @Schema(description = "身份证")
+    private String identityCard;
+
+    @Schema(description = "地址")
+    private String address;
+
+
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java
index 047cc063..004ded37 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java
@@ -31,9 +31,13 @@ public class AppMemberUserUpdateReqVO {
     private String target;
 
     @Schema(description = "身份证")
-    private String card;
+    private String identityCard;
 
     @Schema(description = "手机号")
     private String mobile;
 
+    @Schema(description = "地址")
+    private String address;
+
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
index 92bcd8a8..90d32a0e 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
@@ -190,4 +190,14 @@ public class MemberUserDO extends TenantBaseDO {
      */
     private BigDecimal limitAmount;
 
+    /**
+     * 身份证
+     */
+    private String identityCard;
+
+    /**
+     * 地址
+     */
+    private String address;
+
 }
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 db58172f..60985d02 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
@@ -1,10 +1,7 @@
 package cn.iocoder.yudao.module.member.dal.mysql.customizeExcel;
 
 
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.GroupOrderVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.OrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreOrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreSaleGoodsVO;
+import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +19,5 @@ public interface CustomizeExcelMapper {
 
     List<GroupOrderVO> exportGroupOrderExcel(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("carteenId")Long carteenId, @Param("groupId")Long groupId);
 
+    List<GroupStoreOrderVO> exportGroupStoreOrderExcel(@Param("startTime")String startTime, @Param("endTime")String endTime, @Param("carteenId")Long carteenId, @Param("groupId")Long groupId);
 }
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 9fe4865d..56e491e9 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
@@ -1,9 +1,6 @@
 package cn.iocoder.yudao.module.member.service.customizeExcel;
 
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.GroupOrderVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.OrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreOrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreSaleGoodsVO;
+import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
@@ -20,4 +17,6 @@ public interface CustomizeExcelService {
     List<StoreSaleGoodsVO> exportStoreSaleGoodsExcel(String startTime, String endTime, Long carteenId);
 
     List<GroupOrderVO> exportGroupOrderExcel(String startTime, String endTime, Long carteenId, Long groupId);
+
+    List<GroupStoreOrderVO> exportGroupStoreOrderExcel(String startTime, String endTime, Long carteenId, Long groupId);
 }
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 c1553144..e8525b9e 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
@@ -1,9 +1,6 @@
 package cn.iocoder.yudao.module.member.service.customizeExcel;
 
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.GroupOrderVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.OrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreOrderExcelVO;
-import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.StoreSaleGoodsVO;
+import cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.*;
 import cn.iocoder.yudao.module.member.dal.mysql.customizeExcel.CustomizeExcelMapper;
 import cn.iocoder.yudao.module.member.service.devicewarn.DeviceWarnService;
 import cn.iocoder.yudao.module.system.api.deviceInfo.DeviceInfoApi;
@@ -38,4 +35,9 @@ public class CustomizeExcelServiceImpl implements CustomizeExcelService {
     public List<GroupOrderVO> exportGroupOrderExcel(String startTime, String endTime, Long carteenId, Long groupId) {
         return customizeExcelMapper.exportGroupOrderExcel(startTime,endTime,carteenId,groupId);
     }
+
+    @Override
+    public List<GroupStoreOrderVO> exportGroupStoreOrderExcel(String startTime, String endTime, Long carteenId, Long groupId) {
+        return customizeExcelMapper.exportGroupStoreOrderExcel(startTime,endTime,carteenId,groupId);
+    }
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java
index 84ef072f..bf74be93 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java
@@ -12,7 +12,7 @@ public class MemberConstants {
     /**
      * 报警余额
      */
-    public static final BigDecimal ALARM_BALANCE = new BigDecimal("15");
+    public static final BigDecimal ALARM_BALANCE = new BigDecimal("10");
 
     /**
      * 时间格式
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 226ce49e..cb27245f 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
@@ -97,4 +97,28 @@
           and DATE_FORMAT(o.create_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
     </select>
 
+    <select id="exportGroupStoreOrderExcel" resultType="cn.iocoder.yudao.module.member.controller.admin.customizeExcel.vo.GroupStoreOrderVO">
+        select u.nickname,
+               u.mobile,
+               o.total_price,
+               DATE_FORMAT(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,
+               CASE
+                   WHEN HOUR(o.create_time) BETWEEN 0 AND 9 THEN '早上'
+           WHEN HOUR(o.create_time) BETWEEN 10 AND 15 THEN '中午'
+           WHEN HOUR(o.create_time) BETWEEN 16 AND 23 THEN '晚上'
+           ELSE '未知' END AS timeSlot,
+       CASE
+           WHEN o.status = 1 THEN '已支付'
+           WHEN o.status = 2 THEN '已完成'
+           WHEN o.status = 3 THEN '已取消'
+           when o.status = 4 THEN '已退款'
+           ELSE '未知' END AS orderStatus
+       from member_store_order o
+                 left join member_user u on o.user_id = u.id
+        where o.carteen_id = #{carteenId}
+        and o.deleted = false
+        and o.user_id in (select member_id from member_group_member where group_id = #{groupId})
+        and DATE_FORMAT(o.create_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+    </select>
+
 </mapper>
\ No newline at end of file