Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/pc/store/domain/dto/StoreCreateRequest.java

@@ -6,6 +6,9 @@
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;

@@ -20,71 +23,59 @@
    @ApiModelProperty(value = "店铺简称", example = "永辉超市(新纪元店)")
    private String storeShortName;*/

    @NotBlank
    @NotNull
    @ApiModelProperty(value = "店铺LOGO文件ID", example = "14567785444763247876234")
    private Long logoUploadFileId;

    /*@NotBlank
    @ApiModelProperty(value = "店铺门户图片ID", example = "276409837458893793939")
    private Long coverUploadFileId;*/
    private Long coverUploadFileId;

    @NotBlank
    @ApiModelProperty(value = "平台类目ID", example = "29784639387324848347230")
    private Long platformCategoryId;
    //private String businessCategory;

    @NotBlank
    @ApiModelProperty(value = "简介", example = "")
    @ApiModelProperty(value = "简介", example = " ")
    private String description;

    @NotBlank
    @ApiModelProperty(value = "店铺联系电话", example = "13800000001")
    private String contactPhone;

    @ApiModelProperty(value = "营业开始时间", example = "08:00")
    private LocalTime openTime;

    @ApiModelProperty(value = "营业结束时间", example = "22:00")
    private LocalTime closeTime;

    @NotBlank
    @ApiModelProperty(value = "店铺地址", example = "276409837458893793939")
    private String address;

    @NotBlank
    @NotNull
    @ApiModelProperty(value = "店铺坐标经度", example = "121.505978")
    private Double longitude;

    @NotBlank
    @NotNull
    @ApiModelProperty(value = "店铺坐标纬度", example = "31.144515")
    private Double latitude;

    @ApiModelProperty(value = "店铺资质", example = "")
    private List<StoreQualificationCreateRequest> qualificationList;
    @ApiModelProperty(value = "营业半径(米)")
    private Integer radius;

    @ApiModelProperty(value = "是否支持退货")
    private Integer returns;

    @ApiModelProperty(value = "是否支持自提")
    private Integer selfPickup;

    @ApiModelProperty(value = "包装费用")
    private BigDecimal packagingFee;

    @ApiModelProperty(value = "店铺资质", example = "[]")
    private List<StoreQualificationCreateRequest> qualificationList = new ArrayList<>();

    public boolean hasQualificationList() {
        return CollUtil.isNotEmpty(this.qualificationList);
    }

    public static void main(String[] args) {
        StoreCreateRequest request = new StoreCreateRequest();
        request.setStoreName("上海三林小学");
        request.setLogoUploadFileId(1L);
        request.setDescription("");
        // request.setCoverUploadFileId(1L);
        request.setPlatformCategoryId(1L);
        request.setContactPhone("13599873421");
        request.setAddress("上海");
        request.setLongitude(121.505978D);
        request.setLatitude(31.144515D);

        List<StoreQualificationCreateRequest> qualificationList = new ArrayList<>();
        StoreQualificationCreateRequest sq1 = new StoreQualificationCreateRequest();
        sq1.setType(10001);
        // sq1.setName("营业执照");
        sq1.setImageUploadFileId("");
        qualificationList.add(sq1);
        StoreQualificationCreateRequest sq2 = new StoreQualificationCreateRequest();
        sq2.setType(10002);
        // sq2.setName("许可证");
        sq2.setImageUploadFileId("");
        qualificationList.add(sq2);
        request.setQualificationList(qualificationList);
        System.out.println(JSONUtil.toJsonStr(request));
    }

}