Merge #3 into master from cc_20251114_minor_req

fix:门店日营销数据

* cc_20251114_minor_req: (3 commits squashed)

  - fix:门店日营销数据

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

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

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/3
This commit is contained in:
王非凡
2025-12-04 09:48:19 +00:00
committed by 苏竹红
parent e57f8c7925
commit edbec8d8c1
10 changed files with 93 additions and 0 deletions

View File

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

View File

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

View File

@@ -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;
}

View File

@@ -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;
}

View File

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

View File

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