diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 60797bde1..4f624b4b1 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -223,6 +223,8 @@ public enum ErrorCodeEnum { DESIGN_NO_COMPLETE(121007,"请先完成设计阶段！",null), UPDATE_FAIL(131000,"修改失败，表单不存在！",null), + LICENSE_LEGAL_STAGE_FAIL(131001,"营业执照阶段未上传！",null), + BUILD_INFORMATION_STAGE_FAIL(131002,"建店资料收集阶段未完成！",null) ; diff --git a/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml index 04192f8c8..25498bc2c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml @@ -5,29 +5,32 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - id,shop_id,audit_id, + id + ,shop_id,audit_id, type,settler_id_card_front,settler_id_card_reverse, settler_id_card_no,settler_bank_number,settler_bank_mobile, settler_bank_name,relationship_proof_url,account_opening_permit_url, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java index 65e2ee074..b8d5960f7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java @@ -50,12 +50,24 @@ public class PlatformBuildDO { @Column(name = "settler_id_card_reverse") private String settlerIdCardReverse; + /** + * 结算人姓名 + */ + @Column(name = "settler_name") + private String settlerName; + /** * 结算人身份证号 */ @Column(name = "settler_id_card_no") private String settlerIdCardNo; + /** + * 结算人银行卡照片 + */ + @Column(name = "settler_bank_photo_url") + private String settlerBankPhotoUrl; + /** * 结算人银行卡号 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java index c8e8ff899..24fabb082 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java @@ -1,5 +1,6 @@ package com.cool.store.request; +import com.cool.store.entity.PlatformBuildDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -33,6 +34,11 @@ public class PlatformBuildRequest { @ApiModelProperty("结算人身份证反面（图片）") private String settlerIdCardReverse; + @NotBlank + @Length(max = 120 , message = "结算人姓名 长度不能超过128") + @ApiModelProperty("结算人姓名") + private String settlerName; + @NotBlank @Length(max = 64 , message = "结算人身份证号 长度不能超过64") @ApiModelProperty("结算人身份证号") @@ -65,4 +71,15 @@ public class PlatformBuildRequest { @Length(max =1020, message = "授权书(抖音非法人结算需要) 长度不能超过1020") @ApiModelProperty("授权书(抖音非法人结算需要)") private String authorizationUrl; + + public PlatformBuildDO toDO(){ + PlatformBuildDO platformBuildDO = new PlatformBuildDO(); + platformBuildDO.setShopId(this.shopId); + platformBuildDO.setSettlerIdCardFront(this.settlerIdCardFront); + platformBuildDO.setSettlerIdCardReverse(this.settlerIdCardReverse); + platformBuildDO.setSettlerIdCardNo(this.settlerIdCardNo); + platformBuildDO.setSettlerName(this.settlerName); + return platformBuildDO; + + } } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java new file mode 100644 index 000000000..a0b4cb592 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java @@ -0,0 +1,45 @@ +package com.cool.store.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2024/08/29/下午2:33 + * @Version 1.0 + * @注释: + */ +@Data +public class AuditInfoResponse { + + @ApiModelProperty("操作人集合") + private List list; + @ApiModelProperty("操作类型 0 提交审批 1-审批通过 2 审批不通过 3-待审批") + private Integer type; + @ApiModelProperty("生成时间") + private Date createTime; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("附件") + private String annex; + @ApiModelProperty("实际操作人id") + private String actualUserId; + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + @ApiModel(value = "可操作人信息") + public static class AuditUserInfoVO { + private String userId; + private String name; + @ApiModelProperty("头像") + private String avatar; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java index 933485d70..4aa210bd5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PlatformBuildService.java @@ -1,6 +1,7 @@ package com.cool.store.service; +import com.cool.store.request.PlatformBuildRequest; /** * @author EDY @@ -11,6 +12,10 @@ public interface PlatformBuildService { Boolean isJuridical(Long shopId); + Integer submitOrUpdate(PlatformBuildRequest request,String userId); + + + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 0f34fe85b..2975450ba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -1,10 +1,24 @@ package com.cool.store.service.impl; +import com.cool.store.dao.BuildInformationDAO; +import com.cool.store.entity.BuildInformationDO; +import com.cool.store.entity.LicenseTransactDO; import com.cool.store.entity.PlatformBuildDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.ApplyLicenseMapper; +import com.cool.store.request.PlatformBuildRequest; import com.cool.store.service.PlatformBuildService; import com.cool.store.mapper.PlatformBuildMapper; +import com.cool.store.utils.poi.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import springfox.documentation.swagger2.mappers.LicenseMapper; + +import javax.annotation.Resource; +import java.util.Objects; /** * @author EDY @@ -14,6 +28,31 @@ import org.springframework.stereotype.Service; @Service public class PlatformBuildServiceImpl implements PlatformBuildService{ + @Resource + private ApplyLicenseMapper applyLicenseMapper; + @Autowired + private BuildInformationDAO buildInformationDAO; + + @Override + public Boolean isJuridical(Long shopId) { + LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); + if(Objects.isNull(licenseTransactDO) || StringUtils.isBlank(licenseTransactDO.getLicenseLegalPerson())){ + throw new ServiceException(ErrorCodeEnum.LICENSE_LEGAL_STAGE_FAIL); + } + BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId); + if(Objects.isNull(informationDO) || StringUtils.isBlank(informationDO.getSettlerName())){ + throw new ServiceException(ErrorCodeEnum.BUILD_INFORMATION_STAGE_FAIL); + } + if (licenseTransactDO.getLicenseLegalPerson().equals(informationDO.getSettlerName())){ + return Boolean.TRUE; + } + return Boolean.FALSE; + } + + @Override + public Integer submitOrUpdate(PlatformBuildRequest request, String userId) { + return 0; + } }