zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

身份证，地址

Browse Source
This commit is contained in:
zt
2025-01-17 09:50:49 +08:00
parent 4376df59fe
commit c26669d0da
12 changed files with 114 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/CustomizeExcelController.java
View File

@ -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);
}
}

31
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/customizeExcel/vo/GroupStoreOrderVO.java Normal file
View File

@ -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;
}

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserAddVO.java
View File

@ -63,4 +63,9 @@ public class MemberUserAddVO {
@Schema(description = "限定金额")
private BigDecimal limitAmount;
@Schema(description = "身份证")
private String identityCard;
@Schema(description = "地址")
private String address;
}

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
View File

@ -74,4 +74,10 @@ public class MemberUserBaseVO {
@Schema(description = "限定金额")
private BigDecimal limitAmount;
@Schema(description = "身份证")
private String identityCard;
@Schema(description = "地址")
private String address;
}

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
View File

@ -90,4 +90,12 @@ public class AppMemberUserInfoRespVO {
*/
private BigDecimal debtAmount;
@Schema(description = "身份证")
private String identityCard;
@Schema(description = "地址")
private String address;
}

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java
View File

@ -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;
}

10
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
View File

@ -190,4 +190,14 @@ public class MemberUserDO extends TenantBaseDO {
*/
private BigDecimal limitAmount;
/**
* 身份证
*/
private String identityCard;
/**
* 地址
*/
private String address;
}

6
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/customizeExcel/CustomizeExcelMapper.java
View File

@ -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);
}

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelService.java
View File

@ -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);
}

10
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customizeExcel/CustomizeExcelServiceImpl.java
View File

@ -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);
}
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java
View File

@ -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");
/**
* 时间格式

24
yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/customizeExcel/CustomizeExcelMapper.xml
View File

@ -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>