完善企业认证部分
parent
ede9feb7f1
commit
2dea1ec7ec
|
@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.muyu.cloud.market.domin.req.CompanyListReq;
|
||||
import com.muyu.cloud.market.domin.req.ProductAddReq;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
@ -58,8 +60,8 @@ public class Company {
|
|||
/**
|
||||
*注册日期
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Schema(description = "注册日期",defaultValue = "2024-8-9 10:47:57",type = "Date")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Schema(description = "注册日期",defaultValue = "2024-8-9",type = "String",format = "date")
|
||||
private Date registrantDate;
|
||||
/**
|
||||
*社会统一信用代码
|
||||
|
@ -83,4 +85,21 @@ public class Company {
|
|||
private BigDecimal companyMoney;
|
||||
|
||||
|
||||
public static Company companyList(CompanyListReq companyListReq){
|
||||
return Company.builder()
|
||||
.companyId(null)
|
||||
.companyName(companyListReq.getCompanyName())
|
||||
.companyPhoto(companyListReq.getCompanyPhoto())
|
||||
.companyLeader(companyListReq.getCompanyLeader())
|
||||
.registrantName(companyListReq.getRegistrantName())
|
||||
.registrantPhone(companyListReq.getRegistrantPhone())
|
||||
.registrantPosition(companyListReq.getRegistrantPhone())
|
||||
.registrantDate(companyListReq.getRegistrantDate())
|
||||
.USCI(companyListReq.getUSCI())
|
||||
.businessLicense(companyListReq.getBusinessLicense())
|
||||
.companyAddress(companyListReq.getCompanyAddress())
|
||||
.reviewStatus(companyListReq.getReviewStatus())
|
||||
.companyMoney(companyListReq.getCompanyMoney())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.muyu.cloud.market.domin.req;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
@ -8,6 +9,7 @@ import lombok.Data;
|
|||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author:weiran
|
||||
|
@ -60,6 +62,12 @@ public class CompanyListReq {
|
|||
*企业地址
|
||||
*/
|
||||
private String companyAddress;
|
||||
/**
|
||||
* 注册日期
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Schema(description = "注册日期",defaultValue = "2024-8-9",type = "String", format = "date")
|
||||
private Date registrantDate;
|
||||
/**
|
||||
*审核状态
|
||||
*/
|
||||
|
|
|
@ -69,9 +69,9 @@ public class ProductListResp {
|
|||
@Schema(description = "创建人",defaultValue = "muyu",type = "String")
|
||||
private String createBy;
|
||||
@JsonFormat(
|
||||
pattern = "yyyy-MM-dd HH:mm:ss"
|
||||
pattern = "yyyy-MM-dd "
|
||||
)
|
||||
@Schema(description = "创建时间",defaultValue = "2024-07-31 14:30:29",type = "Date")
|
||||
@Schema(description = "创建时间",defaultValue = "2024-07-31 ",type = "Date")
|
||||
private Date createTime;
|
||||
|
||||
|
||||
|
|
|
@ -3,9 +3,11 @@ package com.muyu.cloud.market.service.impl;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.muyu.cloud.market.domin.Company;
|
||||
import com.muyu.cloud.market.domin.User;
|
||||
import com.muyu.cloud.market.domin.req.CompanyListReq;
|
||||
import com.muyu.cloud.market.mapper.CompanyMapper;
|
||||
import com.muyu.cloud.market.service.CompanyService;
|
||||
import com.muyu.cloud.market.service.UserService;
|
||||
import com.muyu.common.security.service.TokenService;
|
||||
import com.muyu.common.security.utils.SecurityUtils;
|
||||
import com.muyu.common.system.domain.LoginUser;
|
||||
|
@ -13,6 +15,11 @@ import jakarta.servlet.http.HttpServletRequest;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.ZoneId;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author:weiran
|
||||
* @Package:com.muyu.cloud.market.service.impl
|
||||
|
@ -26,6 +33,10 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|||
private CompanyMapper companyMapper;
|
||||
@Autowired
|
||||
private TokenService tokenService;
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 企业绑定
|
||||
|
@ -34,14 +45,31 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|||
*/
|
||||
@Override
|
||||
public void companyauthentication(CompanyListReq companyListReq, HttpServletRequest request) {
|
||||
// //获取当前登录人信息
|
||||
// String token = SecurityUtils.getToken();// 获取当前Token
|
||||
// LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户
|
||||
// if (loginUser == null) {
|
||||
// throw new RuntimeException("用户未登录或Token无效");
|
||||
// }
|
||||
// Long userid = loginUser.getUserid();
|
||||
LambdaQueryWrapper<Company> queryWrapper = new LambdaQueryWrapper<>();
|
||||
//判断是不是已经绑定
|
||||
//获取当前登录人信息
|
||||
String token = SecurityUtils.getToken();// 获取当前Token
|
||||
LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户
|
||||
if (loginUser == null) {
|
||||
throw new RuntimeException("用户未登录或Token无效");
|
||||
}
|
||||
Long userid = loginUser.getUserid();
|
||||
User user = userService.getById(userid);
|
||||
if (user.getIsCompanyid()==null || user.getIsCompanyid()==0){
|
||||
throw new RuntimeException("已绑定,若要重新绑定,请先解除绑定");
|
||||
}
|
||||
|
||||
// 使用java.time.LocalDate获取当前日期,并将其转换为java.util.Date
|
||||
LocalDate today = LocalDate.now();
|
||||
java.util.Date registrantDate = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||
companyListReq.setRegistrantDate(registrantDate);
|
||||
companyListReq.setReviewStatus(0);
|
||||
companyListReq.setCompanyMoney(BigDecimal.valueOf(0.0));
|
||||
Company company = Company.companyList(companyListReq);
|
||||
this.save(company);
|
||||
Integer companyId = company.getCompanyId();
|
||||
|
||||
user.setIsCompanyid(companyId);
|
||||
userService.updateById(user);
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue