feat:旷世代码修改

2025-04-10 11:20:40 +08:00
1 parent 7818bea206
commit 6391df9983
@@ -0,0 +1,24 @@
+package com.bsd.pjcloud.hard.api.dto.spu;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class HardChangeVolume {
+
+    @NotNull(message = "设备id不能为空")
+    private Long hardId;
+
+    /**
+     * 系统音量
+     */
+    @NotNull(message = "系统音量不能为空")
+    private Integer systemVolume;
+
+    /**
+     * 媒体音量
+     */
+    @NotNull(message = "媒体音量不能为空")
+    private Integer mediaVolume;
+
+}
@@ -1,9 +0,0 @@
-package com.bsd.pjcloud.hard.api.dto.spu;
-
-import com.bsd.pjcloud.hard.api.entity.spu.HardKsSkuEntity;
-import lombok.Data;
-
-@Data
-public class HardKsSkuDto extends HardKsSkuEntity {
-    
-}
@@ -1,8 +0,0 @@
-package com.bsd.pjcloud.hard.api.dto.spu;
-
-import com.bsd.pjcloud.hard.api.entity.spu.HardKsSkuJoinEntity;
-import lombok.Data;
-
-@Data
-public class HardKsSkuJoinDto extends HardKsSkuJoinEntity {
-}
@@ -1,13 +1,22 @@
 package com.bsd.pjcloud.hard.api.dto.spu;

 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 import java.time.LocalDateTime;
+import java.util.List;

@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class HardSpuDto extends HardSpuEntity {

+    private List<Long> spuIdList;
+
    private LocalDateTime[] createTimeList;

 }
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.dto.spu;
+
+import com.bsd.pjcloud.hard.api.entity.spu.HardSpuJoinEntity;
+import lombok.Data;
+
+@Data
+public class HardSpuJoinDto extends HardSpuJoinEntity {
+}
@@ -1,130 +0,0 @@
-package com.bsd.pjcloud.hard.api.entity.spu;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.bsd.pjcloud.common.core.util.TenantTable;
-import java.time.LocalDateTime;
-
-/**
- * 商品
- */
-@Data
-@TenantTable
-@TableName("hard_ks_sku")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "商品")
-public class HardKsSkuEntity extends Model<HardKsSkuEntity> {
-
-
-	/**
-	* 编号
-	*/
-    @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="编号")
-    private Long id;
-
-	/**
-	* 该字段为超级收银员平台的商品ID
-	*/
-    @Schema(description="该字段为超级收银员平台的商品ID")
-    private String ksSkuId;
-
-	/**
-	* 69码
-	*/
-    @Schema(description="69码")
-    private String barcode;
-
-	/**
-	* 商品名称
-	*/
-    @Schema(description="商品名称")
-    private String skuName;
-
-	/**
-	* 业务方sku_id
-	*/
-    @Schema(description="业务方sku_id")
-    private String skuId;
-
-	/**
-	* 商品主图缩略图url，尺寸300*300px
-	*/
-    @Schema(description="商品主图缩略图url，尺寸300*300px")
-    private String cover;
-
-	/**
-	* sku类型：0：标准库 1：私有库
-	*/
-    @Schema(description="sku类型：0：标准库 1：私有库")
-    private String skuType;
-
-	/**
-	* 该字段为SKU所对应的规格，包含口味、容量、重量，taste表示口味，capacity表示容量，单位：ml，weight表示重量，单位：g
-	*/
-    @Schema(description="该字段为SKU所对应的规格，包含口味、容量、重量，taste表示口味，capacity表示容量，单位：ml，weight表示重量，单位：g")
-    private String specs;
-
-	/**
-	* 是否为集合SKU
-	*/
-    @Schema(description="是否为集合SKU")
-    private String hasSubSku;
-
-	/**
-	* 集合SKU的子SKU信息
-	*/
-    @Schema(description="集合SKU的子SKU信息")
-    private String subSku;
-
-	/**
-	* sku审核状态
-	*/
-    @Schema(description="sku审核状态")
-    private String checkStatus;
-
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建人")
-    private String createBy;
-
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建时间")
-    private LocalDateTime createTime;
-
-	/**
-	* 修改人
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改人")
-    private String updateBy;
-
-	/**
-	* 修改时间
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改时间")
-    private LocalDateTime updateTime;
-
-	/**
-	* 删除标记
-	*/
-    @TableLogic
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="删除标记")
-    private String delFlag;
-
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
-    private Long tenantId;
-}
@@ -1,83 +0,0 @@
-package com.bsd.pjcloud.hard.api.entity.spu;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.bsd.pjcloud.common.core.util.TenantTable;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDateTime;
-
-/**
- * 旷世商品绑定
- */
-@Data
-@TenantTable
-@TableName("hard_ks_sku_join")
-@EqualsAndHashCode(callSuper = true)
-@Schema(description = "旷世商品绑定")
-public class HardKsSkuJoinEntity extends Model<HardKsSkuJoinEntity> {
-
-
-	/**
-	* 编号
-	*/
-    @TableId(type = IdType.ASSIGN_ID)
-    @Schema(description="编号")
-    private Long id;
-
-	/**
-	* 该字段为超级收银员平台的商品ID
-	*/
-    @Schema(description="该字段为超级收银员平台的商品ID")
-    private String ksSkuId;
-
-	/**
-	* 硬件柜子id
-	*/
-    @Schema(description="硬件柜子id")
-    private String hardDoorId;
-
-	/**
-	* 创建人
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建人")
-    private String createBy;
-
-	/**
-	* 创建时间
-	*/
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="创建时间")
-    private LocalDateTime createTime;
-
-	/**
-	* 修改人
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改人")
-    private String updateBy;
-
-	/**
-	* 修改时间
-	*/
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-    @Schema(description="修改时间")
-    private LocalDateTime updateTime;
-
-	/**
-	* 删除标记
-	*/
-    @TableLogic
-	@TableField(fill = FieldFill.INSERT)
-    @Schema(description="删除标记")
-    private String delFlag;
-
-	/**
-	* 租户ID
-	*/
-    @Schema(description="租户ID")
-    private Long tenantId;
-}
@@ -39,18 +39,6 @@ public class HardSpuCategoryEntity extends Model<HardSpuCategoryEntity> {
    @Schema(description = "排序")
    private Integer sort;

-    /**
-     * 商户id
-     */
-    @Schema(description = "商户id")
-    private Long mchId;
-
-    /**
-     * 商户部门id
-     */
-    @Schema(description = "商户部门id")
-    private Long mchDeptId;
-
    /**
     * 创建人
     */
@@ -2,7 +2,11 @@ package com.bsd.pjcloud.hard.api.entity.spu;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.hard.api.constant.spu.HardKsSkuTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.bsd.pjcloud.common.core.util.TenantTable;
@@ -31,12 +35,14 @@ public class HardSpuEntity extends Model<HardSpuEntity> {
     * 商品分类id
     */
    @Schema(description = "商品分类id")
+    @NotNull(message = "分类不能为空")
    private Long spuCategoryId;

    /**
     * 商品名
     */
    @Schema(description = "商品名")
+    @NotEmpty(message = "商品名不能为空")
    private String name;

    /**
@@ -49,6 +55,8 @@ public class HardSpuEntity extends Model<HardSpuEntity> {
     * 单价(分)
     */
    @Schema(description = "单价(分)")
+    @NotNull(message = "单价不能为空")
+    @Min(value = 1, message = "单价不能小于0")
    private Integer price;

    /**
@@ -81,6 +89,49 @@ public class HardSpuEntity extends Model<HardSpuEntity> {
    @Schema(description = "是否为标品")
    private String isDefault;

+    /**
+     * 规格-口味
+     */
+    @Schema(description = "规格-口味")
+    private String specsTaste;
+
+    /**
+     * 规格-口味
+     */
+    @Schema(description = "规格-容量")
+    private String specsCapacity;
+
+    /**
+     * 规格-口味
+     */
+    @Schema(description = "规格-重量")
+    private String specsWeight;
+
+    /**
+     * sku类型,0:标准库;1:私有库
+     * @see HardKsSkuTypeEnum
+     */
+    @Schema(description = "sku类型,0:标准库;1:私有库")
+    private String skuType;
+
+    /**
+     * 69码
+     */
+    @Schema(description = "69码")
+    private String ksBarcode;
+
+    /**
+     * 是否为集合SKU
+     */
+    @Schema(description = "'是否为集合SKU")
+    private String ksHasSubSku;
+
+    /**
+     * 是否为集合SKU
+     */
+    @Schema(description = "是否为集合SKU")
+    private String ksSubSku;
+
    /**
     * 旷世审核状态
     */
@@ -99,30 +150,6 @@ public class HardSpuEntity extends Model<HardSpuEntity> {
    @Schema(description = "旷世审核状态描述")
    private String ksComments;

-    /**
-     * 设备id
-     */
-    @Schema(description = "设备id")
-    private Long hardId;
-
-    /**
-     * 商品放置层数
-     */
-    @Schema(description = "商品放置层数")
-    private Long hardDoorNumber;
-
-    /**
-     * 商户id
-     */
-    @Schema(description = "商户id")
-    private Long mchId;
-
-    /**
-     * 商户部门id
-     */
-    @Schema(description = "商户部门id")
-    private Long mchDeptId;
-
    /**
     * 创建人
     */
@@ -0,0 +1,95 @@
+package com.bsd.pjcloud.hard.api.entity.spu;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 柜子商品绑定
+ */
+@Data
+@TenantTable
+@TableName("hard_spu_join")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "旷世商品绑定")
+public class HardSpuJoinEntity extends Model<HardSpuJoinEntity> {
+
+
+    /**
+     * 编号
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "编号")
+    private Long id;
+
+    /**
+     * 该字段为超级收银员平台的商品ID
+     */
+    @Schema(description = "该字段为超级收银员平台的商品ID")
+    private Long spuId;
+
+    /**
+     * 柜门编号
+     */
+    @Schema(description = "柜门编号")
+    private String cabinetNo;
+
+    /**
+     * 硬件柜子id
+     */
+    @Schema(description = "硬件柜子id")
+    private Long hardDoorId;
+
+    /**
+     * 放置层数
+     */
+    @Schema(description = "放置层数")
+    private Integer hardDoorNumber;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标记
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
+    private String delFlag;
+
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
+    private Long tenantId;
+}
@@ -1,9 +0,0 @@
-package com.bsd.pjcloud.hard.api.vo.spu;
-
-import com.bsd.pjcloud.hard.api.entity.spu.HardKsSkuJoinEntity;
-import lombok.Data;
-
-@Data
-public class HardKsSkuJoinVo extends HardKsSkuJoinEntity {
-
-}
@@ -1,9 +0,0 @@
-package com.bsd.pjcloud.hard.api.vo.spu;
-
-import com.bsd.pjcloud.hard.api.entity.spu.HardKsSkuEntity;
-import lombok.Data;
-
-@Data
-public class HardKsSkuVo extends HardKsSkuEntity {
-
-}
@@ -0,0 +1,14 @@
+package com.bsd.pjcloud.hard.api.vo.spu;
+
+import com.bsd.pjcloud.hard.api.entity.spu.HardSpuJoinEntity;
+import lombok.Data;
+
+@Data
+public class HardSpuJoinVo extends HardSpuJoinEntity {
+
+    /**
+     * 商品相关
+     */
+    private HardSpuVo spuDetail;
+
+}
@@ -25,7 +25,6 @@ public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMc
     */
    private String spuCategoryName;

-
    /**
     * 商户相关
     */
@@ -6,26 +6,10 @@ import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;

@Data
-public class HardSpuVo extends HardSpuEntity implements BaseMchInterface, BaseHardInterface {
+public class HardSpuVo extends HardSpuEntity {
    /**
     * 分类相关
     */
    private String categoryName;

-    /**
-     * 商户相关
-     */
-    private Long merchantId;
-
-    private String merchantName;
-
-    private String logoPic;
-
-    /**
-     * 设备相关
-     */
-    private String hardName;
-
-    private String hardType;
-
 }