feat:是被食堂，线上线下订单

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

@@ -8,6 +8,8 @@ import java.util.List;
 @Data
 public class HardManagerDto extends HardManagerEntity {
 
+    private List<Long> ids;
+
     private List<Long> deptIds;
 
     private List<Long> merchantIds;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java

@@ -1,20 +1,17 @@
 package com.bsd.pjcloud.hard.api.utils;
 
 import cn.hutool.core.codec.Base64;
-import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
-import com.bsd.pjcloud.admin.api.entity.SysDept;
-import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.hard.api.dto.code.QRCodeDto;
+import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
 import com.bsd.pjcloud.hard.api.vo.base.BaseOrderInterface;
-import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
-import javax.xml.stream.events.StartDocument;
 import java.util.List;
 import java.util.Map;
 
@@ -70,4 +67,16 @@ public class HardUtil {
         return v;
     }
 
+    public <T extends BaseHardInterface> List<T> convertHardList(List<T> list, Map<Long, HardManagerEntity> map) {
+        return CollectionUtils.convertList(list, v -> convertHard(v, map.get(v.getHardId())));
+    }
+
+    public <T extends BaseHardInterface> T convertHard(T v, HardManagerEntity entity) {
+        if (ObjectUtil.isEmpty(entity)) return v;
+        v.setHardId(entity.getId());
+        v.setHardName(entity.getName());
+        v.setHardType(entity.getType());
+        return v;
+    }
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/base/BaseHardInterface.java

@@ -0,0 +1,17 @@
+package com.bsd.pjcloud.hard.api.vo.base;
+
+public interface BaseHardInterface {
+
+    Long getHardId();
+
+    void setHardId(Long hardId);
+
+    String getHardName();
+
+    void setHardName(String hardName);
+
+    String getHardType();
+
+    void setHardType(String hardType);
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java

@@ -3,6 +3,7 @@ package com.bsd.pjcloud.hard.api.vo.order;
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
 import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
 import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity;
 import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
@@ -10,7 +11,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, BaseDeptInterface, BaseMchInterface {
+public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, BaseDeptInterface, BaseMchInterface, BaseHardInterface {
     /**
      * 用户相关
      */