Skip to content

T
tcm-system
Commit 20ec49f0 authored by zjy's avatar zjy
Browse files
Options

user/role/tright 6.5 

还需要调用其他服务
parent 6a3e6ded
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 145 deletions
src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java
View file @ 20ec49f0
......@@ -39,7 +39,7 @@ public class CompanyManagementController {
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.pdGetDetail(reqVo));
return ResponseResult.result(companyServiceImpl.getDetail(reqVo));
}
/**y
......
src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java
View file @ 20ec49f0
......@@ -122,8 +122,6 @@ public class ComputerRegisterController {
.notBlankCheck("bankAddress",reqVo.getBankAddress())
.notBlankCheck("bankCode",reqVo.getBankCode())
.notNumberCheck("bankCode",reqVo.getBankCode())
.notBlankCheck("reservedPhone",reqVo.getReservedPhone())
.checkPhoneNo("reservedPhone",reqVo.getReservedPhone())
.checkException();
};
......
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ 20ec49f0
......@@ -258,18 +258,4 @@ public class PangdingManagementController {
companyServiceImpl.batchDelete(reqVo);
return new ResponseResult();
}
/**
* 批量更新用户信息
* @param reqVo 封装了用户列表的请求对象
* @return
*/
@RequestMapping(value = "/batchUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult batchUpdate(@RequestBody BatchUpdateReqVo reqVo) throws Exception {
CheckerHelper.newInstance()
.notBlankCheck("userList",reqVo.getUserVoList())
.checkException();
companyServiceImpl.batchUpdate(reqVo);
return new ResponseResult();
}
}
src/main/java/com/pangding/web/authority/feign/PayFeign.java
View file @ 20ec49f0
......@@ -20,7 +20,7 @@ public interface PayFeign {
* @return
*/
@RequestMapping(value="/register")
public ResponseResult setCompanyInfo(@RequestBody CompanyReqVo req);
public ResponseResult<CompanyReqVo> setCompanyInfo(@RequestBody CompanyReqVo req);
/**
* 绑定银行卡
......@@ -28,7 +28,7 @@ public interface PayFeign {
* @return
*/
@RequestMapping(value="/bindback")
public ResponseResult bindBack(@RequestBody CompanyBankReqVo req);
public ResponseResult<CompanyBankReqVo> bindBack(@RequestBody CompanyBankReqVo req);
/**
* 解绑银行卡
......@@ -36,5 +36,5 @@ public interface PayFeign {
* @return
*/
@RequestMapping(value = "/unbindBankCard")
public ResponseResult unbindBankCard(@RequestBody CompanyBankReqVo req);
public ResponseResult<CompanyBankReqVo> unbindBankCard(@RequestBody CompanyBankReqVo req);
}
src/main/java/com/pangding/web/authority/feign/StoreFeign.java
View file @ 20ec49f0
......@@ -21,7 +21,7 @@ public interface StoreFeign {
* @return
*/
@RequestMapping("/merchantCreate")
public ResponseResult merchantCreate(@RequestBody MerchantCreateReqVo req);
public ResponseResult<String> merchantCreate(@RequestBody MerchantCreateReqVo req);
/**
* 通过公司还是id获取商户信息
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 20ec49f0
......@@ -8,6 +8,7 @@ import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
import java.util.List;
......@@ -48,7 +49,7 @@ public interface CompanyService{
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司主表信息的对象
*/
DetailResVo getDetail(CompanyGetReqVo reqVo);
CompanyResVo getDetail(CompanyGetReqVo reqVo);
/**
* 新增/修改公司信息
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 20ec49f0
......@@ -10,12 +10,14 @@ import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.util.CompanyBankCardConstant;
import com.pangding.web.authority.util.CompanyConstant;
import com.pangding.web.authority.util.RoleConstant;
import com.pangding.web.authority.util.RsaConstant;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.constant.MerchantConstant;
import com.pangding.web.util.RSAUtils;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
......@@ -83,6 +85,20 @@ public class CompanyServiceImpl implements CompanyService{
*/
@Override
public CompanyResVo pdGetDetail(CompanyGetReqVo reqVo) {
CompanyResVo resVo = getDetail(reqVo);
/*获取用户表信息*/
UserGetSuperAdminReqVo req = new UserGetSuperAdminReqVo();
req.setCompanyId(reqVo.getId());
req.setSuperAdminRoleId(RoleConstant.SUPER_ADMIN_ROLE_ID);
UserVo userVo = userDaoImpl.getSuperAdmin(req);
if (null != userVo){
resVo.setUserVo(userVo);
}
return resVo;
}
@Override
public CompanyResVo getDetail(CompanyGetReqVo reqVo){
CompanyResVo resVo = new CompanyResVo();
/*获取公司表信息*/
CompanyVo companyVo = companyDao.load(reqVo,CompanyVo.class);
......@@ -114,48 +130,11 @@ public class CompanyServiceImpl implements CompanyService{
/*获取公司银行卡列表*/
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setCompanyId(reqVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(companyBankCardGetReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVoList && !companyBankCardVoList.isEmpty()){
resVo.setBankCardVoList(companyBankCardVoList);
companyBankCardGetReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo){
resVo.setBankCardVo(companyBankCardVo);
}
/*获取用户表信息*/
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setCompanyId(reqVo.getId());
List<UserVo> userVoList = userDaoImpl.loadList(userGetReqVo,UserVo.class);
if (null != userVoList){
for (UserVo userVo:userVoList) {
userVo.setPassword("");
userVo.setRemark("");
}
}
resVo.setUserVoList(userVoList);
return resVo;
}
/**
* 商户查看详情，根据公司id返回用户信息和公司主表信息
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司主表信息的对象
*/
@Override
public DetailResVo getDetail(CompanyGetReqVo reqVo) {
DetailResVo resVo = new DetailResVo();
/*查询公司主表信息*/
CompanyVo companyVo = companyDao.load(reqVo,CompanyVo.class);
if (null != companyVo){
resVo.setCompanyVo(companyVo);
}
/*查询用户信息*/
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setCompanyId(reqVo.getId());
List<UserVo> userVoList = userDaoImpl.loadList(userGetReqVo,UserVo.class);
if (null != userVoList){
for (UserVo userVo:userVoList) {
userVo.setPassword("");
userVo.setRemark("");
}
}
resVo.setUserVoList(userVoList);
return resVo;
}
......@@ -169,95 +148,180 @@ public class CompanyServiceImpl implements CompanyService{
public SaveCompanyResVo saveCompany(SaveCompanyReqVo reqVo) {
/*返回结果对象*/
SaveCompanyResVo resVo = new SaveCompanyResVo();
/*检查用户名*/
userServiceImpl.isValid(reqVo.getAccount());
UserVo userReqVo = new UserVo();
userReqVo.setAccount(reqVo.getAccount());
userServiceImpl.checkAccount(userReqVo);
/*公司主表*/
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo,reqVo);
companyVo.setId(StringHelper.getNewID());
companyVo.setAddress(reqVo.getCompanyAddress());
companyVo.setStatus(0);
if (null == reqVo.getCompanyId() || reqVo.getCompanyId().isEmpty()){
ObjectHelper.writeWithFrom(companyVo,reqVo);
companyVo.setId(StringHelper.getNewID());
companyVo.setAddress(reqVo.getCompanyAddress());
companyVo.setStatus(0);
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
}else{
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getCompanyId());
CompanyVo companyVo1 = companyDao.load(companyGetReqVo,CompanyVo.class);
ObjectHelper.writeWithFrom(companyVo1,companyVo);
companyVo.setCompanyType(reqVo.getCompanyType());
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyVo.setCompanyName(reqVo.getCompanyName());
companyVo.setAddress(reqVo.getCompanyAddress());
companyVo.setBusinessLicenseCode(reqVo.getBusinessLicenseCode());
companyVo.setContactName(reqVo.getContactName());
companyVo.setContactCode(reqVo.getContactCode());
companyVo.setContactPhone(reqVo.getContactPhone());
}
/*调用支付服务注册*/
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
if ("1".equals(reqVo.getCompanyType())){
if (reqVo.getCompanyType() == 1){
/*银行卡表*/
CompanyBankCardVo bankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(bankCardVo,reqVo);
bankCardVo.setId(StringHelper.getNewID());
bankCardVo.setCompanyId(companyVo.getId());
bankCardVo.setName(reqVo.getContactName());
bankCardVo.setPhone(reqVo.getContactPhone());
bankCardVo.setIdCard(reqVo.getContactCode());
bankCardVo.setType(reqVo.getCompanyType());
bankCardVo.setStatus(0);
/*第一次请求传了银行卡，或者第一次没传，修改后传了*/
if (null == reqVo.getCompanyBankCardId() || reqVo.getCompanyBankCardId().isEmpty()){
ObjectHelper.writeWithFrom(bankCardVo,reqVo);
bankCardVo.setId(StringHelper.getNewID());
bankCardVo.setCompanyId(companyVo.getId());
bankCardVo.setName(reqVo.getContactName());
bankCardVo.setPhone(reqVo.getContactPhone());
bankCardVo.setIdCard(reqVo.getContactCode());
bankCardVo.setType(reqVo.getCompanyType());
bankCardVo.setStatus(0);
}
/*第一次传了，修改后*/
else{
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setId(reqVo.getCompanyBankCardId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
ObjectHelper.writeWithFrom(bankCardVo,companyBankCardVo);
bankCardVo.setBankName(reqVo.getBankName());
bankCardVo.setBankAddress(reqVo.getBankAddress());
bankCardVo.setBankCardCode(reqVo.getBankCardCode());
bankCardVo.setBankCode(reqVo.getBankCode());
bankCardVo.setName(reqVo.getContactName());
bankCardVo.setPhone(reqVo.getContactPhone());
bankCardVo.setIdCard(reqVo.getContactCode());
bankCardVo.setType(reqVo.getCompanyType());
}
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,bankCardVo);
companyReqVo.getBankList().add(companyBankReqVo);
}
/*第一次传了，后面修改为个人类型不需要银行卡，则将之前的删除*/
else if (reqVo.getCompanyType() == 0 && companyVo.getCompanyType() == 1){
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setId(reqVo.getCompanyBankCardId());
companyBankCardDao.remove(companyBankCardGetReqVo);
}
/*注册*/
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
throw new CodeException("保存失败，请重试");
throw new CodeException("获取失败，请重试");
}
CompanyReqVo res = (CompanyReqVo) result.getData();
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1,res);
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
/*保存公司主表*/
companyDao.save(companyVo1);
if (null == reqVo.getCompanyId() || reqVo.getCompanyId().isEmpty()){
companyDao.create(companyVo1);
}else{
companyDao.update(companyVo1);
}
resVo.setCompanyId(companyVo1.getId());
/*保存银行卡表*/
List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
if (null != companyBankReqVoList || !companyBankReqVoList.isEmpty()){
if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()){
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
ObjectHelper.writeWithFrom(companyBankCardVo,companyBankReqVo);
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardDao.save(companyBankCardVo);
if (null == reqVo.getCompanyBankCardId() || reqVo.getCompanyBankCardId().isEmpty()){
companyBankCardDao.create(companyBankCardVo);
}else{
companyBankCardDao.update(companyBankCardVo);
}
resVo.setCompanyBankCardId(companyBankCardVo.getId());
}
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(companyVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.save(extendVo);
resVo.setCompanyExtendId(extendVo.getId());
if (null == reqVo.getCompanyExtendId() || reqVo.getCompanyExtendId().isEmpty()){
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.create(extendVo);
resVo.setCompanyExtendId(extendVo.getId());
}
/*保存商户表*/
MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
merchantCreateReqVo.setId(StringHelper.getNewID());
merchantCreateReqVo.setType(reqVo.getCompanyAttribute());
merchantCreateReqVo.setName(reqVo.getMerchantName());
merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
merchantCreateReqVo.setUserId(reqVo.getCreateId());
merchantCreateReqVo.setUsername(reqVo.getCreateName());
merchantCreateReqVo.setProductCompanyId(companyVo.getId());
if (null != reqVo.getMerchantId() && !reqVo.getMerchantId().isEmpty()){
CompanyScenicInfoReqVo scenicInfoReqVo = new CompanyScenicInfoReqVo();
scenicInfoReqVo.setReqId(reqVo.getReqId());
scenicInfoReqVo.setCompanyId(reqVo.getCompanyId());
scenicInfoReqVo.setProductOrInterface(companyVo.getProductOrInterface());
ResponseResult result2 = storeFeign.getCompanyScenicInfo(scenicInfoReqVo);
if (null != result2 && "00".equals(result2.getCode())){
Merchant merchant = (Merchant) result2.getData();
ObjectHelper.writeWithFrom(merchantCreateReqVo,merchant);
merchantCreateReqVo.setName(reqVo.getMerchantName());
merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
}
}else{
merchantCreateReqVo.setId(StringHelper.getNewID());
merchantCreateReqVo.setType(reqVo.getCompanyAttribute());
merchantCreateReqVo.setName(reqVo.getMerchantName());
merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
merchantCreateReqVo.setUserId(reqVo.getCreateId());
merchantCreateReqVo.setUsername(reqVo.getCreateName());
merchantCreateReqVo.setProductCompanyId(companyVo.getId());
}
ResponseResult result1 = storeFeign.merchantCreate(merchantCreateReqVo);
if (null == result1 || !"00".equals(result1.getCode())){
throw new CodeException("保存失败，请重试");
throw new CodeException("获取失败，请重试");
}
String merchantId = (String) result1.getData();
resVo.setMerchantId(merchantId);
/*保存用户*/
UserVo userVo = new UserVo();
userVo.setId(StringHelper.getNewID());
userVo.setAccount(reqVo.getAccount());
userVo.setPassword(StringHelper.md5("123456"));
userVo.setRemark("123456");
userVo.setCreateId(reqVo.getCreateId());
userVo.setCreateName(reqVo.getCreateName());
userVo.setCompanyId(companyVo.getId());
userDaoImpl.save(userVo);
if (null == reqVo.getUserId() || reqVo.getUserId().isEmpty()){
userVo.setId(StringHelper.getNewID());
userVo.setAccount(reqVo.getAccount());
userVo.setPassword(StringHelper.md5("123456"));
userVo.setRemark("123456");
userVo.setCreateId(reqVo.getCreateId());
userVo.setCreateName(reqVo.getCreateName());
userVo.setCompanyId(companyVo.getId());
userDaoImpl.create(userVo);
}else {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(reqVo.getUserId());
UserVo userVo1 = userDaoImpl.load(userGetReqVo,UserVo.class);
ObjectHelper.writeWithFrom(userVo,userVo1);
userVo.setAccount(reqVo.getAccount());
userDaoImpl.update(userVo);
}
resVo.setUserId(userVo.getId());
return resVo;
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 20ec49f0
......@@ -52,8 +52,6 @@ public class RegisterServiceImpl implements RegisterService {
@Autowired
private StoreFeign storeFeign;
@Autowired
private CompanyService companyService;
@Autowired
VerifyCodeService verifyCodeServiceImpl;
@Autowired
RoleAuthorityDao roleAuthorityDaoImpl;
......@@ -119,6 +117,17 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setInvitationCompanyId(companyExtendVo.getId());
companyVo.setCompanyType(registerUserReqVo.getCompanyType());
companyDaoImpl.create(companyVo);
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(companyVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.create(extendVo);
return companyVo;
}
......@@ -167,16 +176,6 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyDaoImpl.update(companyVo);
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(resCompanyReqVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.save(extendVo);
/*跟新用户表添加联系方式*/
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
......@@ -209,7 +208,7 @@ public class RegisterServiceImpl implements RegisterService {
}
resVo.setCompanyId(companyVo.getId());
resVo.setCompanyExtendId(extendVo.getId());
resVo.setCompanyExtendId(companyVo.getId());
resVo.setUserId(userVo.getId());
return resVo;
......@@ -255,6 +254,7 @@ public class RegisterServiceImpl implements RegisterService {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardDaoImpl.save(companyBankCardVo);
/*保存公司扩展表*/
......@@ -281,9 +281,7 @@ public class RegisterServiceImpl implements RegisterService {
/*保存或更新商户表*/
MerchantCreateReqVo req=new MerchantCreateReqVo();
req.setReqId(StringHelper.getNewID());
req.setId(StringHelper.getNewID());
req.setName(reqVo.getCompanyName());
req.setAddress(reqVo.getAddress());
req.setName(reqVo.getMerchantName());
req.setType(reqVo.getCompanyAttribute());
req.setProductCompanyId(reqVo.getId());
req.setUserId(userVo.getId());
......@@ -293,6 +291,11 @@ public class RegisterServiceImpl implements RegisterService {
}else {
req.setId(reqVo.getMerchantId());
}
if (null == reqVo.getMerchantAddress() || reqVo.getMerchantAddress().isEmpty()){
req.setAddress(reqVo.getAddress());
}else{
req.setAddress(reqVo.getMerchantAddress());
}
ResponseResult result1 = storeFeign.merchantCreate(req);
if (result1.getCode().equals("00")){
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ 20ec49f0
......@@ -53,11 +53,17 @@ public class UserServiceImpl implements UserService {
webUserReqVo.setRemark(password);
String md5Password = this.passwordEncoder(password);
webUserReqVo.setPassword(md5Password);
webUserReqVo.setId(StringHelper.getNewID());
UserVo userVo = new UserVo();
ObjectHelper.writeWithFrom(userVo,webUserReqVo);
userDao.create(userVo);
if (null == webUserReqVo.getId() || webUserReqVo.getId().isEmpty()){
webUserReqVo.setId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(userVo,webUserReqVo);
userDao.create(userVo);
}else{
ObjectHelper.writeWithFrom(userVo,webUserReqVo);
userDao.update(userVo);
}
saveUserRole(webUserReqVo);
return userVo.getId();
......@@ -66,6 +72,11 @@ public class UserServiceImpl implements UserService {
private void saveUserRole(WebUserReqVo webUserReqVo){
if (webUserReqVo.getRoleIds()!=null && !webUserReqVo.getRoleIds().isEmpty()){
List<String> roleIds = webUserReqVo.getRoleIds();
/*删除该用户之前的角色*/
UserRoleVo reqVo = new UserRoleVo();
reqVo.setUserId(webUserReqVo.getId());
userRoleDao.remove(reqVo);
/*设置新角色*/
for (String roleId : roleIds) {
UserRoleVo userRoleRelation = new UserRoleVo();
userRoleRelation.setRoleId(roleId);
......
src/main/java/com/pangding/web/authority/vo/CompanyVo.java
View file @ 20ec49f0
......@@ -65,6 +65,17 @@ public class CompanyVo extends BaseVo implements InitDao {
@TableAnnotation("product_or_interface")
private int productOrInterface;
@TableAnnotation("examine_status")
private int examineStatus;
public int getExamineStatus() {
return examineStatus;
}
public void setExamineStatus(int examineStatus) {
this.examineStatus = examineStatus;
}
public int getProductOrInterface() {
return productOrInterface;
}
......
src/main/java/com/pangding/web/authority/vo/UserVo.java
View file @ 20ec49f0
......@@ -24,7 +24,7 @@ public class UserVo extends BaseVo implements InitDao {
private String phone;
private int status;
private String status;
private String remark;
......@@ -92,11 +92,11 @@ public class UserVo extends BaseVo implements InitDao {
this.phone = phone;
}
public int getStatus() {
public String getStatus() {
return status;
}
public void setStatus(int status) {
public void setStatus(String status) {
this.status = status;
}
......
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyBankCardGetReqVo.java
View file @ 20ec49f0
......@@ -11,6 +11,16 @@ public class CompanyBankCardGetReqVo {
private String companyId;
private int isDefault;
public int getIsDefault() {
return isDefault;
}
public void setIsDefault(int isDefault) {
this.isDefault = isDefault;
}
public String getReqId() {
return reqId;
}
......
src/main/java/com/pangding/web/authority/vo/reqvo/RegisterEnterpriceReqVo.java
View file @ 20ec49f0
......@@ -37,10 +37,18 @@ public class RegisterEnterpriceReqVo {
private String bankCode;
private String reservedPhone;
private String merchantId;
private String merchantAddress;
public String getMerchantAddress() {
return merchantAddress;
}
public void setMerchantAddress(String merchantAddress) {
this.merchantAddress = merchantAddress;
}
public String getMerchantId() {
return merchantId;
}
......@@ -177,11 +185,4 @@ public class RegisterEnterpriceReqVo {
this.bankCode = bankCode;
}
public String getReservedPhone() {
return reservedPhone;
}
public void setReservedPhone(String reservedPhone) {
this.reservedPhone = reservedPhone;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/SaveCompanyReqVo.java
View file @ 20ec49f0
......@@ -92,6 +92,57 @@ public class SaveCompanyReqVo {
*/
private String createName;
private String companyId;
private String companyExtendId;
private String companyBankCardId;
private String merchantId;
private String userId;
public String getCompanyExtendId() {
return companyExtendId;
}
public void setCompanyExtendId(String companyExtendId) {
this.companyExtendId = companyExtendId;
}
public String getCompanyBankCardId() {
return companyBankCardId;
}
public void setCompanyBankCardId(String companyBankCardId) {
this.companyBankCardId = companyBankCardId;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCreateId() {
return createId;
}
......
src/main/java/com/pangding/web/authority/vo/resvo/CompanyResVo.java
View file @ 20ec49f0
......@@ -9,7 +9,7 @@ import java.util.List;
* @create 2019/5/23 14:53
*/
public class CompanyResVo {
private List<UserVo> userVoList;
private UserVo userVo;
private CompanyVo companyVo;
......@@ -17,7 +17,7 @@ public class CompanyResVo {
private CompanyExtendVo companyExtendVo;
private List<CompanyBankCardVo> bankCardVoList;
private CompanyBankCardVo bankCardVo;
public Merchant getMerchant() {
return merchant;
......@@ -27,20 +27,20 @@ public class CompanyResVo {
this.merchant = merchant;
}
public List<UserVo> getUserVoList() {
return userVoList;
public UserVo getUserVo() {
return userVo;
}
public void setUserVoList(List<UserVo> userVoList) {
this.userVoList = userVoList;
public void setUserVo(UserVo userVo) {
this.userVo = userVo;
}
public List<CompanyBankCardVo> getBankCardVoList() {
return bankCardVoList;
public CompanyBankCardVo getBankCardVo() {
return bankCardVo;
}
public void setBankCardVoList(List<CompanyBankCardVo> bankCardVoList) {
this.bankCardVoList = bankCardVoList;
public void setBankCardVo(CompanyBankCardVo bankCardVo) {
this.bankCardVo = bankCardVo;
}
public CompanyVo getCompanyVo() {
......
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