Skip to content

T
tcm-system
Commit 768cb72f authored by tangf's avatar tangf
Browse files
Options

修改注册流程

parent e62f55c3
Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 93 deletions
src/main/java/com/pangding/web/authority/controller/CompanyCtroller.java → src/main/java/com/pangding/web/authority/controller/CompanyController.java
View file @ 768cb72f
......@@ -3,8 +3,10 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -14,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/newCompany")
public class CompanyCtroller {
public class CompanyController {
@Autowired
private CompanyService companyService;
......@@ -30,6 +32,13 @@ public class CompanyCtroller {
return ResponseResult.result(companyService.findCompanyBalance(req));
}
@ApiOperation(value ="公司，个人实名制", notes = "返回实名制结果")
@RequestMapping(value = "/updateCompanyInfo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<SaveCompanyReqVo> updateCompanyInfo(@RequestBody SaveCompanyReqVo req){
CheckerHelper.newInstance().notBlankCheck("id",req.getCompanyVo().getId()).checkException();
return companyService.updateCompanyInfo(req);
}
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @ 768cb72f
......@@ -29,7 +29,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
.add("examineStatus","and examine_status = ?")
.add("companyId","and invitation_company_id = ? ");
getSql(DaoConst.LOAD).addCode("{FIELD}", ",b.*", "{INNER}", "INNER JOIN pd_compnay_extend b ON a.id = b.id");
getSql(DaoConst.LOAD).addCode("{FIELD}", ",b.*", "{INNER}", "INNER JOIN pd_company_extend b ON a.id = b.id");
}
......
src/main/java/com/pangding/web/authority/feign/PayFeign.java
View file @ 768cb72f
......@@ -2,10 +2,12 @@ package com.pangding.web.authority.feign;
import com.pangding.web.authority.vo.reqvo.CompanyBankReqVo;
import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
......@@ -23,7 +25,10 @@ public interface PayFeign {
* @return
*/
@RequestMapping(value="/register")
public ResponseResult<CompanyReqVo> setCompanyInfo(@RequestBody CompanyReqVo req);
ResponseResult<CompanyReqVo> setCompanyInfo(@RequestBody CompanyReqVo req);
@RequestMapping(value = "/setCompanyInfo", method = RequestMethod.POST)
ResponseResult<SaveCompanyReqVo> setCompanyInfo1(@RequestBody SaveCompanyReqVo req);
/**
* 绑定银行卡
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 768cb72f
......@@ -17,6 +17,13 @@ import java.util.List;
*/
public interface CompanyService{
/**
* 公司个人实名认证
* @param req
* @return
*/
ResponseResult<com.pangding.web.vo.system.req.company.SaveCompanyReqVo> updateCompanyInfo(com.pangding.web.vo.system.req.company.SaveCompanyReqVo req);
/**
* 修改公司信息
* @param companyVo
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 768cb72f
......@@ -14,6 +14,7 @@ import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.constant.OrderConstant;
import com.pangding.web.constant.PangdConstant;
import com.pangding.web.mq.CompanyProducer;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.order.req.CapitalFlowReqVo;
......@@ -42,6 +43,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -53,13 +55,13 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private CompanyDao companyDao;
@Autowired
private CompanyExtendDao companyExtendDaoImpl;
private CompanyExtendDao companyExtendDao;
@Autowired
private CompanyBankCardDao companyBankCardDao;
@Autowired
private UserService userServiceImpl;
private UserService userService;
@Autowired
private UserDao userDaoImpl;
private UserDao userDao;
@Autowired
private PayFeign payFeign;
@Autowired
......@@ -67,15 +69,15 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private WxFeign wxFeign;
@Autowired
private UserRoleDao userRoleDaoImpl;
private UserRoleDao userRoleDao;
@Autowired
private PangdingPartnerService pangdingPartnerServiceImpl;
private PangdingPartnerService pangdingPartnerService;
@Autowired
private CompanyMsgDao companyMsgDao;
@Autowired
private CompanyDivideRuleDao companyDivideRuleDao;
@Autowired
private RoleDao roleDaoImpl;
private RoleDao roleDao;
@Autowired
private CompanyMoneyDetailDao companyMoneyDetailDao;
@Autowired
......@@ -121,7 +123,7 @@ public class CompanyServiceImpl implements CompanyService {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setIsFirst(1);
userGetReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
UserVo userVo = userDao.load(userGetReqVo, UserVo.class);
if (null != userVo) {
userVo.setPassword("");
userVo.setRemark("");
......@@ -129,12 +131,12 @@ public class CompanyServiceImpl implements CompanyService {
} else {
UserGetReqVo userGetReqVo1 = new UserGetReqVo();
userGetReqVo1.setCompanyId(reqVo.getId());
UserVo userVo1 = userDaoImpl.load(userGetReqVo1, UserVo.class);
UserVo userVo1 = userDao.load(userGetReqVo1, UserVo.class);
resVo.setUserVo(userVo1);
}
/*获取没有公司id的角色数组*/
GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
List<RoleVo> roleVoList = roleDaoImpl.getEmptyRoles(getEmptyRolesReqVo);
List<RoleVo> roleVoList = roleDao.getEmptyRoles(getEmptyRolesReqVo);
/*if (null == roleVoList || roleVoList.isEmpty()){
throw new CodeException("暂无未分配的角色，请先创建角色");
}*/
......@@ -168,7 +170,7 @@ public class CompanyServiceImpl implements CompanyService {
/*获取公司扩展表信息*/
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setId(reqVo.getId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null != companyExtendVo) {
resVo.setCompanyExtendVo(companyExtendVo);
}
......@@ -196,13 +198,13 @@ public class CompanyServiceImpl implements CompanyService {
SaveCompanyResVo resVo = new SaveCompanyResVo();
/*检查用户名*/
if (!StringHelper.isEmpty(reqVo.getAccount())) {
userServiceImpl.isValid(reqVo.getAccount());
userService.isValid(reqVo.getAccount());
UserVo userReqVo = new UserVo();
userReqVo.setAccount(reqVo.getAccount());
if (null != reqVo.getUserId() && !reqVo.getUserId().isEmpty()) {
userReqVo.setId(reqVo.getUserId());
}
userServiceImpl.checkAccount(userReqVo);
userService.checkAccount(userReqVo);
}
/*公司主表*/
......@@ -284,9 +286,9 @@ public class CompanyServiceImpl implements CompanyService {
.replace(" ", "");
extendVo.setQrCode(qrCode);
if (!StringHelper.isEmpty(reqVo.getCompanyExtendId())) {
companyExtendDaoImpl.update(extendVo);
companyExtendDao.update(extendVo);
} else {
companyExtendDaoImpl.create(extendVo);
companyExtendDao.create(extendVo);
}
resVo.setCompanyExtendId(extendVo.getId());
......@@ -322,7 +324,7 @@ public class CompanyServiceImpl implements CompanyService {
} else {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(reqVo.getUserId());
userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
userVo = userDao.load(userGetReqVo, UserVo.class);
}
userVo.setAccount(reqVo.getAccount());
userVo.setName(reqVo.getContactName());
......@@ -331,9 +333,9 @@ public class CompanyServiceImpl implements CompanyService {
/*检查手机是否存在*/
/*userServiceImpl.checkPhone(userVo);*/
if (!StringHelper.isEmpty(reqVo.getUserId())) {
userDaoImpl.update(userVo);
userDao.update(userVo);
} else {
userDaoImpl.create(userVo);
userDao.create(userVo);
}
resVo.setUserId(userVo.getId());
......@@ -353,9 +355,7 @@ public class CompanyServiceImpl implements CompanyService {
/*返回对象*/
SaveCompanyResVo resVo = new SaveCompanyResVo();
/*公司主表*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getCompanyId());
CompanyVo companyVo = companyDao.load(companyGetReqVo, CompanyVo.class);
CompanyVo companyVo = companyDao.load(reqVo.getCompanyId(), CompanyVo.class);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyVo.setCompanyName(reqVo.getCompanyName());
companyVo.setAddress(reqVo.getCompanyAddress());
......@@ -378,9 +378,7 @@ public class CompanyServiceImpl implements CompanyService {
/*银行卡*/
if (null != reqVo.getCompanyBankCardId() && !reqVo.getCompanyBankCardId().isEmpty()) {
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setId(reqVo.getCompanyBankCardId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(reqVo.getCompanyBankCardId(), CompanyBankCardVo.class);
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setIdCard(reqVo.getContactCode());
companyBankCardVo.setReservedPhone(reqVo.getContactPhone());
......@@ -449,12 +447,12 @@ public class CompanyServiceImpl implements CompanyService {
/*更新用户表*/
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(reqVo.getUserId());
UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
UserVo userVo = userDao.load(userGetReqVo, UserVo.class);
userVo.setAccount(reqVo.getAccount());
userVo.setName(reqVo.getContactName());
userVo.setPhone(reqVo.getContactPhone());
/*userServiceImpl.checkPhone(userVo);*/
userDaoImpl.update(userVo);
userDao.update(userVo);
resVo.setUserId(userVo.getId());
return resVo;
......@@ -494,8 +492,8 @@ public class CompanyServiceImpl implements CompanyService {
checkReqVo.setBankCardCode(reqVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(checkReqVo, CompanyBankCardVo.class);
// 银行卡不为空，并且状态为已绑定成功
if(!StringHelper.isEmpty(companyBankCardVo)){
if(com.pangding.web.constant.CompanyConstant.BANK_STATUS_SUCCESS == companyBankCardVo.getStatus()){
if (!StringHelper.isEmpty(companyBankCardVo)) {
if (com.pangding.web.constant.CompanyConstant.BANK_STATUS_SUCCESS == companyBankCardVo.getStatus()) {
throw new CodeException("银行卡已绑定，不可修改。");
}
ObjectHelper.writeWithToClass(companyBankCardVo, reqVo);
......@@ -510,7 +508,7 @@ public class CompanyServiceImpl implements CompanyService {
ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
companyBankCardVo.setIsDefault(reqVo.getIsDefault());
companyBankCardDao.update(companyBankCardVo);
}else{
} else {
com.pangding.web.vo.system.pd.company.CompanyBankCardVo saveCompanyBankVo = new com.pangding.web.vo.system.pd.company.CompanyBankCardVo();
ObjectHelper.writeWithToClass(saveCompanyBankVo, reqVo);
/*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
......@@ -562,7 +560,7 @@ public class CompanyServiceImpl implements CompanyService {
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
if (null != companyBankCardVo) {
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyExtendDaoImpl.update(companyBankCardVo);
companyExtendDao.update(companyBankCardVo);
}
}
companyBankCardDao.remove(bankCardVo);
......@@ -647,11 +645,11 @@ public class CompanyServiceImpl implements CompanyService {
public String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
CompanyExtendGetReqVo reqVo1 = new CompanyExtendGetReqVo();
reqVo1.setId(reqVo.getCompanyId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo1, CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo1, CompanyExtendVo.class);
if (null == companyExtendVo) {
companyExtendVo = new CompanyExtendVo();
companyExtendVo.setId(reqVo.getCompanyId());
companyExtendDaoImpl.save(companyExtendVo);
companyExtendDao.save(companyExtendVo);
}
String url = companyExtendVo.getQrCodeUrl();
if (null != url && !url.isEmpty() && reqVo.getSelect() == 1) {
......@@ -693,7 +691,7 @@ public class CompanyServiceImpl implements CompanyService {
String qrCodeUrl = wxVo.getPdUrl();
if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())) {
companyExtendVo.setQrCodeUrl(qrCodeUrl);
companyExtendDaoImpl.update(companyExtendVo);
companyExtendDao.update(companyExtendVo);
}
return qrCodeUrl;
}
......@@ -722,7 +720,7 @@ public class CompanyServiceImpl implements CompanyService {
*/
@Override
public String saveUser(WebUserReqVo reqVo) throws Exception {
return userServiceImpl.saveUser(reqVo);
return userService.saveUser(reqVo);
}
/**
......@@ -758,24 +756,24 @@ public class CompanyServiceImpl implements CompanyService {
for (String userId : userIdList) {
UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
userRoleGetReqVo.setUserId(userId);
List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(userRoleGetReqVo, UserRoleVo.class);
List<UserRoleVo> userRoleVoList = userRoleDao.loadList(userRoleGetReqVo, UserRoleVo.class);
if (null != userRoleVoList && userRoleVoList.size() == 1) {
UserRoleGetReqVo userRoleGetReqVo1 = new UserRoleGetReqVo();
userRoleGetReqVo1.setUserId(userId);
userRoleGetReqVo1.setRoleId(reqVo.getRoleId());
UserRoleVo userRoleVo = userRoleDaoImpl.load(userRoleGetReqVo1, UserRoleVo.class);
userRoleDaoImpl.remove(userRoleVo);
UserRoleVo userRoleVo = userRoleDao.load(userRoleGetReqVo1, UserRoleVo.class);
userRoleDao.remove(userRoleVo);
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(userId);
UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
UserVo userVo = userDao.load(userGetReqVo, UserVo.class);
userVo.setStatus(1);
userDaoImpl.update(userVo);
userDao.update(userVo);
} else if (null != userRoleVoList && userRoleVoList.size() > 1) {
UserRoleGetReqVo userRoleGetReqVo1 = new UserRoleGetReqVo();
userRoleGetReqVo1.setUserId(userId);
userRoleGetReqVo1.setRoleId(reqVo.getRoleId());
UserRoleVo userRoleVo = userRoleDaoImpl.load(userRoleGetReqVo1, UserRoleVo.class);
userRoleDaoImpl.remove(userRoleVo);
UserRoleVo userRoleVo = userRoleDao.load(userRoleGetReqVo1, UserRoleVo.class);
userRoleDao.remove(userRoleVo);
}
}
}
......@@ -795,10 +793,10 @@ public class CompanyServiceImpl implements CompanyService {
for (UserVo userVo : userVoList) {
UserGetReqVo getReqVo = new UserGetReqVo();
getReqVo.setId(userVo.getId());
UserVo userVoOld = userDaoImpl.load(getReqVo, UserVo.class);
UserVo userVoOld = userDao.load(getReqVo, UserVo.class);
if (!StringHelper.compare(userVo.getAccount(), userVoOld.getAccount())) {
userServiceImpl.isValid(userVo.getAccount());
userServiceImpl.checkAccount(userVo);
userService.isValid(userVo.getAccount());
userService.checkAccount(userVo);
}
if ("".equals(userVo.getPassword())) {
userVo.setPassword(userVoOld.getPassword());
......@@ -809,12 +807,12 @@ public class CompanyServiceImpl implements CompanyService {
userVo.setRemark(password);
}
if (!StringHelper.compare(userVo.getEmail(), userVoOld.getEmail())) {
userServiceImpl.checkEmail(userVo.getEmail());
userService.checkEmail(userVo.getEmail());
}
if (!StringHelper.compare(userVo.getPhone(), userVoOld.getPhone())) {
userServiceImpl.checkPhone(userVo);
userService.checkPhone(userVo);
}
userDaoImpl.update(userVo);
userDao.update(userVo);
}
}
......@@ -831,7 +829,7 @@ public class CompanyServiceImpl implements CompanyService {
@Override
public String invitation(InvitationReqVo reqVo) {
return pangdingPartnerServiceImpl.invitation(reqVo);
return pangdingPartnerService.invitation(reqVo);
}
/**
......@@ -844,7 +842,7 @@ public class CompanyServiceImpl implements CompanyService {
public GetCompanyResVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo) {
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null != companyExtendVo) {
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(companyExtendVo.getId());
......@@ -884,7 +882,7 @@ public class CompanyServiceImpl implements CompanyService {
public CompanyVo checkInvitationCode(CheckInvitationCodeReqVo reqVo) {
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setInvitationCode(reqVo.getInvitationCode());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null == companyExtendVo) {
throw new CodeException("该邀请码为错误邀请码");
}
......@@ -912,7 +910,7 @@ public class CompanyServiceImpl implements CompanyService {
/*更新公司扩展表*/
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setId(reqVo.getCompanyId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null == companyExtendVo) {
companyExtendVo = new CompanyExtendVo();
companyExtendVo.setId(reqVo.getCompanyId());
......@@ -924,13 +922,13 @@ public class CompanyServiceImpl implements CompanyService {
companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
companyExtendDaoImpl.create(companyExtendVo);
companyExtendDao.create(companyExtendVo);
} else {
companyExtendVo.setWithdrawMoney(reqVo.getWithdrawMoney());
companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
companyExtendDaoImpl.update(companyExtendVo);
companyExtendDao.update(companyExtendVo);
}
/*新增或更新pd_company_divide_rule表*/
CompanyDivideRuleVo companyDivideRuleVo = new CompanyDivideRuleVo();
......@@ -953,23 +951,23 @@ public class CompanyServiceImpl implements CompanyService {
/*更新角色表*/
RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setId(reqVo.getRoleId());
RoleVo roleVo = roleDaoImpl.load(roleGetReqVo, RoleVo.class);
RoleVo roleVo = roleDao.load(roleGetReqVo, RoleVo.class);
roleVo.setCompanyId(reqVo.getCompanyId());
roleVo.setIsAdmin(1);
roleDaoImpl.update(roleVo);
roleDao.update(roleVo);
/*保存用户角色关系*/
UserRoleVo userRoleVo = new UserRoleVo();
userRoleVo.setId(StringHelper.getNewID());
userRoleVo.setUserId(reqVo.getUserId());
userRoleVo.setRoleId(roleVo.getId());
userRoleDaoImpl.create(userRoleVo);
userRoleDao.create(userRoleVo);
}
@Override
public ResponseResult<String> updateCompanyMoney(CompanyMoneyUpdateReqVo req) {
CompanyVo companyVo = companyDao.load(req.getCompanyId(), CompanyVo.class);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(req.getCompanyId(), CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(req.getCompanyId(), CompanyExtendVo.class);
if (StringHelper.isEmpty(companyVo) || StringHelper.isEmpty(companyExtendVo)) {
throw new CodeException("未找到公司信息");
}
......@@ -1015,7 +1013,7 @@ public class CompanyServiceImpl implements CompanyService {
// }
companyExtendVo.setWithdrawTotalCash(companyMoney);
companyExtendDaoImpl.update(companyExtendVo);
companyExtendDao.update(companyExtendVo);
return ResponseResult.result("处理完成");
} catch (CodeException e) {
throw new CodeException("");
......@@ -1027,7 +1025,7 @@ public class CompanyServiceImpl implements CompanyService {
com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(req.getId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
CompanyExtendResVo companyExtendResVo = companyExtendDaoImpl.load(req.getId(), CompanyExtendResVo.class);
CompanyExtendResVo companyExtendResVo = companyExtendDao.load(req.getId(), CompanyExtendResVo.class);
List<CompanyMoneyDetailResVo> companyMoneyDetailResVoList = companyMoneyDetailDao.loadList(
new CompanyMoneyDetailReqVo(req.getId()), CompanyMoneyDetailResVo.class);
......@@ -1040,7 +1038,7 @@ public class CompanyServiceImpl implements CompanyService {
public void automaticCashWithdrawal(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
PageSizeData<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoPageSizeData = companyExtendDaoImpl.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyExtendVo.class);
PageSizeData<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoPageSizeData = companyExtendDao.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyExtendVo.class);
List<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoList = companyExtendVoPageSizeData.getList();
PageSizeData<com.pangding.web.vo.system.pd.company.CompanyVo> companyVoPageSizeData = companyDao.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyVo.class);
List<com.pangding.web.vo.system.pd.company.CompanyVo> companyVoList = companyVoPageSizeData.getList();
......@@ -1053,12 +1051,12 @@ public class CompanyServiceImpl implements CompanyService {
int withdrawRule = companyExtendVo.getWithdrawRule();
double withdrawTotalCash = companyExtendVo.getWithdrawTotalCash();
if (0 == withdrawRule && withdrawTotalCash > 0) {
// 自动提现
// 自动提现
CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
companyBankCardReqVo.setCompanyId(companyId);
companyBankCardReqVo.setIsDefault(1);
com.pangding.web.vo.system.pd.company.CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardReqVo, com.pangding.web.vo.system.pd.company.CompanyBankCardVo.class);
if(!StringHelper.isEmpty(companyBankCardVo)){
if (!StringHelper.isEmpty(companyBankCardVo)) {
CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo();
capitalFlowReqVo.setCompanyId(companyId);
capitalFlowReqVo.setBankId(companyBankCardVo.getId());
......@@ -1069,8 +1067,79 @@ public class CompanyServiceImpl implements CompanyService {
}
}
}
}
@Override
public ResponseResult<com.pangding.web.vo.system.req.company.SaveCompanyReqVo> updateCompanyInfo(com.pangding.web.vo.system.req.company.SaveCompanyReqVo req) {
ResponseResult<com.pangding.web.vo.system.req.company.SaveCompanyReqVo> responseResult = new ResponseResult<>();
com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(req.getCompanyVo().getId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
if (StringHelper.isEmpty(companyResVo)) {
// 公司信息为空
return ResponseResult.error("99", "注册信息有误");
}
ObjectHelper.writeWithFrom(companyResVo, req);
companyResVo.setAddress(req.getCompanyVo().getAddress());
companyResVo.setUpdateTime(DateHelper.getNow());
if (com.pangding.web.constant.CompanyConstant.COMPANY_STATUS_BIND_PHONE < companyResVo.getStatus()) {
// 公司状态小于电话已绑定，已经通过通联实名认证，不可修改公司的基本信息
// companyExtendDao.update(companyResVo);
} else {
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFrom(companyResVo, req);
ObjectHelper.writeWithFrom(companyVo, companyResVo);
// companyDao.update(companyResVo);
// companyExtendDao.update(companyResVo);
}
if(com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()){
// 个人 TODO 调用通联实名制
com.pangding.web.vo.system.req.company.SaveCompanyReqVo companyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
companyReqVo.setCompanyVo(companyResVo);
responseResult = payFeign.setCompanyInfo1(companyReqVo);
}
if(com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_COMPANY == companyResVo.getCompanyType() ){
// 公司
// 找到银行卡 TODO 1判断银行卡id是否存在，存在则查询银行卡
Date date = DateHelper.getDateTime(companyResVo.getCreateTime());
String bankId = StringHelper.getNewIdMD5(date, req.getCompanyVo().getId(), req.getCompanyBankCardVo().getBankCardCode());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(bankId, CompanyBankCardVo.class);
if(StringHelper.isEmpty(companyBankCardVo)){
companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo, req);
companyBankCardVo.setId(bankId);
companyBankCardVo.setName(req.getCompanyVo().getContactName());
companyBankCardVo.setIdCard(req.getCompanyVo().getContactCode());
companyBankCardVo.setType(1);
companyBankCardVo.setStatus(0);
companyBankCardVo.setIsDefault(0);
companyBankCardDao.create(companyBankCardVo);
}else{
ObjectHelper.writeWithFrom(companyBankCardVo, req);
companyBankCardVo.setId(bankId);
companyBankCardDao.update(companyBankCardVo);
}
// Todo 调用通联设置公司信息
com.pangding.web.vo.system.req.company.SaveCompanyReqVo companyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
companyReqVo.setCompanyVo(companyResVo);
companyReqVo.setCompanyBankCardVo(companyBankCardVo);
companyReqVo.setVerifyCode(req.getVerifyCode());
responseResult = payFeign.setCompanyInfo1(companyReqVo);
ObjectHelper.writeWithFrom(companyBankCardVo, responseResult.getData().getCompanyBankCardVo());
if(StringHelper.isEmpty(responseResult.getData().getErrorMessage())){
companyBankCardVo.setStatus(1);
}
companyBankCardDao.update(companyBankCardVo);
}
com.pangding.web.vo.system.req.company.SaveCompanyReqVo saveCompanyReqVo = responseResult.getData();
ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
companyDao.update(companyResVo);
if(StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())){
// 错误信息为空，发送验证码成功 修改信息成功
return responseResult;
}else{
return ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
}
}
}
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 768cb72f
......@@ -456,13 +456,13 @@ public class RegisterServiceImpl implements RegisterService {
companyScenicInfoReqVo.setCompanyId(companyVo.getId());
companyScenicInfoReqVo.setProductOrInterface(0);
ResponseResult result = new ResponseResult();
try {
result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
} catch (Exception e) {
resVo.setMerchant(null);
}
MerchantVo merchant = (MerchantVo) result.getData();
resVo.setMerchant(merchant);
// try {
// result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
// } catch (Exception e) {
// resVo.setMerchant(null);
// }
// MerchantVo merchant = (MerchantVo) result.getData();
// resVo.setMerchant(merchant);
/*获取用户权限列表*/
RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ 768cb72f
......@@ -8,6 +8,7 @@ import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.WebUserResVo;
import com.pangding.web.constant.AuthorityConstant;
import com.pangding.web.constant.PangdConstant;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
......@@ -330,34 +331,35 @@ public class UserServiceImpl implements UserService {
*
* @param saveUserReqVo
*/
@Override
public ResponseResult<String> registerSaveUser(SaveUserReqVo saveUserReqVo){
@Transactional(rollbackFor = RuntimeException.class)
public ResponseResult<String> registerSaveUser(SaveUserReqVo saveUserReqVo) {
// 用户名是否存在
UserReqVo userReqVo = new UserReqVo();
userReqVo.setAccount(saveUserReqVo.getAccount());
UserVo userVo = userDao.load(userReqVo, UserVo.class);
if (!StringHelper.isEmpty(userVo)) {
// 用户名已存在
// 用户名已存在
return ResponseResult.error("99", "该用户名已存在");
}
try{
try {
/*将RSA加密后的密码解密*/
String password = RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
String confirmPassword = RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
if (!StringHelper.compare(password, confirmPassword)) {
return ResponseResult.error("99", "两次填写的密码不相等");
}
// 验证邀请码是否正确
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setInvitationCode(saveUserReqVo.getInvitationCode());
CompanyResVo companyResVo = companyDao.load(companyReqVo, CompanyResVo.class);
if(StringHelper.isEmpty(companyResVo)){
// 邀请码不正确
return ResponseResult.error("99", "邀请码错误");
}
// TODO 是否需要判断商户的状态
String password = saveUserReqVo.getPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getPassword(), RsaConstant.privateKey);
String confirmPassword = saveUserReqVo.getConfirmPassword(); //RSAUtils.decryptionByPrivateKey(saveUserReqVo.getConfirmPassword(), RsaConstant.privateKey);
if (!StringHelper.compare(password, confirmPassword)) {
return ResponseResult.error("99", "两次填写的密码不相等");
}
// 验证邀请码是否正确
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setInvitationCode(saveUserReqVo.getInvitationCode());
CompanyResVo companyResVo = companyDao.load(companyReqVo, CompanyResVo.class);
if (StringHelper.isEmpty(companyResVo)) {
// 邀请码不正确
return ResponseResult.error("99", "邀请码错误");
}
// TODO 是否需要判断商户的状态
String companyId = StringHelper.getNewID();
String userId = StringHelper.getNewID();
......@@ -372,6 +374,7 @@ public class UserServiceImpl implements UserService {
userVo.setCreateTime(DateHelper.getNow());
userVo.setCreateId(userId);
userVo.setCreateName(saveUserReqVo.getAccount());
userVo.setStatus(0);
userDao.create(userVo);
// 保存公司表
......@@ -379,6 +382,16 @@ public class UserServiceImpl implements UserService {
companyVo.setId(companyId);
companyVo.setInvitationCompanyId(companyResVo.getId());
companyVo.setStatus(CompanyConstant.COMPANY_STATUS_INIT);
companyVo.setNature(saveUserReqVo.getCompanyType());
if(3 == companyVo.getNature()){
companyVo.setCompanyType(0);
}else{
companyVo.setCompanyType(1);
}
companyVo.setSigningStatus(0);
companyVo.setCreateTime(DateHelper.getNow());
companyVo.setProductOrInterface(0);
companyVo.setExamineStatus(0);
companyDao.create(companyVo);
// 保存公司扩展信息表
CompanyExtendVo companyExtendVo = new CompanyExtendVo();
......@@ -390,18 +403,21 @@ public class UserServiceImpl implements UserService {
RoleVo roleVo = new RoleVo();
roleVo.setId(roleId);
roleVo.setCompanyId(companyId);
roleVo.setName(saveUserReqVo + "Admin");
roleVo.setRemark(saveUserReqVo + "Admin");
roleVo.setName(saveUserReqVo.getAccount() + "Admin");
roleVo.setRemark(saveUserReqVo.getAccount() + "Admin");
roleDao.create(roleVo);
// 保存角色用户表
UserRoleVo userRoleVo = new UserRoleVo();
userRoleVo.setId(StringHelper.getNewID());
userRoleVo.setUserId(userId);
userRoleVo.setRoleId(roleId);
userRoleDao.create(userRoleVo);
// 保存角色权限表 先查询默认权限，跟角色添加默认权限
AuthorityReqVo authorityReqVo = new AuthorityReqVo();
authorityReqVo.setAttribute(PangdConstant.ATTRIBUTE_SCENIC);
authorityReqVo.setAuthorityLevel(AuthorityConstant.AUTHORITY_LEVEL_DEFAULT);
List<AuthorityResVo> authorityResVoList = authorityDao.loadList(authorityReqVo, AuthorityResVo.class);
for(int i = 0; i < authorityResVoList.size(); i++){
for (int i = 0; i < authorityResVoList.size(); i++) {
AuthorityResVo authorityResVo = authorityResVoList.get(i);
RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
roleAuthorityVo.setId(StringHelper.getNewID());
......@@ -410,7 +426,7 @@ public class UserServiceImpl implements UserService {
roleAuthorityDao.create(roleAuthorityVo);
}
return ResponseResult.result("注册成功");
}catch (Exception e){
} catch (Exception e) {
return ResponseResult.error("99", e.getMessage());
}
}
......
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