Merge remote-tracking branch 'origin/master'

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/LaunchDataDTO.java

@@ -18,4 +18,7 @@ public class LaunchDataDTO {
     
     @ApiModelProperty("上新时间，yyyy-MM-dd")
     private String upSaleDate;
+
+    @ApiModelProperty("")
+    private String upSaleTime;
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java

@@ -40,5 +40,8 @@ public class RevenueDataDTO {
     @ApiModelProperty("菜品列表")
     private List<LaunchDataDTO> otherRecipeLaunchDates;
 
+    @ApiModelProperty("下架")
+    private List<LaunchDataDTO> otherDownDates;
+
 
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/SalesVolumeDayQueryDTO.java

@@ -0,0 +1,25 @@
+package com.cool.store.dto.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 门店日销量查询DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/3
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SalesVolumeDayQueryDTO {
+    @ApiModelProperty("日期，yyyy-MM-dd")
+    private String businessDate;
+
+    @ApiModelProperty("门店编码")
+    private String storeCode;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/menu/MiniMenuConfigDO.java

@@ -0,0 +1,34 @@
+package com.cool.store.entity.menu;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+/**
+ * 小程序菜单配置
+ */
+@Table(name = "zxjp_mini_menu_config")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class MiniMenuConfigDO {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 角色id
+     */
+    @Column(name = "role_id")
+    private Long roleId;
+
+    /**
+     * 菜单
+     */
+    @Column(name = "menu_id")
+    private Long menuId;
+}

coolstore-partner-model/src/main/java/com/cool/store/entity/menu/MiniMenuDO.java

@@ -0,0 +1,26 @@
+package com.cool.store.entity.menu;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+@Table(name = "zxjp_mini_menu")
+@Data
+public class MiniMenuDO {
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * key
+     */
+    private String menuKey;
+}

coolstore-partner-model/src/main/java/com/cool/store/request/recipe/SalesVolumeDayRequest.java

@@ -0,0 +1,25 @@
+package com.cool.store.request.recipe;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ * 门店日销量Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/3
+ */
+@Data
+public class SalesVolumeDayRequest {
+    @ApiModelProperty("日期，yyyy-MM-dd")
+    @NotBlank(message = "日期不能为空")
+    private String businessDate;
+
+    @ApiModelProperty("门店id")
+    @NotBlank(message = "门店id不能为空")
+    private String storeId;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MiniMenuConfigVO.java

@@ -0,0 +1,19 @@
+package com.cool.store.vo.menu;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 小程序菜单配置VO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/10/31
+ */
+@Data
+public class MiniMenuConfigVO {
+
+    @ApiModelProperty("菜单key")
+    private String menuKey;
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/LaunchDataVO.java

@@ -18,4 +18,7 @@ public class LaunchDataVO {
 
     @ApiModelProperty("上新时间，yyyy-MM-dd")
     private String upSaleDate;
+
+    @ApiModelProperty("")
+    private String upSaleTime;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

@@ -34,6 +34,9 @@ public class RevenueDataVO {
     @ApiModelProperty("菜品列表")
     private List<LaunchDataVO> otherRecipeLaunchDates;
 
+    @ApiModelProperty("下架")
+    private List<LaunchDataVO> otherDownDates;
+
     @ApiModelProperty("外卖实收")
     private BigDecimal takeoutReceivedAmt;