feat:正元余额不足

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

@@ -1,7 +1,6 @@
 package com.bsd.pjcloud.hard.api.dto.hard;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -29,10 +28,11 @@ public class CurrentUserHardTypeInfoDto {
         List<String> list = new ArrayList<>();
         if (isAll()) return list;
         if (this.getCanteenView() != null && this.getCanteenView()) {
-            list.add(HardTypeEnum.CANTEEN.getType());
+            list.add(MerchantTypeEnum.CANTEEN.getType());
         }
         if (this.getSupermarket() != null && this.getSupermarket()) {
-            list.add(HardTypeEnum.SUPERMARKET.getType());
+            list.add(MerchantTypeEnum.SELF_SUPERMARKET.getType());
+            list.add(MerchantTypeEnum.CANTEEN.getType());
         }
         return list;
     }

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

@@ -23,12 +23,12 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private List<Long> hardIds;
 
-    private List<String> hardTypeCodes;
-
     private String hardTypeCode;
 
     private List<Long> mchIds;
 
+    private List<String> mchTypeCodes;
+
     private List<String> orderStatusCodes;
 
     private LocalDate[] createTimeList;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java

@@ -56,6 +56,13 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
     @Schema(description = "商户id")
     private Long merchantId;
 
+    /**
+     * 商户类型
+     */
+    @Schema(description = "商户类型")
+    private String merchantType;
+
+
     /**
      * 设备id
      */

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

@@ -40,6 +40,8 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, B
 
     private String hardType;
 
+    private List<String> hardTypeCodes;
+
     /**
      * 购物车
      */