Skip to content

T
tcm-system
Commit 4a2ddf1d authored by zjy's avatar zjy
Browse files
Options

user/role/tright 7.19

parent 53883e85
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 27 deletions
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 4a2ddf1d
......@@ -166,7 +166,6 @@ public class RegisterServiceImpl implements RegisterService {
* @return 返回保存数据各表的主键
*/
@Override
@Transactional(rollbackFor = Exception.class)
public SaveCompanyResVo saveIndividual(RegisterIndividualReqVo reqVo) {
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
......@@ -240,13 +239,17 @@ public class RegisterServiceImpl implements RegisterService {
* @return 返回保存数据各表的主键
*/
@Override
@Transactional(rollbackFor = Exception.class)
public SaveCompanyResVo saveEnterprice(RegisterEnterpriceReqVo reqVo) {
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getId());
CompanyVo company = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList());
ObjectHelper.writeWithFrom(companyReqVo,reqVo);
companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companyReqVo.setStatus(company.getStatus());
companyReqVo.setBankList(new ArrayList());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
companyBankReqVo.setId(StringHelper.getNewID());
......@@ -262,6 +265,7 @@ public class RegisterServiceImpl implements RegisterService {
ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyDaoImpl.update(companyVo);
List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
......@@ -274,7 +278,20 @@ public class RegisterServiceImpl implements RegisterService {
ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardVo.setType(reqVo.getCompanyType());
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setIdCard(reqVo.getContactCode());
companyBankCardVo.setCompanyId(reqVo.getId());
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setBankCardCode(companyBankCardVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
if (null == companyBankCardVo1){
companyBankCardDaoImpl.create(companyBankCardVo);
}else {
companyBankCardVo.setId(companyBankCardVo1.getId());
companyBankCardDaoImpl.update(companyBankCardVo);
}
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
......@@ -377,6 +394,29 @@ public class RegisterServiceImpl implements RegisterService {
loginVo.setExpairTime(DateHelper.getNow());
tokenService.save(loginVo);
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setCompanyId(companyVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);
if (companyBankCardVoList != null && !companyBankCardVoList.isEmpty()){
loginCompanyResVo.setBankCardVoList(companyBankCardVoList);
}
resVo.setCompanyResVo(loginCompanyResVo);
/*获取商家信息*/
CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
companyScenicInfoReqVo.setReqId(StringHelper.getNewID());
companyScenicInfoReqVo.setCompanyId(companyVo.getId());
companyScenicInfoReqVo.setProductOrInterface(0);
ResponseResult result = new ResponseResult();
try {
result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
}catch (Exception e){
resVo.setMerchant(null);
}
Merchant merchant = (Merchant) result.getData();
resVo.setMerchant(merchant);
/*判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面*/
if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON==(companyVo.getCompanyType())){
resVo.setCode("01");
......@@ -393,29 +433,21 @@ public class RegisterServiceImpl implements RegisterService {
else if (companyVo.getSigningStatus() != CompanyConstant.COMPANY_STATUS_SIGN_success){
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setId(companyVo.getId());
ResponseResult result = new ResponseResult();
ResponseResult result1 = new ResponseResult();
try {
result = payFeign.sign(companyReqVo);
result1 = payFeign.sign(companyReqVo);
}catch (Exception e){
e.printStackTrace();
throw new CodeException("跳转签约页面失败，请重试");
}
CompanyReqVo companyReqVo1 = (CompanyReqVo) result.getData();
CompanyReqVo companyReqVo1 = (CompanyReqVo) result1.getData();
resVo.setCode("04");
resVo.setMsg("未签约，跳转签约页面");
resVo.setUrl(companyReqVo1.getSignUrl());
return resVo;
}
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setCompanyId(companyVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);
List<String> bankCardCodeList = new ArrayList();
if (companyBankCardVoList != null && !companyBankCardVoList.isEmpty()){
for (CompanyBankCardVo companyBankCardVo:companyBankCardVoList) {
bankCardCodeList.add(companyBankCardVo.getBankCardCode());
}
}else{
if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()){
/*该公司没有银行卡，需要跳转添加银行卡*/
resVo.setCode("03");
resVo.setMsg("还未添加银行卡，跳转添加银行卡页面");
......@@ -478,8 +510,7 @@ public class RegisterServiceImpl implements RegisterService {
Collections.sort(authorityListByLevel);
resVo.setAuthorityListByLevel(authorityListByLevel);
}
loginCompanyResVo.setBankCardCodeList(bankCardCodeList);
resVo.setCompanyResVo(loginCompanyResVo);
resVo.setCode("00");
return resVo;
}
......@@ -558,11 +589,22 @@ public class RegisterServiceImpl implements RegisterService {
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
companyReqVo.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
companyBankReqVo.setType(reqVo.getCompanyType());
companyBankReqVo.setCompanyId(reqVo.getId());
companyBankReqVo.setName(reqVo.getContactName());
companyBankReqVo.setIdCard(reqVo.getContactCode());
companyBankReqVo.setPhone(reqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setBankCardCode(reqVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
companyBankReqVo.setStatus(companyBankCardVo1.getStatus());
companyBankReqVo.setId(StringHelper.getNewID());
companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setBankList(new ArrayList<>());
companyReqVo.getBankList().add(companyBankReqVo);
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
......@@ -575,6 +617,7 @@ public class RegisterServiceImpl implements RegisterService {
ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setExamineStatus(0);
companyVo1.setCompanyAttribute(resCompanyReqVo.getCompanyAttribution());
companyDaoImpl.update(companyVo1);
List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
......@@ -586,7 +629,27 @@ public class RegisterServiceImpl implements RegisterService {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
if (6 == companyReqVo.getStatus()){
companyBankCardVo.setStatus(1);
companyBankCardVo.setBindingTime(
DateHelper.getNow()
.substring(0,10)
.replace("-",""));
}
companyBankCardVo.setType(resCompanyReqVo.getCompanyType());
companyBankCardVo.setCompanyId(resCompanyReqVo.getId());
companyBankCardVo.setName(resCompanyReqVo.getContactName());
companyBankCardVo.setIdCard(resCompanyReqVo.getContactCode());
companyBankCardVo.setPhone(resCompanyReqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo1 = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo1.setBankCardCode(bankList.get(0).getBankCardCode());
CompanyBankCardVo companyBankCardVo2 = companyBankCardDaoImpl.load(companyBankCardGetReqVo1,CompanyBankCardVo.class);
if (null == companyBankCardVo2){
companyBankCardDaoImpl.create(companyBankCardVo);
}else {
companyBankCardVo.setId(companyBankCardVo2.getId());
companyBankCardDaoImpl.update(companyBankCardVo);
}
return reqVo.getVerifyCode();
}
......
src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java
View file @ 4a2ddf1d
......@@ -28,6 +28,16 @@ public class LoginResVo {
private List<AuthorityListByLevelResVo> authorityListByLevel;
private Merchant merchant;
public Merchant getMerchant() {
return merchant;
}
public void setMerchant(Merchant merchant) {
this.merchant = merchant;
}
public String getUrl() {
return url;
}
......
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankCardGetReqVo.java
View file @ 4a2ddf1d
......@@ -13,6 +13,16 @@ public class CompanyBankCardGetReqVo {
private Integer isDefault;
private String bankCardCode;
public String getBankCardCode() {
return bankCardCode;
}
public void setBankCardCode(String bankCardCode) {
this.bankCardCode = bankCardCode;
}
public Integer getIsDefault() {
return isDefault;
}
......
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankReqVo.java
View file @ 4a2ddf1d
......@@ -33,7 +33,7 @@ public class CompanyBankReqVo {
/**
* 类型 公司 个人
*/
private String type;
private Integer type;
/**
* 公司id
......@@ -115,11 +115,11 @@ public class CompanyBankReqVo {
this.bankCode = bankCode;
}
public String getType() {
public Integer getType() {
return type;
}
public void setType(String type) {
public void setType(Integer type) {
this.type = type;
}
......
src/main/java/com/pangding/web/authority/vo/resvo/LoginCompanyResVo.java
View file @ 4a2ddf1d
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import java.util.List;
......@@ -11,7 +12,7 @@ import java.util.List;
public class LoginCompanyResVo {
private CompanyVo companyVo;
private List<String> bankCardCodeList;
private List<CompanyBankCardVo> bankCardVoList;
public CompanyVo getCompanyVo() {
return companyVo;
......@@ -21,11 +22,11 @@ public class LoginCompanyResVo {
this.companyVo = companyVo;
}
public List<String> getBankCardCodeList() {
return bankCardCodeList;
public List<CompanyBankCardVo> getBankCardVoList() {
return bankCardVoList;
}
public void setBankCardCodeList(List<String> bankCardCodeList) {
this.bankCardCodeList = bankCardCodeList;
public void setBankCardVoList(List<CompanyBankCardVo> bankCardVoList) {
this.bankCardVoList = bankCardVoList;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment