bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/utils/ObjectUtils.java

@@ -1,18 +0,0 @@
-package com.bonus.canteen.core.common.utils;
-
-import com.bonus.common.core.exception.ServiceException;
-
-import java.lang.reflect.Field;
-
-public class ObjectUtils {
-    public static void setAllFieldsToNull(Object obj) {
-        for (Field field : obj.getClass().getDeclaredFields()) {
-            field.setAccessible(true);
-            try {
-                field.set(obj, null);
-            } catch (IllegalAccessException e) {
-                throw new ServiceException("系统异常");
-            }
-        }
-    }
-}

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java

@@ -3,7 +3,6 @@ package com.bonus.canteen.core.order.business;
 import cn.hutool.core.collection.CollUtil;
 import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO;
 import com.bonus.canteen.core.account.service.IAccInfoService;
-import com.bonus.canteen.core.common.utils.ObjectUtils;
 import com.bonus.canteen.core.menu.domain.MenuRecipeDishes;
 import com.bonus.canteen.core.menu.service.IMenuRecipeDishesService;
 import com.bonus.canteen.core.order.constants.OrderDetailTypeEnum;
@@ -52,7 +51,6 @@ public class OrderBusiness {
                 continue;
             }
             MenuRecipeDishes menuRecipeDishes = new MenuRecipeDishes();
-            ObjectUtils.setAllFieldsToNull(menuRecipeDishes);
             menuRecipeDishes.setDetailId(orderDetail.getMenuDetailId());
             menuRecipeDishes.setDishesId(orderDetail.getGoodsId());
             menuRecipeDishesService.reduceMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity());
@@ -65,7 +63,6 @@ public class OrderBusiness {
                 continue;
             }
             MenuRecipeDishes menuRecipeDishes = new MenuRecipeDishes();
-            ObjectUtils.setAllFieldsToNull(menuRecipeDishes);
             menuRecipeDishes.setDetailId(orderDetail.getDetailId());
             menuRecipeDishes.setDishesId(orderDetail.getGoodsId());
             menuRecipeDishesService.addMenuRecipeDishesSupplyNum(menuRecipeDishes, orderDetail.getQuantity());

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             oi.canteen_id,
             oi.stall_id,
-            CONCAT(ac.canteen_name , '/', ast.stall_name) as canteenAndStallName,
+            CONCAT(ac.canteen_name , '/', ast.stall_name),
             count(distinct case when oi.mealtime_type = 1 then
                                     oi.user_id else null
                 end) as breakfast_user_count,