From 535c92764ba7a464abd3efa329cbad5fb1dfd7b2 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Wed, 7 May 2025 11:29:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=BA=BF=E4=B8=8B=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/canteen/core/order/constants/OrderTypeEnum.java | 2 +- .../java/com/bonus/canteen/core/order/domain/OrderInfo.java | 6 ++++++ .../core/order/service/impl/OrderInfoServiceImpl.java | 2 ++ .../src/main/resources/mapper/order/OrderInfoMapper.xml | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderTypeEnum.java index c6603b1..c6d19ca 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderTypeEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderTypeEnum.java @@ -4,7 +4,7 @@ public enum OrderTypeEnum { CURR_MEAL(1, "当餐点餐"), RESERVE_MEAL(2, "预订餐"), BOOK_MEAL(3, "自定义报餐"), - SHOP(4, "商城"), + SHOP(4, "商超"), RESERVE_SHOP(5, "预订商城"), ROOM(6, "包间"), TABLE(7, "餐桌"), diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java index 5942266..b82d81f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java @@ -180,6 +180,12 @@ public class OrderInfo extends BaseEntity private String nickName; + private String phoneNumber; + + private String deptFullName; + + private String areaName; + List orderDetailList; public List of(OrderAddParam param) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index 892814e..d6a0848 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -33,6 +33,7 @@ import com.bonus.common.core.utils.StringUtils; import com.bonus.common.houqin.constant.SourceTypeEnum; import com.bonus.common.houqin.mq.constant.LeMqConstant; import com.bonus.common.houqin.utils.JacksonUtil; +import com.bonus.common.houqin.utils.SM4EncryptUtils; import com.bonus.common.security.utils.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -119,6 +120,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderDetail.setOrderId(order.getOrderId()); List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); order.setOrderDetailList(orderDetailList); + order.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(order.getPhoneNumber())); }); } return orderInfoList; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml index f91ee51..73959fb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -57,11 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oi.refund_amount, oi.order_time, oi.order_type, oi.order_state, oi.order_refund_state, oi.deduction_type, oi.pay_time, oi.pay_type, oi.pay_channel, oi.pay_state, oi.pay_param, oi.delivery_amount, oi.packing_amount, oi.delivery_type, oi.comment_state, oi.remark, - di.device_name, su.nick_name, oi.create_by, oi.create_time, oi.update_by, oi.update_time + di.device_name, su.nick_name, oi.create_by, oi.create_time, oi.update_by, oi.update_time, + su.phonenumber as phoneNumber, sd.dept_full_name, aa.area_name from order_info oi left join alloc_canteen ac on ac.canteen_id = oi.canteen_id left join alloc_stall ast on ast.stall_id = oi.stall_id + left join alloc_area aa on aa.area_id = ac.area_id left join sys_user su on oi.user_id = su.user_id + left join sys_dept sd on sd.dept_id = su.dept_id left join device_info di on oi.device_sn = di.device_sn