Merge #146 into master from cc_20260520_declare_goods

fix:新增获取门店报货信息接口

* cc_20260520_declare_goods: (2 commits squashed)

  - fix:新增根据门店编码列表获取门店报货信息接口

  - fix:新增字段

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/146
This commit is contained in:
王非凡
2026-05-21 09:38:59 +00:00
committed by 正新
parent ca54dc5468
commit 3d31c69b5b
12 changed files with 293 additions and 5 deletions

View File

@@ -0,0 +1,21 @@
package com.cool.store.dto.store;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 报送货日期DTO
* </p>
*
* @author wangff
* @since 2026/5/20
*/
@Data
public class DeclareGoodsDateDTO {
@ApiModelProperty("报货日期")
private String declareGoods;
@ApiModelProperty("送货日期")
private String deliverGoods;
}

View File

@@ -267,4 +267,14 @@ public class StoreDO {
private String joinSupervision;
/**
* 报货类型 0-按周报货 1-按月报货 2-自提
*/
private Integer declareGoodsType;
/**
* 报送货日期 数组格式"[{"declareGoods": "","deliverGoods":""}]"
*/
private String declareGoodsDate;
}

View File

@@ -0,0 +1,100 @@
package com.cool.store.entity.store;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 门店扩展信息
* @author wangff
* @date 2025-09-16 02:37
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StoreExtendInfoDO implements Serializable {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("门店id")
private String storeId;
@ApiModelProperty("闭店原因")
private Integer closeReason;
@ApiModelProperty("闭店性质")
private Integer closeNature;
@ApiModelProperty("门头类型")
private String storefrontType;
@ApiModelProperty("最新装修日期")
private Date latestRenovateDate;
@ApiModelProperty("最新订货时间")
private Date latestOrderTime;
@ApiModelProperty("标签")
private String tags;
@ApiModelProperty("暂停营业原因")
private String closeUpReason;
@ApiModelProperty("外卖管理部门")
private String takeOutManageDept;
@ApiModelProperty("商圈类型")
private String businessType;
@ApiModelProperty("巡店难度")
private String patrolDifficulty;
@ApiModelProperty("巡店难度原因")
private String patrolDiffReason;
@ApiModelProperty("订货备注")
private String orderRemark;
@ApiModelProperty("积分")
private BigDecimal score;
@ApiModelProperty("是否重点关注")
private Integer isFocus;
@ApiModelProperty("重点关注原因")
private String focusReason;
@ApiModelProperty("私域二维码")
private String privateSphereQr;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("抬头类型")
private Integer invoiceType;
@ApiModelProperty("发票抬头")
private String invoiceTitle;
@ApiModelProperty("税号")
private String invoiceTin;
@ApiModelProperty("开始试营业日期")
private Date softOpenDate;
@ApiModelProperty("是否歇业中")
private Integer isCloseUp;
@ApiModelProperty("开业报备流程完成时间")
private Date openReportTime;
@ApiModelProperty("首次在营业状态时间(定时任务更新时间)")
private Date softOpenJobTime;
}

View File

@@ -0,0 +1,22 @@
package com.cool.store.request.store;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Size;
import java.util.List;
/**
* <p>
* 门店编码列表请求
* </p>
*
* @author wangff
* @since 2026/5/20
*/
@Data
public class StoreNumListRequest {
@ApiModelProperty("门店编码列表")
@Size(max = 100, message = "单次最多查询100条门店数据")
private List<String> storeNums;
}

View File

@@ -0,0 +1,39 @@
package com.cool.store.vo.store;
import com.cool.store.annotation.DictField;
import com.cool.store.dto.store.DeclareGoodsDateDTO;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* <p>
* 门店报货信息VO
* </p>
*
* @author wangff
* @since 2026/5/20
*/
@Data
public class StoreDeclareGoodsVO {
@ApiModelProperty("门店编码")
private String storeNum;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("报货类型 0-按周报货 1-按月报货 2-自提 3-按2周/次投货 4-按3周/次投货 5-外物流")
private Integer declareGoodsType;
@ApiModelProperty("报送货日期列表")
private List<DeclareGoodsDateDTO> declareGoodsDateList;
@JsonIgnore
private String businessTypeCode;
@ApiModelProperty("商圈类型")
@DictField(sourceField = "businessTypeCode")
private String businessType;
}