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, "餐桌"),

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java

@@ -180,12 +180,6 @@ public class OrderInfo extends BaseEntity
 
     private String nickName;
 
-    private String phoneNumber;
-
-    private String deptFullName;
-
-    private String areaName;
-
     List<OrderDetail> orderDetailList;
 
     public List<OrderInfo> of(OrderAddParam param) {

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java

@@ -33,7 +33,6 @@ 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;
@@ -120,7 +119,6 @@ public class OrderInfoServiceImpl implements IOrderInfoService
                 orderDetail.setOrderId(order.getOrderId());
                 List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail);
                 order.setOrderDetailList(orderDetailList);
-                order.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(order.getPhoneNumber()));
             });
         }
         return orderInfoList;

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -57,14 +57,11 @@ 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,
-               su.phonenumber as phoneNumber, sd.dept_full_name, aa.area_name
+               di.device_name, su.nick_name, oi.create_by, oi.create_time, oi.update_by, oi.update_time
         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
     </sql>