Merge branch 'master' into cc_20250520_point

This commit is contained in:
shuo.wang
2025-05-21 19:32:33 +08:00
32 changed files with 660 additions and 167 deletions

View File

@@ -0,0 +1,14 @@
package com.cool.store.dto;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/5/13 17:02
* @Version 1.0
*/
@Data
public class FoodTokenDTO {
private String mobile ;
}

View File

@@ -0,0 +1,31 @@
package com.cool.store.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/5/13 10:56
* @Version 1.0
*/
@Data
public class StoreDTO {
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("门店CODE")
private String storeCode;
@ApiModelProperty("店长手机号")
private String managerPhone;
@ApiModelProperty("签约人1姓名")
private String signer1Name;
@ApiModelProperty("签约人2手机号")
private String signer1Phone;
@ApiModelProperty("签约人2姓名")
private String signer2Name;
@ApiModelProperty("签约人2手机号")
private String signer2Phone;
@ApiModelProperty("订单小程序名称")
private String orderMiniProgramName;
}

View File

@@ -0,0 +1,18 @@
package com.cool.store.request;
import lombok.Data;
/**
* @Author suzhuhong
* @Date 2025/5/13 11:08
* @Version 1.0
*/
@Data
public class OpenApiStoreRequest {
private Integer pageSize;
private Integer pageNum;
}

View File

@@ -16,6 +16,8 @@ public class MiniShopsResponse {
private String shopName;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("云流水编码")
private String ylsCode;
@ApiModelProperty("店铺详细地址")
private String detailAddress;
}

View File

@@ -3,6 +3,7 @@ package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -45,6 +46,7 @@ public class BaseInfoVO {
@ApiModelProperty("加盟模式")
private Integer joinMode;
public BaseInfoVO(){}
/**
* 写一个构造方法 参数是BaseInfoVO

View File

@@ -20,6 +20,8 @@ public class IntendPendingVO extends BaseInfoVO {
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
private Date updateTime;
public IntendPendingVO(){}
public IntendPendingVO(BaseInfoVO baseInfoVO) {

View File

@@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/1 16:37
@@ -14,7 +16,7 @@ public class PayStagePendingVO extends BaseInfoVO {
@ApiModelProperty("缴费时间 2024年04月23日 16:00")
private String payTime;
private Date updateTime;
public PayStagePendingVO(){};
public PayStagePendingVO(BaseInfoVO baseInfoVO) {

View File

@@ -4,6 +4,8 @@ import com.cool.store.vo.BaseInfoVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/1 16:55
@@ -14,6 +16,7 @@ public class SigningPendingVO extends BaseInfoVO {
@ApiModelProperty("提交时间 2024年04月23日 16:00")
private String submitTime;
private Date updateTime;
public SigningPendingVO(){};