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

Merge branch 'cc_20250909_new' into cc_20250903_big_screen

Browse Source
This commit is contained in:
wangff
2025-09-09 10:46:29 +08:00
parent d8cbb78c5d e45b497b3f
commit 0d42743778
32 changed files with 608 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coolstore-partner-model/src/main/java/com/cool/store/dto/BusinessDTO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.cool.store.dto;
import com.cool.store.entity.LicenseTransactDO;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Author suzhuhong
* @Date 2025/8/13 15:49
* @Version 1.0
*/
@Data
public class BusinessDTO {
private String enterpriseId;
List<LicenseTransactDO> requests;
Map<Long, String> transactMap;
}

15
coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
View File

@@ -17,16 +17,6 @@ public class StoreDTO {
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;
@ApiModelProperty("加盟模式")
@@ -47,5 +37,10 @@ public class StoreDTO {
private BigDecimal monthlyPersonnelSalary;
@ApiModelProperty("月水电费")
private BigDecimal monthlyOtherExpenses;
@ApiModelProperty("统管 1-统管 0-非统管")
private Integer unifiedManagement;
private String longitude;
private String latitude;
}

19
coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -220,4 +221,22 @@ public class StoreDO {
* 距离我的距离
*/
private String distance;
private BigDecimal monthlyRent;
private BigDecimal monthlyPersonnelSalary;
private BigDecimal monthlyOtherExpenses;
private Integer unifiedManagement;
private Integer joinBrand;
private Integer joinModel;
private Integer storeType;
private String miniProgramOrderStoreName;
}

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

@@ -85,12 +85,9 @@ public class AddSignFranchiseRequest {
private String mobile;
@ApiModelProperty("合同编码")
@NotBlank(message = "合同编码不能为空")
private String contractCode;
@ApiModelProperty("合同金额")
@NotBlank(message = "合同金额不能为空")
private String contractAmount;
@NotBlank(message = "合伙签约人1不能为空")
@ApiModelProperty("合伙签约人1")
private String partnershipSignatoryFirst;
@ApiModelProperty("合伙签约人2")
@@ -116,7 +113,6 @@ public class AddSignFranchiseRequest {
private String introductionAward;
//签约人1第几家分店
@ApiModelProperty("签约人1第几家分店")
@NotNull(message = "签约人1第哪家分店不能为空")
private Integer partnershipSignatoryFirstWhichStore;
//省

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

@@ -91,20 +91,16 @@ public class BuildInformationRequest {
private String juridicalHandheldIdCardReverse;
@ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是")
@NotNull(message = "结算人身份证信息是否和加盟商一致不能为空")
private Boolean settlerIsSamePartner ;
@ApiModelProperty("结算人姓名")
// @NotBlank(message = "结算人姓名 不能为空")
@JsonProperty("settlerName")
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;
@@ -129,23 +125,19 @@ public class BuildInformationRequest {
@ApiModelProperty("结算人银行卡照片")
private String settlerBankPhotoUrl;
@NotBlank(message = "结算人银行卡背面照片 不能为空")
@Length(max = 250, message = "结算人银行卡背面照片 长度不能超过250")
@ApiModelProperty("结算人银行卡背面照片")
@JsonProperty("settlerBankBackPhotoUrl")
private String settlerBankBackPhotoUrl;
@NotBlank(message = "结算人银行卡号 不能为空")
@Length(max = 64 , message = "结算人银行卡号 长度不能超过64")
@ApiModelProperty("结算人银行卡号")
private String settlerBankNumber;
@NotBlank(message = "结算人银行卡预留手机号 不能为空")
@Length(min = 11,max = 11 , message = "结算人银行卡预留手机号 长度必须为11")
@ApiModelProperty("结算人银行卡预留手机号")
private String settlerBankMobile;
@NotBlank(message = "结算开户银行支行 不能为空")
@Length(max =100, message = "结算开户银行支行 长度不能超过100")
@ApiModelProperty("结算开户银行支行")
private String settlerBankName;

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

@@ -128,6 +128,9 @@ public class OrderSysInfoRequest {
if (Objects.equals(joinMode, JoinModeEnum.OWN_STORE.getCode())&&this.shopCode!=null){
return true;
}
if (Objects.equals(joinMode, JoinModeEnum.FLAGSHIP_STORE.getCode())&&this.shopCode!=null){
return true;
}
if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
return false;
}

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

@@ -0,0 +1,162 @@
package com.cool.store.request;
import com.aliyun.ons20190214.models.OnsMessageTraceRequest;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2025/8/13 13:41
* @Version 1.0
*/
@Data
public class StoreMasterDTO {
private String enterpriseId;
@ApiModelProperty("门店名称(加盟签约)")
private String storeName;
@ApiModelProperty("门店名称(小程序点单)")
private String miniProgramOrderStoreName;
@ApiModelProperty("门店编码")
private String storeNum;
@ApiModelProperty("加盟品牌")
private Integer joinBrand;
@ApiModelProperty("加盟模式")
private Integer joinModel;
@ApiModelProperty("门店类型")
private Integer storeType;
@ApiModelProperty("经营模式")
private Integer manageModel;
@ApiModelProperty("签约类型")
private Integer signType;
@ApiModelProperty("门店状态")
private String storeStatus;
@ApiModelProperty("门店带宽")
private Integer storeBandwidth;
@ApiModelProperty("所属加盟集团")
private String bloc;
@ApiModelProperty("所属大区")
private Long branch;
@ApiModelProperty("加盟督导-人")
private String joinSupervision;
@ApiModelProperty("管理督导-组织")
private Long regionId;
@ApiModelProperty("省市区")
private String area;
@ApiModelProperty("乡镇")
private String town;
@ApiModelProperty("门店地址")
private String storeAddress;
@ApiModelProperty("点位编码")
private String pointCode;
@ApiModelProperty("高德定位 暂时没有")
private String locationScreenshot;
@ApiModelProperty("定位地址")
private String locationAddress;
@ApiModelProperty("经度")
private String longitude;
@ApiModelProperty("纬度")
private String latitude;
@ApiModelProperty("保护距离")
private Integer protectiveDistance;
@ApiModelProperty("月租金")
private BigDecimal monthlyRent;
@ApiModelProperty("收件人")
private String addresseeName;
@ApiModelProperty("手机号")
private String addresseeMobile;
@ApiModelProperty("收件省市区")
private String addresseeArea;
@ApiModelProperty("收件详细地址")
private String addresseeAddress;
@ApiModelProperty("报货物流仓库（编码）")
private String declareGoodsLogisticsWarehouse;
@ApiModelProperty("报货类型 0-按周报货 1-按月报货 2-自提 3-按2周/次投货 4-按3周/次投货")
private Integer declareGoodsType;
@ApiModelProperty("报送货日期 数组格式\"[{\"declareGoods\": \"\",\"deliverGoods\":\"\"}]\"")
private String declareGoodsDate;
@ApiModelProperty("营业时间")
private String businessHours;
@ApiModelProperty("门头照 暂时没有")
private String avatar;
@ApiModelProperty("门店内景照 暂时没有")
private String interiorPhotos;
private SignerInfo signerInfo;
private SettlerInfo settlerInfo;
@ApiModelProperty("是否统管")
private Integer unifiedManagement;
@Data
public static class SignerInfo {
@ApiModelProperty("签约人1姓名")
private String Signer1Name;
@ApiModelProperty("签约人1姓名")
private String Signer1Mobile;
@ApiModelProperty("签约人1姓名")
private String Signer1IdCard;
@ApiModelProperty("签约人1姓名")
private String Signer1IdCardPhoto;
@ApiModelProperty("签约人1姓名")
private String Signer1IdCardPhotoBack;
@ApiModelProperty("角色")
private Long partnerRoleId;
}
@Data
public static class SettlerInfo{
@ApiModelProperty("结算人姓名")
private String settlerName;
@ApiModelProperty("结算人身份证号(加密)")
private String settlerIdCardNo;
@ApiModelProperty("结算人身份证正面路径")
private String settlerIdCardFront;
@ApiModelProperty("结算人身份证反面路径")
private String settlerIdCardReverse;
@ApiModelProperty("结算人手持身份证正面照片路径")
private String settlerInHandFrontPicture;
@ApiModelProperty("结算人手持身份证反面照片路径")
private String settlerInHandBackPicture;
@ApiModelProperty("结算人银行卡号(加密)")
private String settlerBankNumber;
@ApiModelProperty("结算人银行卡预留手机号")
private String settlerBankMobile;
@ApiModelProperty("结算开户银行")
private String settlerBankName;
@ApiModelProperty("结算开户银行支行")
private String settlerBankBranchName;
@ApiModelProperty("结算人银行卡照片路径")
private String settlerBankPhotoUrl;
@ApiModelProperty("门店POS收款银行卡反面路径")
private String settlerBankBackPhotoUrl;
}
}