diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/Project3XEntity.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/Project3XEntity.java new file mode 100644 index 000000000..6404f3d31 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/Project3XEntity.java @@ -0,0 +1,169 @@ +package com.cool.store.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class Project3XEntity { + + /** + * projectNo 门店编码 + */ + @JsonProperty("projectNo") + private String projectNo; + + /** + * name 店名 + */ + @JsonProperty("name") + private String name; + + + /** + * field13__c 门店属性 + * 新开店:o1 + * 老店翻新:o2 + * 老店新开:o5 + * 迁址:option46 + * 二次设计:o3 + * 维修改造: o4 + */ + @JsonProperty("field13__c") + private Field13__c field13__c; + + /** + * field124__c 所属片区 + */ + @JsonProperty("field124__c") + private Field124__c field124__c; + + + /** + * field94__c 所属督导 + */ + @JsonProperty("field94__c") + private String field94__c; + + + /** + * field5__c 联系人 (老板) + */ + @JsonProperty("field5__c") + private String field5__c; + + /** + * field62__c 联系人手机号 + */ + @JsonProperty("field62__c") + private String field62__c; + + /** + * field123__c 品牌 + * 正新鸡排:option486 + * 正烧记:option488 + * 茂掌柜:option490 + * 正新三明治:option622 + * 大鼓米线:option624 + * 串小妹:option626 + */ + @JsonProperty("field123__c") + private Field123__c field123__c; + + + /** + * field4__c 督导手机号 + */ + @JsonProperty("field4__c") + private String field4__c; + + /** + * street 详细地址 + */ + @JsonProperty("street") + private String street; + + + /** + * field8__c 是否已收设计费 + * 是:option44 + * 否:option45 + */ + @JsonProperty("field8__c") + private Field8__c field8__c; + +} + +/** + * field123__c 对象 + */ +@Data +class Field123__c { + @JsonProperty("defaultItem") + private Boolean defaultItem; + + @JsonProperty("id") + private String id; + + @JsonProperty("label") + private String label; + + @JsonProperty("name") + private String name; + + @JsonProperty("path") + private String path; +} + +/** + * field124__c 对象 + */ +@Data +class Field124__c { + @JsonProperty("code") + private String code; + + @JsonProperty("bizType") + private String bizType; + + @JsonProperty("metaName") + private String metaName; + + @JsonProperty("name") + private String name; +} + +/** + * field8__c 对象 + */ +@Data +class Field8__c { + @JsonProperty("defaultItem") + private Boolean defaultItem; + + @JsonProperty("id") + private String id; + + @JsonProperty("label") + private String label; + + @JsonProperty("name") + private String name; +} + +/** + * field13__c 对象 + */ +@Data +class Field13__c { + @JsonProperty("defaultItem") + private Boolean defaultItem; + + @JsonProperty("id") + private String id; + + @JsonProperty("label") + private String label; + + @JsonProperty("name") + private String name; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java index 75b82f187..56fbf08fe 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java @@ -23,11 +23,11 @@ public class HqtDecorationAcceptanceRequest { private String deliveryOrderId; @NotEmpty(message = "验收单不能为空") private List acceptanceAttachmentUrl; - @NotBlank(message = "门店门头照不能为空") + @NotEmpty(message = "门店门头照不能为空") private List shopDoorwayPhotoUrl; - @NotBlank(message = "门店内景照不能为空") + @NotEmpty(message = "门店内景照不能为空") private List shopInteriorPhotoUrl; - @NotBlank(message = "门店后厨照不能为空") + @NotEmpty(message = "门店后厨照不能为空") private List backKitchenPhotoUrl; @NotNull(message = "验收日期不能为空") private Date actualAcceptanceTime;