From 10f1422bc8f401b06b1e55ee63b23016d74abce8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 二月 2024 11:34:09 +0800
Subject: [PATCH] 优化商户发券逻辑
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopHFTXAuthDto.java | 127 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 59 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopHFTXAuthDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopHFTXAuthDto.java
index d8c1d91..8dc9988 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopHFTXAuthDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopHFTXAuthDto.java
@@ -15,127 +15,136 @@
*/
@Data
public class MgtShopHFTXAuthDto extends MgtBaseDto {
+ @ApiModelProperty(value = "商户id", dataType = "long", required = true)
+ private Long shopId;
@ApiModelProperty(value = "进件类型（1=用户，2=企业）", dataType = "int", required = true)
private Integer type;
@ApiModelProperty(value = "商户名称", dataType = "string", required = true)
- private String reg_name;
+ private String regName;
@ApiModelProperty(value = "商户简称", dataType = "string", required = true)
- private String short_name;
+ private String shortName;
@ApiModelProperty(value = "公司类型（1：政府机构，2：国营企业，3：私营企业，4：外资企业，5：个体工商户，7：事业单位）", dataType = "string", required = true)
- private String ent_type;
+ private String entType;
@ApiModelProperty(value = "营业执照编号", dataType = "string", required = true)
- private String license_code;
+ private String licenseCode;
@ApiModelProperty(value = "营业执照有效期类型（0：非长期有效 ,1：长期有效）", dataType = "string", required = true)
- private String license_validity_type;
+ private String licenseValidityType;
@ApiModelProperty(value = "营业执照有效期开始日期（日期格式：yyyyMMdd）", dataType = "string", required = true)
- private String license_begin_date;
+ private String licenseBeginDate;
@ApiModelProperty(value = "营业执照有效期截止日期（日期格式：yyyyMMdd，当license_validity_type=0时必填 ;当license_validity_type=1时为空）", dataType = "string", required = true)
- private String license_end_date;
+ private String licenseEndDate;
@ApiModelProperty(value = "注册省（示例值：310000）", dataType = "string", required = true)
- private String reg_prov_id;
- @ApiModelProperty(value = "注册省（注册市：310000）", dataType = "string", required = true)
- private String reg_area_id;
+ private String regProvId;
+ @ApiModelProperty(value = "注册市（示例值：310000）", dataType = "string", required = true)
+ private String regAreaId;
@ApiModelProperty(value = "注册区（示例值：310000）", dataType = "string", required = true)
- private String reg_district_id;
+ private String regDistrictId;
@ApiModelProperty(value = "注册详细地址", dataType = "string", required = true)
- private String reg_detail;
+ private String regDetail;
@ApiModelProperty(value = "法人姓名", dataType = "string", required = true)
- private String legal_name;
+ private String legalName;
@ApiModelProperty(value = "法人证件类型", dataType = "string", required = true)
- private String legal_cert_type;
+ private String legalCertType;
@ApiModelProperty(value = "法人证件号码", dataType = "string", required = true)
- private String legal_cert_no;
+ private String legalCertNo;
@ApiModelProperty(value = "法人证件有效期类型（1：长期有效；0：非长期有效 ）", dataType = "string", required = true)
- private String legal_cert_validity_type;
+ private String legalCertValidityType;
@ApiModelProperty(value = "法人证件有效期开始日期（日期格式：yyyyMMdd，以北京时间为准）", dataType = "string", required = true)
- private String legal_cert_begin_date;
+ private String legalCertBeginDate;
@ApiModelProperty(value = "法人证件有效期截止日期（日期格式：yyyyMMdd，当legal_cert_validity_type=0时必填 ；当legal_cert_validity_type=1时为空 ）", dataType = "string", required = true)
- private String legal_cert_end_date;
+ private String legalCertEndDate;
@ApiModelProperty(value = "经营省", dataType = "string", required = true)
- private String prov_id;
+ private String provId;
@ApiModelProperty(value = "经营市", dataType = "string", required = true)
- private String area_id;
+ private String areaId;
@ApiModelProperty(value = "经营区", dataType = "string", required = true)
- private String district_id;
+ private String districtId;
@ApiModelProperty(value = "经营详细地址", dataType = "string", required = true)
- private String detail_addr;
+ private String detailAddr;
@ApiModelProperty(value = "联系人姓名", dataType = "string", required = true)
- private String contact_name;
+ private String contactName;
@ApiModelProperty(value = "联系人手机号", dataType = "string", required = true)
- private String contact_mobile_no;
+ private String contactMobileNo;
@ApiModelProperty(value = "联系人电子邮箱", dataType = "string", required = true)
- private String contact_email;
+ private String contactEmail;
@ApiModelProperty(value = "客服电话", dataType = "string", required = true)
- private String service_phone;
+ private String servicePhone;
@ApiModelProperty(value = "小票名称", dataType = "string", required = true)
- private String receipt_name;
+ private String receiptName;
@ApiModelProperty(value = "结算账户类型（结算账户类型，个人商户/用户不支持填写对公账户和对私非法人账户\n" +
"0：对公账户 1：对私法人账户 2：对私非法人账户）", dataType = "string", required = true)
- private String card_type;
+ private String cardType;
@ApiModelProperty(value = "结算账户名（当card_type=0时填写企业名称\n" +
"当card_type=1时填写法人姓名，对私法人结算银行户名与法人姓名必需一致；\n" +
"当card_type=2时填写非法人姓名）", dataType = "string", required = true)
- private String card_name;
+ private String cardName;
@ApiModelProperty(value = "结算账号", dataType = "string", required = true)
- private String card_no;
+ private String cardNo;
@ApiModelProperty(value = "银行所在省", dataType = "string", required = true)
- private String js_prov_id;
+ private String jsProvId;
@ApiModelProperty(value = "银行所在市", dataType = "string", required = true)
- private String js_area_id;
+ private String jsAreaId;
@ApiModelProperty(value = "联行号", dataType = "string", required = true)
- private String branch_code;
+ private String branchCode;
@ApiModelProperty(value = "持卡人证件类型（当card_type=0时为空， 当card_type=1或2时必填）", dataType = "string", required = true)
- private String cert_type;
+ private String certType;
@ApiModelProperty(value = "持卡人证件号码（对私结算必填；年龄不小于18岁且不能大于80岁；如持卡人证件类型为00：身份证，则填写身份证号码 ）", dataType = "string", required = true)
- private String cert_no;
+ private String certNo;
@ApiModelProperty(value = "持卡人证件类型（1:长期有效 0:非长期有效）", dataType = "string", required = true)
- private String cert_validity_type;
+ private String certValidityType;
@ApiModelProperty(value = "持卡人证件有效期开始（日期格式：yyyyMMdd，当cert_validity_type=0时必填；当cert_validity_type=1时为空）", dataType = "string", required = true)
- private String cert_begin_date;
+ private String certBeginDate;
@ApiModelProperty(value = "持卡人证件有效期截止日期（日期格式：yyyyMMdd，当cert_validity_type=0时必填；当cert_validity_type=1时为空）", dataType = "string", required = true)
- private String cert_end_date;
+ private String certEndDate;
@ApiModelProperty(value = "银行卡绑定手机号（对私非法人结算必填，开通全域资金管理功能必填）", dataType = "string", required = true)
private String mp;
@ApiModelProperty(value = "商户ICP备案编号", dataType = "string", required = true)
- private String mer_icp;
+ private String merIcp;
@ApiModelProperty(value = "基本存款账户编号或核准号", dataType = "string", required = true)
- private String open_licence_no;
+ private String openLicenceNo;
@ApiModelProperty(value = "开户许可证", dataType = "string", required = true)
- private String reg_acct_pic;
+ private String regAcctPic;
@ApiModelProperty(value = "结算卡正面", dataType = "string", required = true)
- private String settle_card_front_pic;
+ private String settleCardFrontPic;
@ApiModelProperty(value = "结算人身份证国徽面", dataType = "string", required = true)
- private String settle_cert_back_pic;
+ private String settleCertBackPic;
@ApiModelProperty(value = "结算人身份证人像面", dataType = "string", required = true)
- private String settle_cert_front_pic;
+ private String settleCertFrontPic;
@ApiModelProperty(value = "税务登记证", dataType = "string", required = true)
- private String tax_reg_pic;
+ private String taxRegPic;
@ApiModelProperty(value = "法人身份证国徽面", dataType = "string", required = true)
- private String legal_cert_back_pic;
+ private String legalCertBackPic;
@ApiModelProperty(value = "法人身份证人像面", dataType = "string", required = true)
- private String legal_cert_front_pic;
+ private String legalCertFrontPic;
@ApiModelProperty(value = "营业执照图片", dataType = "string", required = true)
- private String license_pic;
+ private String licensePic;
@ApiModelProperty(value = "授权委托书", dataType = "string", required = true)
- private String auth_enturst_pic;
+ private String authEnturstPic;
@ApiModelProperty(value = "注册资本", dataType = "string", required = true)
- private String reg_capital;
+ private String regCapital;
@ApiModelProperty(value = "经营范围", dataType = "string", required = true)
- private String business_scope;
+ private String businessScope;
@ApiModelProperty(value = "成立时间，示例值：20091212", dataType = "string", required = true)
- private String found_date;
+ private String foundDate;
@ApiModelProperty(value = "线下经营-门头照", dataType = "string", required = true)
- private String store_header_pic;
+ private String storeHeaderPic;
@ApiModelProperty(value = "线下经营-内景照", dataType = "string", required = true)
- private String store_indoor_pic;
+ private String storeIndoorPic;
@ApiModelProperty(value = "线下经营-收银台", dataType = "string", required = true)
- private String store_cashier_desk_pic;
+ private String storeCashierDeskPic;
@ApiModelProperty(value = "线上经营-公司前台", dataType = "string", required = true)
- private String online_company_pic;
+ private String onlineCompanyPic;
@ApiModelProperty(value = "线上经营-工作区域", dataType = "string", required = true)
- private String online_company_area_pic;
+ private String onlineCompanyAreaPic;
@ApiModelProperty(value = "法人手机号", dataType = "string", required = true)
- private String legal_mobile_no;
+ private String legalMobileNo;
@ApiModelProperty(value = "法人身份证地址", dataType = "string", required = true)
- private String legal_addr;
+ private String legalAddr;
+ @ApiModelProperty(value = "协议图片地址", dataType = "string", required = true)
+ private String settleAgreePic;
+ @ApiModelProperty(value = "协议图片地址20220606", dataType = "string", required = true)
+ private String agreeBeginDate;
+ @ApiModelProperty(value = "协议图片地址20220606", dataType = "string", required = true)
+ private String agreeEndDate;
+
}
--
Gitblit v1.7.1