Skip to content

T
tcm-system
Commit 27706c49 authored by tangf's avatar tangf
Browse files
Options

修改app注册

parent 0e12a7b8
Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 260 deletions
pom.xml
View file @ 27706c49
......@@ -36,8 +36,8 @@
<dependencies>
<dependency>
<groupId>com.pangding.web</groupId>
<artifactId>pd-upload-feign</artifactId>
<groupId>com.yanzuoguang</groupId>
<artifactId>yzg-util-mq</artifactId>
</dependency>
</dependencies>
......
src/main/java/com/pangding/web/UserApp.java
View file @ 27706c49
......@@ -15,7 +15,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"org.springframework.jdbc.*"
})
@EnableEurekaClient
@EnableFeignClients
@EnableFeignClients(basePackages={
"com.pangding.*",
"com.yanzuoguang.*"
})
public class UserApp {
public static void main(String[] args) {
......
src/main/java/com/pangding/web/authority/controller/CompanyCtroller.java 0 → 100644
View file @ 27706c49
package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/newCompany")
public class CompanyCtroller {
@Autowired
private CompanyService companyService;
@RequestMapping(value = "/findCompanyBalance", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult findCompanyBalance(@RequestBody CompanyReqVo req){
CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
return ResponseResult.result(companyService.findCompanyBalance(req));
}
}
src/main/java/com/pangding/web/authority/controller/LoginController.java
View file @ 27706c49
......@@ -3,7 +3,7 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.RegisterService;
import com.pangding.web.authority.service.VerifyCodeService;
import com.pangding.web.authority.vo.cloudvo.LoginResVo;
import com.pangding.web.authority.vo.reqvo.LoginReqVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -41,38 +41,6 @@ public class LoginController {
.notBlankCheck("password",reqVo.getPassword())
.checkException();
return ResponseResult.result(registerServiceImpl.login(reqVo));
/*ResponseResult result = new ResponseResult();*//*
if (LoginConstant.PERSONAL_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
*//*result.setCode("00");
result.setMessage("个人基本信息未完善，跳转个人完善页面");
reqVo.setPassword("");
reqVo.setCode("01");
result.setData(reqVo);*//*
resVo.setCode();
return result;
}else if (LoginConstant.COMPANY_NOT_FINISH_BASIC_INFO.equals(resVo.getCode())){
result.setCode("00");
result.setMessage("公司基本信息未完善，跳转公司完善页面");
reqVo.setPassword("");
reqVo.setCode("02");
result.setData(reqVo);
return result;
}else if (LoginConstant.HAVE_NO_BANK_CARD.equals(resVo.getCode())){
result.setCode("00");
result.setMessage("还未添加银行卡，跳转添加银行卡页面");
reqVo.setPassword("");
reqVo.setCode("03");
result.setData(reqVo);
return result;
}else if (LoginConstant.NOT_SIGNING.equals(resVo.getCode())){
result.setCode("00");
result.setMessage("未签约，跳转签约页面");
reqVo.setPassword("");
reqVo.setCode("04");
result.setData(reqVo);
return result;
}*/
/*return ResponseResult.result(resVo);*/
}
/*@RequestMapping(value = "/computer", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
......
src/main/java/com/pangding/web/authority/controller/TokenController.java
View file @ 27706c49
package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.TokenService;
import com.pangding.web.authority.vo.LoginVo;
import com.pangding.web.authority.vo.reqvo.LoginReqVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import com.pangding.web.vo.system.req.company.CompanyKeyReqVo;
import com.pangding.web.vo.system.res.company.CompanyKeyResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,6 +26,19 @@ public class TokenController {
@Autowired
private TokenService tokenService;
/**
* 获取分销商key
*/
@RequestMapping(value = "/getCompanyKey", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyKeyResVo> getCompanyKey(@RequestBody CompanyKeyReqVo companyKeyReqVo) {
CheckerHelper.newInstance()
.notBlankCheck("companyId", companyKeyReqVo.getCompanyId())
.checkException(companyKeyReqVo);
return ResponseResult.result(tokenService.getCompanyKey(companyKeyReqVo));
}
/**
* 登录实体创建
*
......@@ -47,7 +62,7 @@ public class TokenController {
* @param loginVo 登录信息
*/
@RequestMapping(value = "/load", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<LoginVo> load(@RequestBody LoginReqVo loginVo) {
public ResponseResult<LoginTokenVo> load(@RequestBody LoginReqVo loginVo) {
CheckerHelper.newInstance()
.notBlankCheck("token", loginVo.getToken())
.checkException(loginVo);
......
src/main/java/com/pangding/web/authority/dao/CompanyKeyDao.java 0 → 100644
View file @ 27706c49
package com.pangding.web.authority.dao;
import com.yanzuoguang.dao.BaseDao;
public interface CompanyKeyDao extends BaseDao {
}
src/main/java/com/pangding/web/authority/dao/impl/AuthorityDaoImpl.java
View file @ 27706c49
......@@ -33,6 +33,8 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
.add("id","and pid = ? ")
.add("pid","and pid = ? ")
.add("sort","and sort = ? ")
.add("search", "and (name like concat(?,'%') " +
"or alias like concat(?,'%')) " )
.add("levelOne","and pid = '' order by sort asc");
table.add(GET_LEVEL_ONE,"select * from pd_authority where 1=1 ")
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyDivideRuleDaoImpl.java
View file @ 27706c49
......@@ -16,7 +16,8 @@ public class CompanyDivideRuleDaoImpl extends BaseDaoImpl implements CompanyDivi
protected void init() {
register(CompanyDivideRuleVo.class);
table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name from pd_company_divide_rule cdr left join pd_company c on c.id = cdr.company_id " +
table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name from pd_company_divide_rule cdr " +
"left join pd_company c on c.id = cdr.company_id " +
"left join pd_company_extend ce on c.id = ce.id where 1=1 ")
.add("companyId"," and cdr.company_id = ?");
}
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyKeyDaoImpl.java 0 → 100644
View file @ 27706c49
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyKeyDao;
import com.pangding.web.vo.system.pd.company.CompanyKeyVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class CompanyKeyDaoImpl extends BaseDaoImpl implements CompanyKeyDao {
@Override
protected void init() {
register(CompanyKeyVo.class);
}
}
src/main/java/com/pangding/web/authority/dao/impl/TokenDaoImpl.java
View file @ 27706c49
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.TokenDao;
import com.pangding.web.authority.vo.LoginVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
......@@ -21,7 +21,7 @@ public class TokenDaoImpl extends BaseDaoImpl implements TokenDao {
@Override
protected void init() {
// 根据实体生成增删改查语句
register(LoginVo.class);
register(LoginTokenVo.class);
cacheList.setClearSecond(TOKEN_MEMORY_CACHE_TIME);
}
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 27706c49
......@@ -5,6 +5,7 @@ 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.*;
import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -179,4 +180,12 @@ public interface CompanyService{
void examineConfig(ExamineConfigReqVo reqVo);
ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req);
/**
* 找到公司信息及公司余额明细
* @param req
* @return
*/
FindCompanyBalanceResVo findCompanyBalance(com.pangding.web.vo.system.req.company.CompanyReqVo req);
}
src/main/java/com/pangding/web/authority/service/RegisterService.java
View file @ 27706c49
......@@ -6,6 +6,7 @@ import com.pangding.web.authority.vo.cloudvo.LoginResVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.servlet.http.HttpServletRequest;
......
src/main/java/com/pangding/web/authority/service/TokenService.java
View file @ 27706c49
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.LoginVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.pangding.web.vo.system.req.company.CompanyKeyReqVo;
import com.pangding.web.vo.system.res.company.CompanyKeyResVo;
/**
* 登录服务
......@@ -9,25 +11,27 @@ import com.pangding.web.authority.vo.LoginVo;
* @author 颜佐光
*/
public interface TokenService {
CompanyKeyResVo getCompanyKey(CompanyKeyReqVo companyKeyReqVo);
/**
* 保存接口请求日志
*
* @param loginVo 请求数据
* @retur 保存主键
*/
String save(LoginVo loginVo);
String save(LoginTokenVo loginVo);
/**
* 保存接口请求日志
*
* @param loginVo 请求数据
* @retur 保存主键
*/
LoginVo load(LoginVo loginVo);
LoginTokenVo load(LoginTokenVo loginVo);
/**
* 保存接口请求日志
*
* @param loginVo 请求数据
* @retur 保存主键
*/
int remove(LoginVo loginVo);
int remove(LoginTokenVo loginVo);
}
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 27706c49
......@@ -14,14 +14,16 @@ import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.util.RSAUtils;
import com.sun.org.apache.regexp.internal.RE;
import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
import com.pangding.web.vo.system.res.company.CompanyMoneyDetailResVo;
import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
import org.aspectj.apache.bcel.classfile.Code;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -104,15 +106,15 @@ 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 = userDaoImpl.load(userGetReqVo, UserVo.class);
if (null != userVo) {
userVo.setPassword("");
userVo.setRemark("");
resVo.setUserVo(userVo);
}else {
} else {
UserGetReqVo userGetReqVo1 = new UserGetReqVo();
userGetReqVo1.setCompanyId(reqVo.getId());
UserVo userVo1 = userDaoImpl.load(userGetReqVo1,UserVo.class);
UserVo userVo1 = userDaoImpl.load(userGetReqVo1, UserVo.class);
resVo.setUserVo(userVo1);
}
/*获取没有公司id的角色数组*/
......@@ -178,7 +180,7 @@ public class CompanyServiceImpl implements CompanyService {
/*返回结果对象*/
SaveCompanyResVo resVo = new SaveCompanyResVo();
/*检查用户名*/
if (!StringHelper.isEmpty(reqVo.getAccount())){
if (!StringHelper.isEmpty(reqVo.getAccount())) {
userServiceImpl.isValid(reqVo.getAccount());
UserVo userReqVo = new UserVo();
userReqVo.setAccount(reqVo.getAccount());
......@@ -190,11 +192,11 @@ public class CompanyServiceImpl implements CompanyService {
/*公司主表*/
CompanyVo companyVo = new CompanyVo();
companyVo.setId(reqVo.getCompanyId() != null?reqVo.getCompanyId():StringHelper.getNewID());
companyVo.setId(reqVo.getCompanyId() != null ? reqVo.getCompanyId() : StringHelper.getNewID());
ObjectHelper.writeWithFrom(companyVo, reqVo);
companyVo.setAddress(reqVo.getCompanyAddress());
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setStatus(reqVo.getStatus() != null?reqVo.getStatus():0);
companyVo.setStatus(reqVo.getStatus() != null ? reqVo.getStatus() : 0);
companyVo.setExamineStatus(0);
/*注册服务请求对象*/
......@@ -207,7 +209,7 @@ public class CompanyServiceImpl implements CompanyService {
if (reqVo.getCompanyType() == 1) {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
companyBankCardVo.setId(!StringHelper.isEmpty(reqVo.getCompanyBankCardId())?reqVo.getCompanyBankCardId():StringHelper.getNewID());
companyBankCardVo.setId(!StringHelper.isEmpty(reqVo.getCompanyBankCardId()) ? reqVo.getCompanyBankCardId() : StringHelper.getNewID());
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
......@@ -221,20 +223,20 @@ public class CompanyServiceImpl implements CompanyService {
}
/*注册*/
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("获取失败，请重试");
}
CompanyReqVo res = (CompanyReqVo) result.getData();
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1,res);
ObjectHelper.writeWithFrom(companyVo1, res);
companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
companyVo1.setExamineStatus(companyVo.getExamineStatus());
companyVo1.setCompanyAttribute(companyReqVo.getCompanyAttribution());
/*保存公司主表*/
if (!StringHelper.isEmpty(reqVo.getCompanyId())){
if (!StringHelper.isEmpty(reqVo.getCompanyId())) {
companyDao.update(companyVo1);
}else {
} else {
companyDao.create(companyVo1);
}
......@@ -249,9 +251,9 @@ public class CompanyServiceImpl implements CompanyService {
ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
if (!StringHelper.isEmpty(reqVo.getCompanyBankCardId())){
if (!StringHelper.isEmpty(reqVo.getCompanyBankCardId())) {
companyBankCardDao.update(companyBankCardVo);
}else {
} else {
companyBankCardDao.create(companyBankCardVo);
}
......@@ -266,9 +268,9 @@ public class CompanyServiceImpl implements CompanyService {
.replace(":", "")
.replace(" ", "");
extendVo.setQrCode(qrCode);
if (!StringHelper.isEmpty(reqVo.getCompanyExtendId())){
if (!StringHelper.isEmpty(reqVo.getCompanyExtendId())) {
companyExtendDaoImpl.update(extendVo);
}else {
} else {
companyExtendDaoImpl.create(extendVo);
}
resVo.setCompanyExtendId(extendVo.getId());
......@@ -276,7 +278,7 @@ public class CompanyServiceImpl implements CompanyService {
/*保存商户表*/
MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
merchantCreateReqVo.setId(reqVo.getMerchantId()!=null?reqVo.getMerchantId():StringHelper.getNewID());
merchantCreateReqVo.setId(reqVo.getMerchantId() != null ? reqVo.getMerchantId() : StringHelper.getNewID());
merchantCreateReqVo.setType(reqVo.getCompanyAttribute());
merchantCreateReqVo.setName(reqVo.getMerchantName());
merchantCreateReqVo.setAddress(reqVo.getMerchantAddress());
......@@ -294,7 +296,7 @@ public class CompanyServiceImpl implements CompanyService {
/*保存用户*/
UserVo userVo = new UserVo();
if (StringHelper.isEmpty(reqVo.getUserId())){
if (StringHelper.isEmpty(reqVo.getUserId())) {
userVo.setId(StringHelper.getNewID());
userVo.setPassword(StringHelper.md5("123456"));
userVo.setRemark("123456");
......@@ -302,10 +304,10 @@ public class CompanyServiceImpl implements CompanyService {
userVo.setCreateName(reqVo.getCreateName());
userVo.setCompanyId(companyVo.getId());
userVo.setIsFirst(1);
}else{
} else {
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(reqVo.getUserId());
userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
}
userVo.setAccount(reqVo.getAccount());
userVo.setName(reqVo.getContactName());
......@@ -313,9 +315,9 @@ public class CompanyServiceImpl implements CompanyService {
/*检查手机是否存在*/
/*userServiceImpl.checkPhone(userVo);*/
if (!StringHelper.isEmpty(reqVo.getUserId())){
if (!StringHelper.isEmpty(reqVo.getUserId())) {
userDaoImpl.update(userVo);
}else {
} else {
userDaoImpl.create(userVo);
}
......@@ -380,14 +382,14 @@ public class CompanyServiceImpl implements CompanyService {
/*注册服务验证验证码*/
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("验证失败，请重试");
}
/*更新公司主表*/
CompanyReqVo res = (CompanyReqVo) result.getData();
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1,res);
ObjectHelper.writeWithFrom(companyVo1, res);
companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
companyVo1.setExamineStatus(companyVo.getExamineStatus());
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
......@@ -478,8 +480,8 @@ public class CompanyServiceImpl implements CompanyService {
CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
checkReqVo.setCompanyId(reqVo.getCompanyId());
checkReqVo.setBankCardCode(reqVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDao.load(checkReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo1 && !reqVo.getId().equals(companyBankCardVo1.getId())){
CompanyBankCardVo companyBankCardVo1 = companyBankCardDao.load(checkReqVo, CompanyBankCardVo.class);
if (null != companyBankCardVo1 && !reqVo.getId().equals(companyBankCardVo1.getId())) {
throw new CodeException("该银行卡已绑定");
}
......@@ -499,8 +501,8 @@ public class CompanyServiceImpl implements CompanyService {
CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
checkReqVo.setBankCardCode(reqVo.getBankCardCode());
checkReqVo.setCompanyId(reqVo.getCompanyId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(checkReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo){
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(checkReqVo, CompanyBankCardVo.class);
if (null != companyBankCardVo) {
throw new CodeException("该银行卡已绑定");
}
......@@ -521,14 +523,14 @@ public class CompanyServiceImpl implements CompanyService {
/*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
ObjectHelper.writeWithFrom(companyBankReqVo, reqVo);
ResponseResult result = payFeign.bindBack(companyBankReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("绑定银行卡失败，请重试");
}
CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,resVo);
ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
companyBankCardVo.setIsDefault(reqVo.getIsDefault());
companyBankCardDao.update(companyBankCardVo);
return reqVo.getId();
......@@ -547,7 +549,7 @@ public class CompanyServiceImpl implements CompanyService {
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo, bankCardVo);
ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("解绑失败，请重试");
}
/*若删除的银行卡为默认银行卡，则需要设置其他一张卡为默认银行卡*/
......@@ -600,15 +602,15 @@ public class CompanyServiceImpl implements CompanyService {
/*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
ObjectHelper.writeWithFrom(companyBankReqVo, companyBankCardVo);
companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
ResponseResult result = payFeign.bindBack(companyBankReqVo);
if (null == result || !"00".equals(result.getCode())){
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("绑定银行卡失败，请重试");
}
CompanyBankReqVo resVo = (CompanyBankReqVo) result.getData();
CompanyBankCardVo companyBankCardVo1 = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo1,resVo);
ObjectHelper.writeWithFrom(companyBankCardVo1, resVo);
companyBankCardVo1.setIsDefault(companyBankCardVo.getIsDefault());
companyBankCardDao.update(companyBankCardVo1);
......@@ -753,23 +755,23 @@ public class CompanyServiceImpl implements CompanyService {
for (String userId : userIdList) {
UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
userRoleGetReqVo.setUserId(userId);
List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(userRoleGetReqVo,UserRoleVo.class);
if (null != userRoleVoList && userRoleVoList.size() == 1){
List<UserRoleVo> userRoleVoList = userRoleDaoImpl.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);
UserRoleVo userRoleVo = userRoleDaoImpl.load(userRoleGetReqVo1, UserRoleVo.class);
userRoleDaoImpl.remove(userRoleVo);
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(userId);
UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
userVo.setStatus(1);
userDaoImpl.update(userVo);
}else if (null != userRoleVoList && userRoleVoList.size() > 1){
} 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);
UserRoleVo userRoleVo = userRoleDaoImpl.load(userRoleGetReqVo1, UserRoleVo.class);
userRoleDaoImpl.remove(userRoleVo);
}
}
......@@ -857,10 +859,10 @@ public class CompanyServiceImpl implements CompanyService {
}
@Override
public List<GetCompanyDivideResVo> findCompanyDivideInfo(CompanyDivideReqVo req){
public List<GetCompanyDivideResVo> findCompanyDivideInfo(CompanyDivideReqVo req) {
List<GetCompanyDivideResVo> companyDivideResVoList = new ArrayList<>();
List<GetCompanyReqVo> companyList = req.getCompanyIdList();
for (int i = 0; i < companyList.size(); i++){
for (int i = 0; i < companyList.size(); i++) {
GetCompanyReqVo getCompanyReqVo = companyList.get(i);
GetCompanyDivideResVo companyDivideResVo = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
companyDivideResVo.setCompanyChannelType(getCompanyReqVo.getCompanyChannelType());
......@@ -871,6 +873,7 @@ public class CompanyServiceImpl implements CompanyService {
/**
* 检查邀请码是否真实存在
*
* @param reqVo
* @return
*/
......@@ -878,17 +881,18 @@ 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);
if (null == companyExtendVo){
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null == companyExtendVo) {
throw new CodeException("该邀请码为错误邀请码");
}
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(companyExtendVo.getId());
return companyDao.load(companyGetReqVo,CompanyVo.class);
return companyDao.load(companyGetReqVo, CompanyVo.class);
}
/**
* 审核公司
*
* @param reqVo
* @return
*/
......@@ -898,15 +902,15 @@ public class CompanyServiceImpl implements CompanyService {
/*更新公司表*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getCompanyId());
CompanyVo companyVo = companyDao.load(companyGetReqVo,CompanyVo.class);
CompanyVo companyVo = companyDao.load(companyGetReqVo, CompanyVo.class);
companyVo.setExamineStatus(reqVo.getExamineStatus());
companyVo.setExamineFailedReason(reqVo.getExamineFailedReason());
companyDao.update(companyVo);
/*更新公司扩展表*/
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setId(reqVo.getCompanyId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class);
if (null == companyExtendVo){
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null == companyExtendVo) {
companyExtendVo = new CompanyExtendVo();
companyExtendVo.setId(reqVo.getCompanyId());
companyExtendVo.setQrCode(DateHelper.getNow()
......@@ -918,7 +922,7 @@ public class CompanyServiceImpl implements CompanyService {
companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
companyExtendDaoImpl.create(companyExtendVo);
}else {
} else {
companyExtendVo.setWithdrawMoney(reqVo.getWithdrawMoney());
companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
......@@ -927,14 +931,14 @@ public class CompanyServiceImpl implements CompanyService {
}
/*新增或更新pd_company_divide_rule表*/
CompanyDivideRuleVo companyDivideRuleVo = new CompanyDivideRuleVo();
ObjectHelper.writeWithFrom(companyDivideRuleVo,reqVo);
ObjectHelper.writeWithFrom(companyDivideRuleVo, reqVo);
CompanyDivideRuleGetReqVo companyDivideRuleGetReqVo = new CompanyDivideRuleGetReqVo();
companyDivideRuleGetReqVo.setCompanyId(reqVo.getCompanyId());
CompanyDivideRuleVo companyDivideRuleResVo = companyDivideRuleDao.load(companyDivideRuleGetReqVo,CompanyDivideRuleVo.class);
if (null == companyDivideRuleResVo){
CompanyDivideRuleVo companyDivideRuleResVo = companyDivideRuleDao.load(companyDivideRuleGetReqVo, CompanyDivideRuleVo.class);
if (null == companyDivideRuleResVo) {
companyDivideRuleVo.setCompanyDivideId(StringHelper.getNewID());
companyDivideRuleDao.create(companyDivideRuleVo);
}else {
} else {
companyDivideRuleVo.setCompanyDivideId(companyDivideRuleResVo.getCompanyDivideId());
companyDivideRuleVo.setFee(companyDivideRuleResVo.getFee());
companyDivideRuleVo.setBonusType(companyDivideRuleResVo.getBonusType());
......@@ -946,7 +950,7 @@ public class CompanyServiceImpl implements CompanyService {
/*更新角色表*/
RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setId(reqVo.getRoleId());
RoleVo roleVo = roleDaoImpl.load(roleGetReqVo,RoleVo.class);
RoleVo roleVo = roleDaoImpl.load(roleGetReqVo, RoleVo.class);
roleVo.setCompanyId(reqVo.getCompanyId());
roleVo.setIsAdmin(1);
roleDaoImpl.update(roleVo);
......@@ -959,28 +963,27 @@ public class CompanyServiceImpl implements CompanyService {
}
@Override
public ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req){
public ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req) {
CompanyVo companyVo = companyDao.load(req.getCompanyId(), CompanyVo.class);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(req.getCompanyId(), CompanyExtendVo.class);
if(StringHelper.isEmpty(companyVo) || StringHelper.isEmpty(companyExtendVo)){
if (StringHelper.isEmpty(companyVo) || StringHelper.isEmpty(companyExtendVo)) {
throw new CodeException("未找到公司信息");
}
try{
try {
// 可提现余额
double companyMoney = companyExtendVo.getWithdrawTotalCash();
// req = new UpdateCompanyMoneyReqVo();
// req.setCompanyId(companyVo.getId());
if(CompanyConstant.MONEY_TYPE_FZ == req.getMoneyType()
if (CompanyConstant.MONEY_TYPE_FZ == req.getMoneyType()
|| CompanyConstant.MONEY_TYPE_ZZ == req.getMoneyType()
|| CompanyConstant.MONEY_TYPE_CZ == req.getMoneyType() ){
|| CompanyConstant.MONEY_TYPE_CZ == req.getMoneyType()) {
// 分账 转账 充值
companyMoney += req.getMoney();
}
if(CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()
|| CompanyConstant.MONEY_TYPE_TX == req.getMoneyType()){
if (CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()
|| CompanyConstant.MONEY_TYPE_TX == req.getMoneyType()) {
// 退款 提现
companyMoney -= req.getMoney();
}
......@@ -1011,9 +1014,46 @@ public class CompanyServiceImpl implements CompanyService {
companyExtendVo.setWithdrawTotalCash(companyMoney);
companyExtendDaoImpl.update(companyExtendVo);
return ResponseResult.result("处理完成");
}catch (CodeException e){
} catch (CodeException e) {
throw new CodeException("");
}
}
@Override
public FindCompanyBalanceResVo findCompanyBalance(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
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);
List<CompanyMoneyDetailResVo> companyMoneyDetailResVoList = companyMoneyDetailDao.loadList(
new CompanyMoneyDetailReqVo(req.getId()), CompanyMoneyDetailResVo.class);
FindCompanyBalanceResVo findCompanyBalanceResVo = new FindCompanyBalanceResVo();
findCompanyBalanceResVo.setCompany(companyResVo);
findCompanyBalanceResVo.setCompanyExtend(companyExtendResVo);
findCompanyBalanceResVo.setCompanyMoneyDetailList(companyMoneyDetailResVoList);
return findCompanyBalanceResVo;
}
public void automaticCashWithdrawal(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
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();
for (int i = 0; i < companyVoList.size(); i++) {
String companyId = companyVoList.get(i).getId();
com.pangding.web.vo.system.pd.company.CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyId,
com.pangding.web.vo.system.pd.company.CompanyExtendVo.class);
if (!StringHelper.isEmpty(companyExtendVo)) {
int withdrawRule = companyExtendVo.getWithdrawRule();
double withdrawTotalCash = companyExtendVo.getWithdrawTotalCash();
if (0 == withdrawRule && withdrawTotalCash > 0) {
// 自动提现
}
}
}
}
}
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 27706c49
......@@ -12,6 +12,8 @@ import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import com.yanzuoguang.token.TokenHelper;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
......@@ -366,7 +368,7 @@ public class RegisterServiceImpl implements RegisterService {
userVo = userServiceImpl.getUserByAccount(accountOrPhone);
}
if (userVo == null){
throw new CodeException("用户名或密码错误");
throw new CodeException("用户名不存在");
}
/*通过私钥将rsa加密的密码解密*/
......@@ -389,12 +391,16 @@ public class RegisterServiceImpl implements RegisterService {
resVo.setCompanyResVo(loginCompanyResVo);
reqVo.setToken(token);
LoginVo loginVo = new LoginVo();
LoginTokenVo loginVo = new LoginTokenVo();
loginVo.setToken(token);
loginVo.setDataPwd(token);
loginVo.setData(JsonHelper.serialize(reqVo));
loginVo.setExpairTime(DateHelper.getNow());
tokenService.save(loginVo);
TokenHelper.write(token,loginVo);
// TODO
// LoginTokenVo longVo1 = TokenHelper.get(false,LoginTokenVo.class);
// System.out.println("loning=====" + JsonHelper.serialize(longVo1));
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setCompanyId(companyVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);
......@@ -485,7 +491,7 @@ public class RegisterServiceImpl implements RegisterService {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityIdList.get(i));
AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
if (!StringHelper.isEmpty(authorityVo) && StringHelper.isEmpty(authorityVo.getPid())){
levelOneList.add(authorityVo);
authorityIdList.set(i,"");
}
......@@ -513,6 +519,7 @@ public class RegisterServiceImpl implements RegisterService {
}
resVo.setCode("00");
System.out.println(JsonHelper.serialize(resVo));
return resVo;
}
......
src/main/java/com/pangding/web/authority/service/impl/TokenServiceImpl.java
View file @ 27706c49
package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.CompanyKeyDao;
import com.pangding.web.authority.dao.TokenDao;
import com.pangding.web.authority.service.TokenService;
import com.pangding.web.authority.vo.LoginVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.pangding.web.vo.system.req.company.CompanyKeyReqVo;
import com.pangding.web.vo.system.res.company.CompanyKeyResVo;
import com.yanzuoguang.util.helper.JsonHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
......@@ -13,12 +17,21 @@ import org.springframework.transaction.annotation.Transactional;
*
* @author 颜佐光
*/
@Component
@Service
@Transactional(rollbackFor = Exception.class)
public class TokenServiceImpl implements TokenService {
@Autowired
private TokenDao tokenDao;
@Autowired
private CompanyKeyDao companyKeyDao;
@Override
public CompanyKeyResVo getCompanyKey(CompanyKeyReqVo companyKeyReqVo){
CompanyKeyResVo companyKeyResVo = companyKeyDao.load(companyKeyReqVo, CompanyKeyResVo.class);
return companyKeyResVo;
}
/**
* 保存接口请求日志
......@@ -26,8 +39,8 @@ public class TokenServiceImpl implements TokenService {
* @param loginVo
*/
@Override
public String save(LoginVo loginVo) {
LoginVo to = tokenDao.load(loginVo, LoginVo.class);
public String save(LoginTokenVo loginVo) {
LoginTokenVo to = tokenDao.load(loginVo, LoginTokenVo.class);
if (JsonHelper.compare(to,loginVo)) {
return to.getToken();
} else if (to != null) {
......@@ -44,8 +57,8 @@ public class TokenServiceImpl implements TokenService {
* @retur 保存主键
*/
@Override
public LoginVo load(LoginVo loginVo) {
return tokenDao.load(loginVo, LoginVo.class);
public LoginTokenVo load(LoginTokenVo loginVo) {
return tokenDao.load(loginVo, LoginTokenVo.class);
}
/**
......@@ -55,7 +68,7 @@ public class TokenServiceImpl implements TokenService {
* @retur 保存主键
*/
@Override
public int remove(LoginVo loginVo) {
public int remove(LoginTokenVo loginVo) {
return tokenDao.remove(loginVo);
}
......
src/main/java/com/pangding/web/authority/vo/LoginVo.java deleted 100644 → 0
View file @ 0e12a7b8
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.BaseVo;
import com.yanzuoguang.util.vo.InitDao;
/**
* 日志服务表结构映射
*
* @author 颜佐光
*/
@TableAnnotation("login_token")
public class LoginVo extends BaseVo implements InitDao {
/**
* 编号,主键请放第一个
* 假如是一样的字段，则不需要写映射.下面的代码添加映射关系
*/
private String token;
/**
* 数据密钥
*/
@TableAnnotation("data_pwd")
private String dataPwd;
/**
* 登录数据
*/
private String data;
/**
* 失效时间
*/
@TableAnnotation("expair_time")
private String expairTime;
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public String getDataPwd() {
return dataPwd;
}
public void setDataPwd(String dataPwd) {
this.dataPwd = dataPwd;
}
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
public String getExpairTime() {
return expairTime;
}
public void setExpairTime(String expairTime) {
this.expairTime = expairTime;
}
@Override
public void init() {
this.token = StringHelper.getFirst(this.token);
this.dataPwd = StringHelper.getFirst(this.dataPwd);
this.data = StringHelper.getFirst(this.data);
this.expairTime = StringHelper.getFirstNull(this.expairTime);
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/ComputerLoginReqVo.java
View file @ 27706c49
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.LoginVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
/**
* @Author zhangjinyao
* @create 2019/5/27 15:17
*/
public class ComputerLoginReqVo extends LoginVo {
public class ComputerLoginReqVo extends LoginTokenVo {
private String reqId;
private int accountOrPhone;
......
src/main/java/com/pangding/web/authority/vo/reqvo/ListAuthorityByPageReqVo.java
View file @ 27706c49
......@@ -11,6 +11,8 @@ public class ListAuthorityByPageReqVo extends PageSizeReqVo {
private String levelOne;
private String search;
public String getReqId() {
return reqId;
}
......@@ -26,4 +28,12 @@ public class ListAuthorityByPageReqVo extends PageSizeReqVo {
public void setLevelOne(String levelOne) {
this.levelOne = levelOne;
}
public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/LoginReqVo.java deleted 100644 → 0
View file @ 0e12a7b8
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.LoginVo;
/**
* @Author zhangjinyao
* @create 2019/5/14 11:46
*/
public class LoginReqVo extends LoginVo {
private String reqId;
private String accountOrPhone;
private String password;
/**
* 返回状态码
* 01：个人基本信息未完善
* 02：公司基本信息未完善
* 03：未绑定银行卡
* 04：未签约
*/
private String code;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getAccountOrPhone() {
return accountOrPhone;
}
public void setAccountOrPhone(String accountOrPhone) {
this.accountOrPhone = accountOrPhone;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getReqId() {
return reqId;
}
public void setReqId(String reqId) {
this.reqId = reqId;
}
}
src/main/resources/bootstrap.yml
View file @ 27706c49
......@@ -6,7 +6,7 @@ spring:
cloud:
config:
# base为所有服务的公共配置，pd-db-system为需要连接的数据库配置,${spring.application.name}为当前程序的配置，3个配置组合才为当前程序的启动配置
name: base,pd-db-user,${spring.application.name}
name: base,pd-db-user,pd-mq-mq,${spring.application.name}
label: master
fail-fast: true
# 设置从服务中拿取配置
......
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