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

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
This commit is contained in:
苏竹红
2025-04-11 10:29:06 +08:00
parent f455a7da93 c18638f4b9
commit 92a212b836
28 changed files with 318 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,17 @@
package com.cool.store.dto;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @Author: WangShuo
* @Date: 2025/04/10/11:30
* @Version 1.0
* @注释:
*/
@Data
public class GetUserDTO {
private String keyword;
private Integer pageNum =1;
private Integer pageSize = 10;
}

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

@@ -0,0 +1,20 @@
package com.cool.store.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/04/09/13:42
* @Version 1.0
* @注释:
*/
@Data
public class ShopNameAndCodeDTO {
@ApiModelProperty("店铺名称")
private String shopName;
@ApiModelProperty("店铺编码")
private String shopCode;
}

9
coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java
View File

@@ -16,27 +16,30 @@ import java.util.Objects;
@Data
public class AddPointDetailRequest {
@NotBlank
@NotBlank(message = "铺位名称不能为空")
@ApiModelProperty("铺位名称")
private String pointName;
@ApiModelProperty("所属大区")
private Long regionId;
@NotBlank
@NotBlank(message = "经度不能为空")
@ApiModelProperty("经度")
private String longitude;
@NotBlank
@NotBlank(message = "纬度不能为空")
@ApiModelProperty("纬度")
private String latitude;
@NotBlank(message = "省不能为空")
@ApiModelProperty("省")
private String province;
@NotBlank(message = "市不能为空")
@ApiModelProperty("市")
private String city;
@NotBlank(message = "区/县不能为空")
@ApiModelProperty("区/县")
private String district;

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

@@ -26,12 +26,12 @@ public class AddSignFranchiseRequest {
private String detailAddress;
@ApiModelProperty("店铺品牌")
@NotBlank(message = "店铺品牌不能为空")
@ApiModelProperty("加盟品牌")
@NotBlank(message = "加盟品牌不能为空")
private String franchiseBrand;
@ApiModelProperty("经营模式（0 无 1直营 2加盟）")
@NotBlank(message = "经营模式不能为空")
@NotNull(message = "经营模式不能为空")
private Integer businessModel;
@ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
@@ -84,6 +84,7 @@ public class AddSignFranchiseRequest {
@ApiModelProperty("合同金额")
private String contractAmount;
@ApiModelProperty("合伙签约人1")
@NotBlank(message = "合伙签约人1不能为空")
private String partnershipSignatoryFirst;
@ApiModelProperty("合伙签约人2")
private String partnershipSignatorySecond;

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

@@ -145,21 +145,27 @@ public class BuildInformationRequest {
@ApiModelProperty("公司结算需要:开户许可证")
private String accountOpeningPermit;
@NotBlank(message = "订货信息收件人 不能为空")
@ApiModelProperty(value = "收件人")
private String addresseeName;
@NotBlank(message = "订货信息手机号 不能为空")
@ApiModelProperty(value = "手机号" )
private String addresseeMobile;
@NotBlank(message = "订货信息收件省 不能为空")
@ApiModelProperty(value = "收件省" )
private String addresseeProvince;
@NotBlank(message = "订货信息收件市 不能为空")
@ApiModelProperty(value = "收件市" )
private String addresseeCity;
@NotBlank(message = "订货信息收件区 不能为空")
@ApiModelProperty(value = "收件区" )
private String addresseeDistrict;
@NotBlank(message = "订货信息详细地址 不能为空")
@ApiModelProperty(value = "详细地址" )
private String addresseeAddress;

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

@@ -22,8 +22,10 @@ public class JoinIntentionRequest {
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
@ApiModelProperty("姓名")
@NotBlank(message = "姓名不能为空")
private String userName;
@ApiModelProperty("手机号")
@NotBlank(message = "手机号不能为空")
private String mobile;
@ApiModelProperty("1男 2女")
private Integer sex;
@@ -38,9 +40,12 @@ public class JoinIntentionRequest {
@ApiModelProperty("线索审核信息id")
private Long auditId;
@ApiModelProperty("身份证号码/统一社会信用代码")
@NotBlank(message = "身份证号码不能为空")
private String idCardNo;
@ApiModelProperty("身份证正面")
@NotBlank(message = "身份证正面不能为空")
private String frontOfIdCard;
@NotBlank(message = "身份证反面不能为空")
@ApiModelProperty("身份证反面")
private String backOfIdCard;
@ApiModelProperty("婚姻状态 1-未婚 2-已婚 3-离婚 4-丧偶")
@@ -72,14 +77,19 @@ public class JoinIntentionRequest {
@ApiModelProperty("办公地址")
private String officeAddress;
@ApiModelProperty("法人姓名")
@NotBlank(message = "法人姓名不能为空")
private String legalName;
@ApiModelProperty("法人身份证号码")
@NotBlank(message = "法人身份证号码不能为空")
private String legalIdCardNo;
@ApiModelProperty("法人身份证正面")
@NotBlank(message = "法人身份证正面不能为空")
private String legalIdCardFront;
@ApiModelProperty("法人身份证反面")
@NotBlank(message = "法人身份证反面不能为空")
private String legalIdCardBack;
@ApiModelProperty("法人手机号")
@NotBlank(message = "法人手机号不能为空")
private String legalMobile;
@ApiModelProperty("业务负责人姓名")
private String businessLeaderName;

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

@@ -19,26 +19,26 @@ import java.util.Objects;
@Data
public class MiniAddPointRequest {
@NotNull
@ApiModelProperty("店铺id")
private Long shopId;
@NotBlank
@NotBlank(message = "铺位名称不能为空")
@ApiModelProperty("铺位名称")
private String pointName;
@ApiModelProperty("所属大区")
private Long regionId;
@NotBlank
@NotBlank(message = "经度不能为空")
@ApiModelProperty("经度")
private String longitude;
@NotBlank
@NotBlank(message = "纬度不能为空")
@ApiModelProperty("纬度")
private String latitude;
@NotBlank
@NotBlank(message = "详细地址不能为空")
@ApiModelProperty("详细地址")
private String address;
@@ -72,14 +72,15 @@ public class MiniAddPointRequest {
@ApiModelProperty("加盟商签名")
private String lineSign;
@NotBlank
@NotBlank(message = "省不能为空")
@ApiModelProperty("省")
private String province;
@NotBlank
@NotBlank(message = "市不能为空")
@ApiModelProperty("市")
private String city;
@NotBlank(message = "区/县不能为空")
@ApiModelProperty("区/县")
private String district;
@@ -100,7 +101,7 @@ public class MiniAddPointRequest {
@ApiModelProperty("区/县编码")
private String districtCode;
@NotBlank(message = "铺位经纬度geohash不能为空")
@ApiModelProperty("铺位经纬度geohash")
private String location;

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

@@ -1,12 +1,15 @@
package com.cool.store.request;
import com.cool.store.entity.OrderSysInfoDO;
import com.cool.store.enums.OrderSysTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.Objects;
@Data
public class OrderSysInfoRequest {
@@ -14,8 +17,7 @@ public class OrderSysInfoRequest {
@ApiModelProperty(hidden = true)
private Integer type;
@ApiModelProperty(value = "店铺编码",required = true)
@NotBlank(message = "店铺编码不能为空")
@ApiModelProperty(value = "店铺编码")
private String shopCode;
@ApiModelProperty(value = "店铺ID" ,required = true)
@@ -105,4 +107,17 @@ public class OrderSysInfoRequest {
return orderSysInfoDO;
}
public Boolean check(){
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.warehouseDeliveryDate)){
return false;
}
}
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())){
if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
return false;
}
}
return true;
}
}

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

@@ -5,6 +5,7 @@ import com.cool.store.entity.AssessmentDataDO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
@@ -33,4 +34,11 @@ public class ThreeAcceptanceRequest {
private String shopDoorwayPhoto;
@ApiModelProperty("门店内景照片")
private String shopInteriorPhoto;
public Boolean miniCheck(){
if (StringUtils.isAnyBlank(this.ksAccount,this.verificationPhone,this.shopLocationScreenshots)){
return false;
}
return true;
}
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/oppty/OpportunityListRequest.java
View File

@@ -31,6 +31,8 @@ public class OpportunityListRequest{
private Integer inspectionStatus ;
private Integer pageNum = 1;
private Integer pageSize = 20;
@ApiModelProperty("机会点名称")
private String name;

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

@@ -0,0 +1,23 @@
package com.cool.store.response;
import com.cool.store.dto.ShopNameAndCodeDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author: WangShuo
* @Date: 2025/04/09/13:43
* @Version 1.0
* @注释:
*/
@Data
public class ShopResponse {
@ApiModelProperty(value = "当前店铺信息")
private ShopNameAndCodeDTO currentShop;
@ApiModelProperty(value = "所有店铺信息")
private List<ShopNameAndCodeDTO> shopList;
}

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

@@ -104,7 +104,12 @@ public class PartnerBaseInfoVO {
private String unifiedSocialCreditCode;
@ApiModelProperty("督导name")
private String supervisorName;
private String supervisorId;
@ApiModelProperty("督导手机号")
private String supervisorMobile;
public static PartnerBaseInfoVO from(QualificationsInfoDO qualificationsInfoDO, LineInfoDO lineInfoDO) {