Skip to content

T
tcm-system
Commit 6c9fd51b authored by zjy's avatar zjy
Browse files
Options

user/role/tright 6.8 

还需要调用其他服务
parent 472604eb
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 42 deletions
src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java
View file @ 6c9fd51b
......@@ -4,6 +4,7 @@ import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
......@@ -69,7 +70,6 @@ public class CompanyManagementController {
checkCompany(reqVo);
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.notBlankCheck("verifyCode",reqVo.getVerifyCode())
.checkException();
companyServiceImpl.companySubmit(reqVo);
return new ResponseResult();
......@@ -161,7 +161,7 @@ public class CompanyManagementController {
* @return 银行卡列表分页对象
*/
@RequestMapping(value = "/bankCardList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<CompanyBankCardVo>> bankCardList(@RequestBody BankCardListReqVo reqVo){
public ResponseResult bankCardList(@RequestBody BankCardListReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.checkException();
......@@ -235,20 +235,6 @@ public class CompanyManagementController {
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();
}
/**
* 通过公司id查询该公司邀请的公司
* @param reqVo 封装了公司id的请求对象
......
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ 6c9fd51b
......@@ -4,6 +4,7 @@ import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
......@@ -89,21 +90,18 @@ public class PangdingManagementController {
.checkException();
}
/**
* 添加公司提交按钮
* @param reqVo 封装了公司id和验证码的请求对象
* @return
*/
@RequestMapping(value = "/companySubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult companySubmit(@RequestBody SaveCompanyReqVo reqVo){
public ResponseResult<SaveCompanyResVo> companySubmit(@RequestBody SaveCompanyReqVo reqVo){
checkCompany(reqVo);
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.notBlankCheck("verifyCode",reqVo.getVerifyCode())
.checkException();
companyServiceImpl.companySubmit(reqVo);
return new ResponseResult();
return ResponseResult.result(companyServiceImpl.companySubmit(reqVo));
}
/**y
......@@ -179,7 +177,7 @@ public class PangdingManagementController {
* @return 银行卡列表分页对象
*/
@RequestMapping(value = "/bankCardList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<CompanyBankCardVo>> bankCardList(@RequestBody BankCardListReqVo reqVo){
public ResponseResult bankCardList(@RequestBody BankCardListReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.checkException();
......
src/main/java/com/pangding/web/authority/dao/CompanyBankCardDao.java
View file @ 6c9fd51b
......@@ -3,6 +3,7 @@ package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -16,7 +17,7 @@ public interface CompanyBankCardDao extends BaseDao {
* @param reqVo
* @return
*/
PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo);
PageSizeData<CompanyBankCardResVo> getBankCardList(BankCardListReqVo reqVo);
/**
* 将指定银行卡设置为非默认
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyBankCardDaoImpl.java
View file @ 6c9fd51b
......@@ -4,6 +4,7 @@ import com.pangding.web.authority.dao.CompanyBankCardDao;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
......@@ -35,8 +36,8 @@ public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCa
* @return
*/
@Override
public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
return this.queryPage(CompanyBankCardVo.class,reqVo,GET_BANK_CARD_LIST,reqVo);
public PageSizeData<CompanyBankCardResVo> getBankCardList(BankCardListReqVo reqVo) {
return this.queryPage(CompanyBankCardResVo.class,reqVo,GET_BANK_CARD_LIST,reqVo);
}
@Override
......
src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java
View file @ 6c9fd51b
......@@ -39,7 +39,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
.add("superAdminRoleId","and ur.role_id = ?")
.add("companyId","and u.company_id = ? ");
table.add(COUNT_BY_ROLE,"select u.* from pd_user u,pd_user_role ur where WHERE u.id = ur.user_id")
table.add(COUNT_BY_ROLE,"select u.* from pd_user u,pd_user_role ur WHERE u.id = ur.user_id")
.add("companyId","and u.company_id = ? ")
.add("roleId","and ur.role_id = ? ")
.add("query","and u.name = ? or u.account = ? or phone = ?");
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 6c9fd51b
......@@ -4,6 +4,7 @@ package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyBankCardResVo;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
......@@ -63,7 +64,7 @@ public interface CompanyService{
* @param reqVo 封装了公司id和验证码的请求对象
* @return
*/
void companySubmit(SaveCompanyReqVo reqVo);
SaveCompanyResVo companySubmit(SaveCompanyReqVo reqVo);
/**
* 仅将公司状态设置为12（停用）
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 6c9fd51b
......@@ -12,6 +12,7 @@ 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.CompanyBankCardResVo;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
......@@ -251,9 +252,13 @@ public class CompanyServiceImpl implements CompanyService{
userVo.setAccount(reqVo.getAccount());
userVo.setPassword(StringHelper.md5("123456"));
userVo.setRemark("123456");
userVo.setName(reqVo.getContactName());
userVo.setCreateId(reqVo.getCreateId());
userVo.setCreateName(reqVo.getCreateName());
userVo.setCompanyId(companyVo.getId());
userVo.setPhone(reqVo.getContactPhone());
/*检查手机是否存在*/
userServiceImpl.checkPhone(userVo);
userDaoImpl.create(userVo);
/*将该用户设置为超级管理员*/
......@@ -261,6 +266,7 @@ public class CompanyServiceImpl implements CompanyService{
userRoleVo.setId(StringHelper.getNewID());
userRoleVo.setUserId(userVo.getId());
userRoleVo.setRoleId(RoleConstant.SUPER_ADMIN_ROLE_ID);
userRoleDaoImpl.create(userRoleVo);
resVo.setUserId(userVo.getId());
......@@ -275,7 +281,9 @@ public class CompanyServiceImpl implements CompanyService{
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void companySubmit(SaveCompanyReqVo reqVo) {
public SaveCompanyResVo companySubmit(SaveCompanyReqVo reqVo) {
/*返回对象*/
SaveCompanyResVo resVo = new SaveCompanyResVo();
/*公司主表*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getCompanyId());
......@@ -287,11 +295,17 @@ public class CompanyServiceImpl implements CompanyService{
companyVo.setContactName(reqVo.getContactName());
companyVo.setContactCode(reqVo.getContactCode());
companyVo.setContactPhone(reqVo.getContactPhone());
companyVo.setUpdateTime(DateHelper.getNow());
resVo.setCompanyId(companyVo.getId());
resVo.setCompanyExtendId(companyVo.getId());
/*注册请求对象*/
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
companyReqVo.setValidateCode(reqVo.getVerifyCode());
if (null != reqVo.getVerifyCode() && !reqVo.getVerifyCode().isEmpty()){
companyReqVo.setValidateCode(reqVo.getVerifyCode());
}
companyReqVo.setId(reqVo.getId());
/*银行卡*/
......@@ -299,9 +313,18 @@ public class CompanyServiceImpl implements CompanyService{
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setId(reqVo.getCompanyBankCardId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setIdCard(reqVo.getContactCode());
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardVo.setBankName(reqVo.getBankName());
companyBankCardVo.setBankAddress(reqVo.getBankAddress());
companyBankCardVo.setBankCardCode(reqVo.getBankCardCode());
companyBankCardVo.setBankCode(reqVo.getBankCode());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
companyReqVo.getBankList().add(companyBankReqVo);
resVo.setCompanyBankCardId(companyBankCardVo.getId());
}
/*注册服务验证验证码*/
......@@ -335,6 +358,7 @@ public class CompanyServiceImpl implements CompanyService{
ObjectHelper.writeWithFrom(companyScenicInfoReqVo,companyVo);
companyScenicInfoReqVo.setCompanyId(companyVo.getId());
companyScenicInfoReqVo.setReqId(reqVo.getReqId());
companyScenicInfoReqVo.setProductOrInterface(companyVo.getProductOrInterface());
ResponseResult result1 = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
if (null == result1 || !"00".equals(result1.getCode())){
throw new CodeException("验证失败，请重试");
......@@ -346,6 +370,8 @@ public class CompanyServiceImpl implements CompanyService{
merchantCreateReqVo.setName(reqVo.getMerchantName());
merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
resVo.setMerchantId(merchant.getId());
ResponseResult result2 = storeFeign.merchantCreate(merchantCreateReqVo);
if (null == result2 || !"00".equals(result2.getCode())){
throw new CodeException("验证失败，请重试");
......@@ -356,7 +382,13 @@ public class CompanyServiceImpl implements CompanyService{
userGetReqVo.setId(reqVo.getUserId());
UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
userVo.setAccount(reqVo.getAccount());
userVo.setName(reqVo.getContactName());
userVo.setPhone(reqVo.getContactPhone());
userServiceImpl.checkPhone(userVo);
userDaoImpl.update(userVo);
resVo.setUserId(userVo.getId());
return resVo;
}
/**
......@@ -392,19 +424,21 @@ public class CompanyServiceImpl implements CompanyService{
getReqVo.setId(reqVo.getId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo){
companyBankCardDao.update(reqVo);
ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
companyBankCardDao.update(companyBankCardVo);
}
}
/*若卡不存在，则新增*/
else{
reqVo.setId(id);
BankCardListReqVo reqVo1 = new BankCardListReqVo();
PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
PageSizeData<CompanyBankCardResVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
/*若该银行卡是第一张银行卡，则设为默认*/
if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()){
reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
}
reqVo.setStatus(0);
companyBankCardDao.create(reqVo);
}
......@@ -518,7 +552,7 @@ public class CompanyServiceImpl implements CompanyService{
throw new CodeException("暂无公司扩展表信息");
}
String url = companyExtendVo.getQrCodeUrl();
if (null != url && !url.isEmpty()){
if (null != url && !url.isEmpty() && reqVo.getSelect() == 1){
return url;
}
String qrCode = companyExtendVo.getQrCode();
......@@ -538,7 +572,7 @@ public class CompanyServiceImpl implements CompanyService{
scene.setScene_str(companyExtendVo.getQrCode());
sceneInfo.setScene(scene);
qrCodeReqVo.setAction_info(sceneInfo);
if (select == 1){
if (select == 0){
qrCodeReqVo.setExpire_seconds(60*30);
qrCodeReqVo.setAction_name("QR_STR_SCENE");
}else{
......@@ -568,11 +602,12 @@ public class CompanyServiceImpl implements CompanyService{
*/
@Override
public PageSizeData<CompanyBankCardVo> getBankCardList(BankCardListReqVo reqVo) {
PageSizeData<CompanyBankCardVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardList(reqVo);
return companyBankCardDao.loadPage(reqVo,CompanyBankCardVo.class);
/* PageSizeData<CompanyBankCardResVo> companyBankCardVoPageSizeData = companyBankCardDao.getBankCardList(reqVo);
if (companyBankCardVoPageSizeData == null || companyBankCardVoPageSizeData.getList().isEmpty()) {
throw new CodeException("暂无银行卡，请先添加");
}
return companyBankCardVoPageSizeData;
}*/
// return companyBankCardVoPageSizeData;
}
/**
......
src/main/java/com/pangding/web/authority/vo/CompanyBankCardVo.java
View file @ 6c9fd51b
......@@ -49,6 +49,14 @@ public class CompanyBankCardVo extends BaseVo {
@TableAnnotation("is_default")
private int isDefault;
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public int getIsDefault() {
return isDefault;
}
......@@ -129,13 +137,7 @@ public class CompanyBankCardVo extends BaseVo {
this.idCard = idCard;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public int getStatus() {
return status;
......
src/main/java/com/pangding/web/authority/vo/resvo/CompanyBankCardResVo.java 0 → 100644
View file @ 6c9fd51b
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.CompanyBankCardVo;
/**
* @Author zhangjinyao
* @create 2019/6/8 19:09
*/
public class CompanyBankCardResVo extends CompanyBankCardVo {
private String reservedPhone;
public String getReservedPhone() {
return reservedPhone;
}
public void setReservedPhone(String reservedPhone) {
this.reservedPhone = reservedPhone;
}
}
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