feat:app上架员端

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/flow/HardDoorFlowEnum.java

@@ -18,7 +18,7 @@ public enum HardDoorFlowEnum {
     FLOW_CALLBACK_VIDEO("40", "智能柜视频回调", "50"),
     FLOW_SUBMIT_RECOGNITION("50", "旷世提交识别", "60"),
     FLOW_CALLBACK_RECOGNITION("60", "旷世识别响应", "70"),
-    FLOW_PAY_ORDER("60", "订单结算", null),
+    FLOW_PAY_ORDER("70", "订单结算", null),
     ;
     private final String type;
     private final String description;
@@ -31,9 +31,9 @@ public enum HardDoorFlowEnum {
 
     public static HardDoorFlowEnum getNextType(HardDoorFlowEnum type) {
         if (ObjectUtil.isEmpty(type)) return null;
-        String nextType = Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get().getNextType();
-        if (ObjectUtil.isEmpty(nextType)) return null;
-        return valueOfByType(nextType);
+        HardDoorFlowEnum currentFlow = valueOfByType(type.getType());
+        if (ObjectUtil.isEmpty(currentFlow) || ObjectUtil.isEmpty(currentFlow.getNextType())) return null;
+        return valueOfByType(currentFlow.getNextType());
     }
 
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/spu/HardSpuRepertoryTypeEnum.java

@@ -13,7 +13,7 @@ import java.util.Arrays;
 @Getter
 public enum HardSpuRepertoryTypeEnum {
     HANDLER("10", "手动上架"),
-    AUTO("20", "自动上架"),
+    PERSION("20", "上架员上架"),
     ;
     private final String type;
     private final String description;

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

@@ -0,0 +1,43 @@
+package com.bsd.pjcloud.hard.api.dto.spu;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+
+@Data
+public class DeductionSpuRepertoryDto {
+
+    /**
+     * 智能柜编号
+     */
+    @NotNull(message = "智能柜编号不能为空")
+    private Long hardDoorId;
+
+    /**
+     * 货柜编号
+     */
+    @NotNull(message = "货柜编号不能为空")
+    private String cabinetNo;
+
+    /**
+     * 上架数量
+     */
+    @NotEmpty(message = "商品列表不能为空")
+    private List<DeductionSpuRepertoryDto.Item> list;
+
+    @Data
+    public static class Item {
+
+        @NotNull(message = "商品id不能为空")
+        private Long hardSpuId;
+
+        @NotNull(message = "增加库存不能为空")
+        private Integer plusCount;
+
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.hard.api.dto.spu;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;

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

@@ -176,6 +176,12 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     @Schema(description = "sku识别主动获取时间")
     private LocalDateTime skuDrivingTime;
 
+    /**
+     * 支付时间
+     */
+    @Schema(description = "支付时间")
+    private LocalDateTime payTime;
+
     /**
      * 流程状态
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorManagerVo.java

@@ -2,12 +2,13 @@ package com.bsd.pjcloud.hard.api.vo.manager;
 
 import com.bsd.pjcloud.hard.api.entity.manager.HardDoorCabinetEntity;
 import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class HardDoorManagerVo extends HardDoorManagerEntity {
+public class HardDoorManagerVo extends HardDoorManagerEntity implements BaseHardInterface {
     /**
      * 硬件设备相关
      */
@@ -15,6 +16,8 @@ public class HardDoorManagerVo extends HardDoorManagerEntity {
 
     private String hardType;
 
+    private List<String> hardTypeCodes;
+
     private List<HardDoorCabinetEntity> cabinetList;
 
 }