Merge #102 into master from cc_20260414_invoice

开票管理

* cc_20260414_invoice: (6 commits squashed)

  - fix:门店开票信息

  - fix:新增企业开票校验接口;闭店列表新增筛选条件

  - fix

  - Merge branch 'master' into cc_20260414_invoice

  - Merge remote-tracking branch 'origin/cc_20260414_invoice' into cc_20260414_invoice
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

  - Merge branch 'master' into cc_20260414_invoice
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java

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/102
This commit is contained in:
王非凡
2026-04-17 08:53:50 +00:00
committed by 正新
parent 7102127358
commit 8c4f55ab20
14 changed files with 120 additions and 3 deletions

View File

@@ -214,4 +214,23 @@ public class BuildInformationDO {
@Column(name = "juridical_is_same_partner")
private Boolean juridicalIsSamePartner;
// ===== 开票信息 =====
/**
* 抬头类型
*/
@Column(name = "invoice_type")
private Integer invoiceType;
/**
* 发票抬头
*/
@Column(name = "invoice_title")
private String invoiceTitle;
/**
* 税号
*/
@Column(name = "invoice_tin")
private String invoiceTin;
}

View File

@@ -178,6 +178,15 @@ public class BuildInformationRequest {
@ApiModelProperty(value = "详细地址" )
private String addresseeAddress;
@ApiModelProperty("抬头类型")
private Integer invoiceType;
@ApiModelProperty("发票抬头")
private String invoiceTitle;
@ApiModelProperty("税号")
private String invoiceTin;
public BuildInformationDO toDO(){
BuildInformationDO buildInformationDO = new BuildInformationDO();
buildInformationDO.setShopId(this.shopId);
@@ -210,6 +219,9 @@ public class BuildInformationRequest {
buildInformationDO.setCShopName(this.miniProgramsShopName);
buildInformationDO.setSettlerIsSamePartner(this.settlerIsSamePartner);
buildInformationDO.setJuridicalIsSamePartner(this.juridicalIsSamePartner);
buildInformationDO.setInvoiceType(this.invoiceType);
buildInformationDO.setInvoiceTitle(this.invoiceTitle);
buildInformationDO.setInvoiceTin(this.invoiceTin);
return buildInformationDO;
}

View File

@@ -125,6 +125,15 @@ public class StoreMasterDTO {
*/
private String storeTypeName;
@ApiModelProperty("抬头类型")
private Integer invoiceType;
@ApiModelProperty("发票抬头")
private String invoiceTitle;
@ApiModelProperty("税号")
private String invoiceTin;
@Data
public static class SignerInfo {
@ApiModelProperty("签约人1姓名")

View File

@@ -48,4 +48,7 @@ public class CloseStoreQueryRequest extends PageBasicInfo {
@ApiModelProperty(value = "所属品牌列表", hidden = true)
private List<Integer> joinBrands;
@ApiModelProperty("区域id")
private Long regionId;
}

View File

@@ -212,4 +212,13 @@ public class BuildInformationResponse {
@ApiModelProperty("订货备注")
private String orderRemark;
@ApiModelProperty("抬头类型")
private Integer invoiceType;
@ApiModelProperty("发票抬头")
private String invoiceTitle;
@ApiModelProperty("税号")
private String invoiceTin;
}