Merge #11 into master from cc_20251114_minor_req

fix:数据看板日营业数据字段修改

* cc_20251114_minor_req: (8 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch 'master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #	coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

  - fix:数据看板日营业数据字段修改

  - fix:根据手机号获取门店列表 开放接口

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/11

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

@@ -21,4 +21,7 @@ public class LaunchDataDTO {
 
     @ApiModelProperty("")
     private String upSaleTime;
+
+    @ApiModelProperty("服务包类型")
+    private String type;
 }

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

@@ -33,6 +33,9 @@ public class RevenueDataDTO {
 
     @ApiModelProperty("营业时间，yyyy-MM-dd")
     private String businessDate;
+    
+    @ApiModelProperty("营业时间")
+    private String businessTime;
 
     @ApiModelProperty("服务包列表")
     private List<LaunchDataDTO> otherLaunchDates;

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

@@ -20,6 +20,12 @@ public class SalesVolumeDayQueryDTO {
     @ApiModelProperty("日期，yyyy-MM-dd")
     private String businessDate;
 
+    @ApiModelProperty("开始日期")
+    private String businessDateFrom;
+
+    @ApiModelProperty("结束日期")
+    private String businessDateTo;
+
     @ApiModelProperty("门店编码")
     private String storeCode;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/openapi/ShopListRequest.java

@@ -0,0 +1,24 @@
+package com.cool.store.request.openapi;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ * 门店列表Request
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/12/11
+ */
+@Data
+public class ShopListRequest {
+    @ApiModelProperty("手机号")
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    @ApiModelProperty("门店id")
+    private Long shopId;
+}

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

@@ -16,9 +16,14 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class SalesVolumeDayRequest {
     @ApiModelProperty("日期，yyyy-MM-dd")
-    @NotBlank(message = "日期不能为空")
     private String businessDate;
 
+    @ApiModelProperty("开始日期")
+    private String businessDateFrom;
+
+    @ApiModelProperty("结束日期")
+    private String businessDateTo;
+
     @ApiModelProperty("门店id")
     @NotBlank(message = "门店id不能为空")
     private String storeId;

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

@@ -21,4 +21,7 @@ public class LaunchDataVO {
 
     @ApiModelProperty("")
     private String upSaleTime;
+
+    @ApiModelProperty("服务包类型")
+    private String type;
 }

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

@@ -28,6 +28,9 @@ public class RevenueDataVO {
     @ApiModelProperty("营业时间，yyyy-MM-dd")
     private String businessDate;
 
+    @ApiModelProperty("营业时间")
+    private String businessTime;
+
     @ApiModelProperty("服务包列表")
     private List<LaunchDataVO> otherLaunchDates;