权限区分超市、食堂

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/hard/CurrentUserHardTypeInfoDto.java

@@ -0,0 +1,40 @@
+package com.bsd.pjcloud.hard.api.dto.hard;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CurrentUserHardTypeInfoDto {
+    /**
+     * 是否有查询食堂权限
+     */
+    private Boolean canteenView = false;
+    /**
+     * 是否有查询超市权限
+     */
+    private Boolean supermarket = false;
+
+    public boolean isAll() {
+        return this.getCanteenView() != null && this.getCanteenView() && this.getSupermarket() != null && this.getSupermarket();
+    }
+
+    /**
+     * 硬件类型集合
+     */
+    public List<String> getHardTypeList() {
+        List<String> list = new ArrayList<>();
+        if (isAll()) return list;
+        if (this.getCanteenView() != null && this.getCanteenView()) {
+            list.add(HardTypeEnum.CANTEEN.getType());
+        }
+        if (this.getSupermarket() != null && this.getSupermarket()) {
+            list.add(HardTypeEnum.SUPERMARKET.getType());
+        }
+        return list;
+    }
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java

@@ -23,6 +23,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private List<Long> hardIds;
 
+    private List<String> hardTypeCodes;
+
     private List<Long> mchIds;
 
     private List<String> orderStatusCodes;