suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改造

Browse Source
This commit is contained in:
shuo.wang
2025-04-06 18:34:06 +08:00
parent 5e1a69a03b
commit c451901924
38 changed files with 1264 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java
View File

@@ -107,6 +107,68 @@ public class AcceptanceInfoDO {
@Column(name = "plan_exit_time")
private Date planExitTime;
/** 快手号*/
@Column(name = "ks_account")
private String ksAccount;
/** 核销手机号 */
@Column(name = "verification_mobile")
private String verificationMobile;
/** 高德、百度定位截图', */
@Column(name = "shop_location_screenshots")
private String shopLocationScreenshots;
/** 门店门头照片*/
@Column(name = "shop_doorway_photo")
private String shopDoorwayPhoto;
/** 门店内景照片*/
@Column(name = "shop_interior_photo")
private String shopInteriorPhoto;
public String getKsAccount() {
return ksAccount;
}
public void setKsAccount(String ksAccount) {
this.ksAccount = ksAccount;
}
public String getVerificationMobile() {
return verificationMobile;
}
public void setVerificationMobile(String verificationMobile) {
this.verificationMobile = verificationMobile;
}
public String getShopLocationScreenshots() {
return shopLocationScreenshots;
}
public void setShopLocationScreenshots(String shopLocationScreenshots) {
this.shopLocationScreenshots = shopLocationScreenshots;
}
public String getShopDoorwayPhoto() {
return shopDoorwayPhoto;
}
public void setShopDoorwayPhoto(String shopDoorwayPhoto) {
this.shopDoorwayPhoto = shopDoorwayPhoto;
}
public String getShopInteriorPhoto() {
return shopInteriorPhoto;
}
public void setShopInteriorPhoto(String shopInteriorPhoto) {
this.shopInteriorPhoto = shopInteriorPhoto;
}
public Date getPlanExitTime() {
return planExitTime;
}

18
coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java
View File

@@ -94,6 +94,12 @@ public class BuildInformationDO {
@Column(name = "juridical_handheld_id_card_reverse")
private String juridicalHandheldIdCardReverse;
/**
* 结算人姓名
*/
@Column(name = "settler_name")
private String settlerName;
/**
* 结算人身份证正面（图片）
*/
@@ -106,6 +112,18 @@ public class BuildInformationDO {
@Column(name = "settler_id_card_reverse")
private String settlerIdCardReverse;
/**
* 门店POS收款开户人手持身份证正面
*/
@Column(name = "settler_in_hand_front_picture")
private String settlerInHandFrontPicture;
/**
* 门店POS收款开户人手持身份证反面
*/
@Column(name = "settler_in_hand_back_picture")
private String settlerInHandBackPicture;
/**
* 结算人身份证号
*/

8
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
View File

@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -49,4 +50,11 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("微信openid")
private String openid;
@ApiModelProperty("盐值")
@Column(name = "downstream_system_salting")
private String downstreamSystemSalting;
@ApiModelProperty("下游系统密码")
@Column(name = "downstream_system_password")
private String downstreamSystemPassword;
}

113
coolstore-partner-model/src/main/java/com/cool/store/entity/OrderSysInfoDO.java Normal file
View File

@@ -0,0 +1,113 @@
package com.cool.store.entity;
import lombok.Data;
import javax.persistence.*;
import java.util.Date;
@Data // 自动生成 getter、setter、toString 等方法
@Entity // 标记为 JPA 实体类
@Table(name = "xfsg_order_sys_info") // 指定表名
public class OrderSysInfoDO {
/** 主键ID */
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
/** 店铺ID */
@Column(name = "shop_id")
private Long shopId;
/** 副总裁 */
@Column(name = "xgj_vice_president")
private String xgjVicePresident;
/** 新管家对应组织 */
@Column(name = "xgj_region_id")
private String xgjRegionId;
/** 收件人 */
@Column(name = "addressee_name")
private String addresseeName;
/** 手机号 */
@Column(name = "addressee_mobile")
private String addresseeMobile;
/** 收件省 */
@Column(name = "addressee_province")
private String addresseeProvince;
/** 收件市 */
@Column(name = "addressee_city")
private String addresseeCity;
/** 收件区 */
@Column(name = "addressee_district")
private String addresseeDistrict;
/** 详细地址 */
@Column(name = "addressee_address")
private String addresseeAddress;
/** 报货物流仓库（编码） */
@Column(name = "declare_goods_logistics_warehouse")
private String declareGoodsLogisticsWarehouse;
/** 报货日期 */
@Column(name = "declare_goods_date")
private String declareGoodsDate;
/** 仓库配送日期 */
@Column(name = "warehouse_delivery_date")
private String warehouseDeliveryDate;
/** 订货信息创建时间 */
@Column(name = "order_create_time")
private Date orderCreateTime;
/** 订货信息修改时间 */
@Column(name = "order_update_time")
private Date orderUpdateTime;
/** 订货信息创建人 */
@Column(name = "order_create_user")
private String orderCreateUser;
/** 订货信息修改人 */
@Column(name = "order_update_user")
private String orderUpdateUser;
/** 收款公司名称 */
@Column(name = "receiving_firm_name")
private String receivingFirmName;
/** 收款公司民生银行账号 */
@Column(name = "receiving_ms_bank_account")
private String receivingMsBankAccount;
/** 收款公司民生银行支行 */
@Column(name = "receiving_ms_bank_branch")
private String receivingMsBankBranch;
/** 银行银联号 */
@Column(name = "bank_unionPay_account")
private String bankUnionPayAccount;
/** 总部订货收款创建时间 */
@Column(name = "receiving_create_time")
private Date receivingCreateTime;
/** 总部订货收款修改时间 */
@Column(name = "receiving_update_time")
private Date receivingUpdateTime;
/** 总部订货收款创建人 */
@Column(name = "receiving_create_user")
private String receivingCreateUser;
/** 总部订货收款修改人 */
@Column(name = "receiving_update_user")
private String receivingUpdateUser;
}

6
coolstore-partner-model/src/main/java/com/cool/store/entity/QualificationsInfoDO.java
View File

@@ -145,6 +145,12 @@ public class QualificationsInfoDO {
@Column(name = "legal_name")
private String legalName;
/**
* 法人手机号
*/
@Column(name = "legal_mobile")
private String legalMobile;
/**
* 法人身份证号码
*/

2
coolstore-partner-model/src/main/java/com/cool/store/entity/SignFranchiseDO.java
View File

@@ -60,4 +60,6 @@ public class SignFranchiseDO {
private String partnershipSignatoryFirst;
@Column(name = "partnership_signatory_second")
private String partnershipSignatorySecond;
@Column(name = "business_model")
private Integer businessModel;
}

17
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -25,8 +26,21 @@ public class AddSignFranchiseRequest {
private String detailAddress;
@ApiModelProperty("店铺编码")
@NotBlank(message = "shopCode不能为空")
@NotBlank(message = "店铺编码不能为空")
private String shopCode;
@ApiModelProperty("店铺品牌")
@NotBlank(message = "店铺品牌不能为空")
private String franchiseBrand;
@ApiModelProperty("经营模式（0 无 1直营 2加盟）")
@NotBlank(message = "经营模式不能为空")
private Integer businessModel;
@ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
@NotNull(message = "加盟模式不能为空")
private Integer joinMode;
/**
* SignTypeEnum
*/
@@ -99,6 +113,7 @@ public class AddSignFranchiseRequest {
signFranchiseDO.setContractAmount(this.contractAmount);
signFranchiseDO.setPartnershipSignatoryFirst(this.partnershipSignatoryFirst);
signFranchiseDO.setPartnershipSignatorySecond(this.partnershipSignatorySecond);
signFranchiseDO.setBusinessModel(this.businessModel);
return signFranchiseDO;
}

35
coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java
View File

@@ -74,11 +74,25 @@ public class BuildInformationRequest {
@ApiModelProperty("法人手持身份证反面（图片）")
private String juridicalHandheldIdCardReverse;
@ApiModelProperty("结算人姓名")
@NotBlank(message = "结算人姓名 不能为空")
private String settlerName;
@NotBlank(message = "结算人身份证正面 不能为空")
@Length(max = 250 , message = "结算人身份证正面 长度不能超过250")
@ApiModelProperty("结算人身份证正面（图片）")
private String settlerIdCardFront;
@NotBlank(message = "结算人手持身份证正面 不能为空")
@Length(max = 250 , message = "结算人手持身份证正面 长度不能超过250")
@ApiModelProperty("结算人手持身份证正面")
private String settlerInHandFrontPicture;
@NotBlank(message = "结算人手持身份证反面 不能为空")
@Length(max = 250 , message = "结算人手持身份证反面 长度不能超过250")
@ApiModelProperty("结算人手持身份证反面 （图片）")
private String settlerInHandBackPicture;
@NotBlank(message = "结算人身份证反面 不能为空")
@Length(max = 250 , message = "结算人身份证反面 长度不能超过250")
@ApiModelProperty("结算人身份证反面（图片）")
@@ -121,6 +135,24 @@ public class BuildInformationRequest {
@ApiModelProperty("公司结算需要:开户许可证")
private String accountOpeningPermit;
@ApiModelProperty(value = "收件人")
private String addresseeName;
@ApiModelProperty(value = "手机号" )
private String addresseeMobile;
@ApiModelProperty(value = "收件省" )
private String addresseeProvince;
@ApiModelProperty(value = "收件市" )
private String addresseeCity;
@ApiModelProperty(value = "收件区" )
private String addresseeDistrict;
@ApiModelProperty(value = "详细地址" )
private String addresseeAddress;
public BuildInformationDO toDO(){
BuildInformationDO buildInformationDO = new BuildInformationDO();
buildInformationDO.setShopId(this.shopId);
@@ -135,8 +167,11 @@ public class BuildInformationRequest {
buildInformationDO.setJuridicalIdCardReverse(this.juridicalIdCardReverse);
buildInformationDO.setJuridicalHandheldIdCardFront(this.juridicalHandheldIdCardFront);
buildInformationDO.setJuridicalHandheldIdCardReverse(this.juridicalHandheldIdCardReverse);
buildInformationDO.setSettlerName(this.settlerName);
buildInformationDO.setSettlerIdCardFront(this.settlerIdCardFront);
buildInformationDO.setSettlerIdCardReverse(this.settlerIdCardReverse);
buildInformationDO.setSettlerInHandFrontPicture(this.settlerInHandFrontPicture);
buildInformationDO.setSettlerInHandBackPicture(this.settlerInHandBackPicture);
buildInformationDO.setSettlerIdCardNo(this.settlerIdCardNo);
buildInformationDO.setSettlerBankPhotoUrl(this.settlerBankPhotoUrl);
buildInformationDO.setSettlerBankNumber(this.settlerBankNumber);

3
coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
View File

@@ -79,6 +79,8 @@ public class JoinIntentionRequest {
private String legalIdCardFront;
@ApiModelProperty("法人身份证反面")
private String legalIdCardBack;
@ApiModelProperty("法人手机号")
private String legalMobile;
@ApiModelProperty("业务负责人姓名")
private String businessLeaderName;
@ApiModelProperty("业务负责人联系方式")
@@ -137,6 +139,7 @@ public class JoinIntentionRequest {
qualificationsInfoDO.setCompanyRegisteredAddress(this.companyRegisteredAddress);
qualificationsInfoDO.setOfficeAddress(this.officeAddress);
qualificationsInfoDO.setLegalName(this.legalName);
qualificationsInfoDO.setLegalMobile(this.legalMobile);
qualificationsInfoDO.setLegalIdCardNo(this.legalIdCardNo);
qualificationsInfoDO.setLegalIdCardBack(this.legalIdCardBack);
qualificationsInfoDO.setLegalIdCardFront(this.legalIdCardFront);

103
coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java Normal file
View File

@@ -0,0 +1,103 @@
package com.cool.store.request;
import com.cool.store.entity.OrderSysInfoDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
public class OrderSysInfoRequest {
@ApiModelProperty(hidden = true)
private Integer type;
@ApiModelProperty(value = "店铺ID" ,required = true)
@NotNull(message = "门店id不能为空")
private Long shopId;
@ApiModelProperty(value = "副总裁" )
private String xgjVicePresident;
@ApiModelProperty(value = "新管家对应组织" )
private String xgjRegionId;
@ApiModelProperty(value = "收件省" )
private String addresseeProvince;
@ApiModelProperty(value = "收件市" )
private String addresseeCity;
@ApiModelProperty(value = "收件区" )
private String addresseeDistrict;
@ApiModelProperty(value = "详细地址" )
private String addresseeAddress;
@ApiModelProperty(value = "报货物流仓库（编码）" )
private String declareGoodsLogisticsWarehouse;
@ApiModelProperty(value = "报货日期" )
private String declareGoodsDate;
@ApiModelProperty(value = "仓库配送日期" )
private String warehouseDeliveryDate;
@ApiModelProperty(value = "订货信息创建时间" )
private Date orderCreateTime;
@ApiModelProperty(value = "订货信息修改时间" )
private Date orderUpdateTime;
@ApiModelProperty(value = "订货信息创建人" )
private String orderCreateUser;
@ApiModelProperty(value = "订货信息修改人" )
private String orderUpdateUser;
@ApiModelProperty(value = "收款公司名称" )
private String receivingFirmName;
@ApiModelProperty(value = "收款公司民生银行账号" )
private String receivingMsBankAccount;
@ApiModelProperty(value = "收款公司民生银行支行" )
private String receivingMsBankBranch;
@ApiModelProperty(value = "银行银联号" )
private String bankUnionPayAccount;
@ApiModelProperty(value = "总部订货收款创建时间" )
private Date receivingCreateTime;
@ApiModelProperty(value = "总部订货收款修改时间" )
private Date receivingUpdateTime;
@ApiModelProperty(value = "总部订货收款创建人" )
private String receivingCreateUser;
@ApiModelProperty(value = "总部订货收款修改人" )
private String receivingUpdateUser;
public OrderSysInfoDO toOrderSysInfoDO() {
OrderSysInfoDO orderSysInfoDO = new OrderSysInfoDO();
orderSysInfoDO.setShopId(this.shopId);
orderSysInfoDO.setXgjVicePresident(this.xgjVicePresident);
orderSysInfoDO.setXgjRegionId(this.xgjRegionId);
orderSysInfoDO.setAddresseeProvince(this.addresseeProvince);
orderSysInfoDO.setAddresseeCity(this.addresseeCity);
orderSysInfoDO.setAddresseeDistrict(this.addresseeDistrict);
orderSysInfoDO.setAddresseeAddress(this.addresseeAddress);
orderSysInfoDO.setDeclareGoodsLogisticsWarehouse(this.declareGoodsLogisticsWarehouse);
orderSysInfoDO.setDeclareGoodsDate(this.declareGoodsDate);
orderSysInfoDO.setWarehouseDeliveryDate(this.warehouseDeliveryDate);
orderSysInfoDO.setReceivingFirmName(this.receivingFirmName);
orderSysInfoDO.setReceivingMsBankAccount(this.receivingMsBankAccount);
orderSysInfoDO.setReceivingMsBankBranch(this.receivingMsBankBranch);
orderSysInfoDO.setBankUnionPayAccount(this.bankUnionPayAccount);
return orderSysInfoDO;
}
}

11
coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.request;
import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
import com.cool.store.entity.AssessmentDataDO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,4 +23,14 @@ public class ThreeAcceptanceRequest {
private ThreeAcceptanceDTO operationsAcceptance;
@ApiModelProperty("加盟商验收")
private ThreeAcceptanceDTO partnerAcceptance;
@ApiModelProperty("快手号")
private String ksAccount;
@ApiModelProperty("核销手机号")
private String verificationPhone;
@ApiModelProperty("高德、百度定位截图")
private String shopLocationScreenshots;
@ApiModelProperty("门店门头照片")
private String shopDoorwayPhoto;
@ApiModelProperty("门店内景照片")
private String shopInteriorPhoto;
}

216
coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java Normal file
View File

@@ -0,0 +1,216 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author: WangShuo
* @Date: 2025/04/05/16:29
* @Version 1.0
* @注释:
*/
@Data
public class ZxjpApiRequest {
@ApiModelProperty(value = "签约人姓名（可能为多个）")
private List<String> partnershipSignatory;
@ApiModelProperty(value = "签约人手机号")
private String partnerMobile;
@ApiModelProperty(value = "加盟商身份证号")
private String partnerIdCardNo;
@ApiModelProperty("当前铺位编号")
private String shopCode;
@ApiModelProperty("当前加盟商所有铺位编号")
private List<String> shopCodeList;
@ApiModelProperty(value = "CRM加盟注册账号")
private String crmAccount;
@ApiModelProperty(value = "分销易账号")
private String fxyAccount;
@ApiModelProperty(value = "新掌柜")
private String xjzAccount;
@ApiModelProperty(value = "云流水账号")
private String ylsAccount;
@ApiModelProperty(value = "微企付")
private String wqfAccount;
@ApiModelProperty(value = "下游系统密码")
private String downstreamSystemPassword ;
@ApiModelProperty(value = "下游系统密码盐值")
private String downstreamSystemSalt;
@ApiModelProperty(value = "下游系统店铺名称")
private String downstreamSystemShopName;
@ApiModelProperty(value = "店铺品牌")
private String franchiseBrand;
@ApiModelProperty(value = "新管家对应组织")
private String xgjRegionId;
@ApiModelProperty(value = "新管家副总裁")
private String xgjVicePresident;
@ApiModelProperty(value = "所属督导")
private String shopSupervisorUserName;
@ApiModelProperty(value = "门店类型（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）")
private Integer joinModel;
@ApiModelProperty(value = "经营模式（0 无 1直营 2加盟）")
private Integer businessModel;
@ApiModelProperty(value = "门店门头照片")
private List<String> shopDoorwayPhoto;
@ApiModelProperty(value = "门店内景照片")
private List<String> shopInteriorPhoto;
@ApiModelProperty(value = "营业时间")
private String businessHours;
@ApiModelProperty(value = "营业执照照片")
private String creditUrl;
@ApiModelProperty(value = "食品经营许可证")
private String foodBusinessLicenseUrl ;
@ApiModelProperty(value = " 法人姓名")
private String legalName;
@ApiModelProperty(value = "法人身份证正面照片")
private String legalIdCardFront;
@ApiModelProperty(value = "法人身份证反面照片")
private String legalIdCardBack;
@ApiModelProperty(value = "法人手机号")
private String legalMobile;
@ApiModelProperty(value = "经营者姓名")
private String shopContactName;
@ApiModelProperty(value = "门店营业手机号/电话")
private String businessMobile;
@ApiModelProperty(value = "门店经营省市区")
private String shopProvinceCityDistrict;
@ApiModelProperty(value = "门店经度")
private String shopLongitude;
@ApiModelProperty(value = "门店纬度")
private String shopLatitude;
@ApiModelProperty(value = "高德、百度定位截图")
private String shopLocationPictures;
@ApiModelProperty(value = "门店详细地址")
private String shopAddress;
@ApiModelProperty(value = "核销手机号")
private String verificationMobile;
@ApiModelProperty(value = "快手号")
private String ksAccount;
@ApiModelProperty(value = "门店POS收款开户人开户人姓名")
private String settlerName;
@ApiModelProperty(value = "门店POS收款银行卡照片")
private String settlerBankPhotoUrl;
@ApiModelProperty(value = "门店POS收款银行卡反面")
private String settlerBankBackPhotoUrl;
@ApiModelProperty(value = "门店POS收款银行卡办理支行名称")
private String settlerBankBranchName;
@ApiModelProperty(value = "门店POS收款银行卡号")
private String settlerBankNumber;
@ApiModelProperty(value = "门店省")
private String shopProvince;
@ApiModelProperty(value = "门店市")
private String shopCity;
@ApiModelProperty(value = "门店POS收款银行卡预留手机号")
private String settlerBankMobile;
@ApiModelProperty(value = "门店POS收款开户人身份证正面照片")
private String settlerIdCardFront;
@ApiModelProperty(value = "门店POS收款开户人身份证反面照片")
private String settlerIdCardReverse;
@ApiModelProperty(value = "门店POS收款开户人手持身份证正面")
private String settlerInHandFrontPicture;
@ApiModelProperty(value = "门店POS收款开户人手持身份证反面")
private String settlerInHandBackPicture;
@ApiModelProperty(value = "门店POS收款开户人身份证号")
private String settlerIdCardNo;
@ApiModelProperty(value = "收件人姓名")
private String addresseeName ;
@ApiModelProperty(value = "收件人手机号")
private String addresseeMobile ;
@ApiModelProperty(value = "订货信息收件省")
private String addresseeProvince ;
@ApiModelProperty(value = "订货信息收件市")
private String addresseeCity ;
@ApiModelProperty(value = "订货信息收件区")
private String addresseeDistrict ;
@ApiModelProperty(value = "订货信息收件详细地址")
private String addresseeAddress ;
@ApiModelProperty(value = "报货物流仓库(编码)")
private String declareGoodsLogisticsWarehouse ;
@ApiModelProperty(value = "报货日期")
private String declareGoodsDate ;
@ApiModelProperty(value = "仓库配送日期")
private String warehouseDeliveryDate ;
@ApiModelProperty(value = "收款公司名称")
private String receivingFirmName;
@ApiModelProperty(value = "收款公司民生银行账号")
private String receivingMSBankAccount;
@ApiModelProperty(value = "收款公司民生银行支行")
private String receivingMSBankBranch;
@ApiModelProperty(value = "银行银联号")
private String bankUnionPayAccount;
}

14
coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
View File

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@@ -172,5 +174,17 @@ public class AddSignFranchiseResponse {
@ApiModelProperty("合伙签约人2")
private String partnershipSignatorySecond;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("店铺品牌")
private String franchiseBrand;
@ApiModelProperty("经营模式（0 无 1直营 2加盟）")
private Integer businessModel;
@ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
private Integer joinMode;
}

71
coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java
View File

@@ -71,12 +71,21 @@ public class BuildInformationResponse {
@ApiModelProperty("法人手持身份证反面（图片）")
private String juridicalHandheldIdCardReverse;
@ApiModelProperty("结算人姓名")
private String settlerName;
@ApiModelProperty("结算人身份证正面（图片）")
private String settlerIdCardFront;
@ApiModelProperty("结算人身份证反面（图片）")
private String settlerIdCardReverse;
@ApiModelProperty("结算人手持身份证正面")
private String settlerInHandFrontPicture;
@ApiModelProperty("结算人手持身份证反面")
private String settlerInHandBackPicture;
@ApiModelProperty("结算人身份证号")
private String settlerIdCardNo;
@@ -102,4 +111,66 @@ public class BuildInformationResponse {
@ApiModelProperty("公司结算需要:开户许可证")
private String accountOpeningPermit;
@ApiModelProperty(value = "副总裁" )
private String xgjVicePresident;
@ApiModelProperty(value = "新管家对应组织" )
private String xgjRegionId;
@ApiModelProperty(value = "收件省" )
private String addresseeProvince;
@ApiModelProperty(value = "收件市" )
private String addresseeCity;
@ApiModelProperty(value = "收件区" )
private String addresseeDistrict;
@ApiModelProperty(value = "详细地址" )
private String addresseeAddress;
@ApiModelProperty(value = "报货物流仓库（编码）" )
private String declareGoodsLogisticsWarehouse;
@ApiModelProperty(value = "报货日期" )
private String declareGoodsDate;
@ApiModelProperty(value = "仓库配送日期" )
private String warehouseDeliveryDate;
@ApiModelProperty(value = "订货信息创建时间" )
private Date orderCreateTime;
@ApiModelProperty(value = "订货信息修改时间" )
private Date orderUpdateTime;
@ApiModelProperty(value = "订货信息创建人" )
private String orderCreateUser;
@ApiModelProperty(value = "订货信息修改人" )
private String orderUpdateUser;
@ApiModelProperty(value = "收款公司名称" )
private String receivingFirmName;
@ApiModelProperty(value = "收款公司民生银行账号" )
private String receivingMsBankAccount;
@ApiModelProperty(value = "收款公司民生银行支行" )
private String receivingMsBankBranch;
@ApiModelProperty(value = "银行银联号" )
private String bankUnionPayAccount;
@ApiModelProperty(value = "总部订货收款创建时间" )
private Date receivingCreateTime;
@ApiModelProperty(value = "总部订货收款修改时间" )
private Date receivingUpdateTime;
@ApiModelProperty(value = "总部订货收款创建人" )
private String receivingCreateUser;
@ApiModelProperty(value = "总部订货收款修改人" )
private String receivingUpdateUser;
}

34
coolstore-partner-model/src/main/java/com/cool/store/response/IncomeSummaryResponse.java
View File

@@ -9,39 +9,39 @@ import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class IncomeSummaryResponse {
@ApiModelProperty("现金")
@ApiModelProperty(value = "现金")
private PaymentDetail offline;
@ApiModelProperty("微信")
@ApiModelProperty(value ="微信")
private PaymentDetail wechat;
@ApiModelProperty("支付宝")
@ApiModelProperty(value ="支付宝")
private PaymentDetail ali;
@ApiModelProperty("会员卡")
@ApiModelProperty(value ="会员卡")
private PaymentDetail vip;
@ApiModelProperty("美团券核销")
@ApiModelProperty(value ="美团券核销")
private PaymentDetail meituan_coupon;
@ApiModelProperty("抖音券核销")
@ApiModelProperty(value ="抖音券核销")
private PaymentDetail douyin_coupon;
@ApiModelProperty("快手券核销")
@ApiModelProperty(value ="快手券核销")
private PaymentDetail kuaishou_coupon;
@ApiModelProperty("口碑券核销")
@ApiModelProperty(value ="口碑券核销")
private PaymentDetail koubei_coupon;
@ApiModelProperty("支付宝券核销")
@ApiModelProperty(value ="支付宝券核销")
private PaymentDetail zfb_coupon;
@ApiModelProperty("云闪付")
@ApiModelProperty(value ="云闪付")
private PaymentDetail union_pay;
@ApiModelProperty("龙支付")
@ApiModelProperty(value ="龙支付")
private PaymentDetail dragon_pay;
@ApiModelProperty("其他支付")
@ApiModelProperty(value ="其他支付")
private OtherPayDetail other_pay;
@ApiModelProperty("补贴金额")
@ApiModelProperty(value ="补贴金额")
private PaymentDetail subsidy_total;
@ApiModelProperty("配送费支出")
@ApiModelProperty(value ="配送费支出")
private PaymentDetail logistics_cost_price_total;
@ApiModelProperty("饿了么外卖")
@ApiModelProperty(value ="饿了么外卖")
private PaymentDetail eleme;
@ApiModelProperty("美团外卖")
@ApiModelProperty(value ="美团外卖")
private PaymentDetail meituan;
@ApiModelProperty("APP")
@ApiModelProperty(value ="APP")
private PaymentDetail wenma_app;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java
View File

@@ -77,6 +77,8 @@ public class PartnerBaseInfoVO {
private String legalIdCardFront;
@ApiModelProperty("法人身份证反面")
private String legalIdCardBack;
@ApiModelProperty("法人手机号")
private String legalMobile;
@ApiModelProperty("业务负责人姓名")
private String businessLeaderName;
@ApiModelProperty("业务负责人联系方式")
@@ -129,6 +131,7 @@ public class PartnerBaseInfoVO {
partnerBaseInfoVO.setCompanyRegisteredAddress(qualificationsInfoDO.getCompanyRegisteredAddress());
partnerBaseInfoVO.setOfficeAddress(qualificationsInfoDO.getOfficeAddress());
partnerBaseInfoVO.setLegalName(qualificationsInfoDO.getLegalName());
partnerBaseInfoVO.setLegalMobile(qualificationsInfoDO.getLegalMobile());
partnerBaseInfoVO.setLegalIdCardNo(qualificationsInfoDO.getLegalIdCardNo());
partnerBaseInfoVO.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
partnerBaseInfoVO.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());