Skip to content

T
tcm-system
Commit 158ed33a authored by tangf's avatar tangf
Browse files
Options

添加公司常量

parent 2d6c3e88
Hide whitespace changes
Inline Side-by-side
Showing with 631 additions and 116 deletions
src/main/java/com/pangding/web/authority/controller/LoginController.java
View file @ 158ed33a
......@@ -2,9 +2,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.util.LoginConstant;
import com.pangding.web.authority.vo.cloudvo.LoginResVo;
import com.pangding.web.authority.vo.reqvo.ComputerLoginReqVo;
import com.pangding.web.authority.vo.reqvo.LoginReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -15,9 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
/**
......
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ 158ed33a
......@@ -5,6 +5,8 @@ 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.CompanyResVo;
import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
import com.pangding.web.authority.vo.resvo.GetCompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -16,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 胖丁我的管理Controller
* @Author zhangjinyao
......@@ -280,11 +284,17 @@ public class PangdingManagementController {
* @return
*/
@RequestMapping(value = "/getCompanyByQrCode",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyVo> getCompanyByQrCode(@RequestBody GetCompanyByQrCodeReqVo reqVo){
public ResponseResult<GetCompanyResVo> getCompanyByQrCode(@RequestBody GetCompanyByQrCodeReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("qrCode",reqVo.getQrCode())
.checkException();
System.out.println("change");
return ResponseResult.result(companyServiceImpl.getCompanyByQrCode(reqVo));
}
@RequestMapping(value = "/findCompanyDivideInfo",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<List<GetCompanyDivideResVo>> findCompanyDivideInfo(@RequestBody CompanyDivideReqVo req){
CheckerHelper.newInstance().notBlankCheck("companyList", req.getCompanyIdList()).checkException();
return ResponseResult.result(companyServiceImpl.findCompanyDivideInfo(req));
}
}
src/main/java/com/pangding/web/authority/dao/CompanyDivideRuleDao.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.reqvo.GetCompanyReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
import com.yanzuoguang.dao.BaseDao;
public interface CompanyDivideRuleDao extends BaseDao {
GetCompanyDivideResVo findCompanyDivideInfo(GetCompanyReqVo req);
}
src/main/java/com/pangding/web/authority/dao/CompanyMsgDao.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyMsgVo;
import com.pangding.web.authority.vo.reqvo.CompanyMsgReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyMsgResVo;
import com.yanzuoguang.dao.BaseDao;
import java.util.List;
public interface CompanyMsgDao extends BaseDao{
List<GetCompanyMsgResVo> findCompanyMsgList(CompanyMsgReqVo req);
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyDivideRuleDaoImpl.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyDivideRuleDao;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
import com.pangding.web.authority.vo.reqvo.GetCompanyReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class CompanyDivideRuleDaoImpl extends BaseDaoImpl implements CompanyDivideRuleDao {
private static final String QUERY_LIST = "QUERY_LIST";
@Override
protected void init() {
register(CompanyDivideRuleVo.class);
table.add(QUERY_LIST, "select cdr.*,ce.divide_status 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 = ?");
}
@Override
public GetCompanyDivideResVo findCompanyDivideInfo(GetCompanyReqVo req){
return this.queryFirst(GetCompanyDivideResVo.class, QUERY_LIST, req);
}
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyMsgDaoImpl.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyMsgDao;
import com.pangding.web.authority.vo.CompanyMsgVo;
import com.pangding.web.authority.vo.reqvo.CompanyMsgReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyMsgResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
private static final String QUERY_LIST = "QUERY_LIST";
@Override
protected void init() {
register(CompanyMsgVo.class);
table.add(QUERY_LIST, "select m.*,cm.company_id,cm.type " +
"from pd_company_msg cm left join pd_msg m on cm.msg_id = m.id where 1=1 ")
.add("CompanyId", "and cm.company_id = ? ")
.add("type", "and cm.type = ? ");
}
@Override
public List<GetCompanyMsgResVo> findCompanyMsgList(CompanyMsgReqVo req) {
return this.query(GetCompanyMsgResVo.class, QUERY_LIST, req);
}
}
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 158ed33a
......@@ -5,6 +5,8 @@ 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.CompanyResVo;
import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
import com.pangding.web.authority.vo.resvo.GetCompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -155,5 +157,12 @@ public interface CompanyService{
* @param reqVo 封装了二维码源码的请求对象
* @return
*/
CompanyVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo);
GetCompanyResVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo);
/**
* 获得公司分润信息
* @param req
* @return
*/
List<GetCompanyDivideResVo> findCompanyDivideInfo(CompanyDivideReqVo req);
}
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 158ed33a
......@@ -13,8 +13,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.CompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.util.RSAUtils;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
......@@ -33,7 +32,7 @@ import java.util.List;
* @author Administrator
*/
@Service
public class CompanyServiceImpl implements CompanyService{
public class CompanyServiceImpl implements CompanyService {
@Autowired
private CompanyDao companyDao;
......@@ -55,13 +54,18 @@ public class CompanyServiceImpl implements CompanyService{
private UserRoleDao userRoleDaoImpl;
@Autowired
private PangdingPartnerService pangdingPartnerServiceImpl;
@Autowired
private CompanyMsgDao companyMsgDao;
@Autowired
private CompanyDivideRuleDao companyDivideRuleDao;
/**
* 修改公司信息
*
* @param companyVo
*/
@Override
public void updateCompanyStatus(CompanyVo companyVo){
public void updateCompanyStatus(CompanyVo companyVo) {
CompanyVo company = companyDao.load(companyVo.getId(), CompanyVo.class);
ObjectHelper.writeWithFrom(company, companyVo);
companyDao.update(company);
......@@ -69,13 +73,14 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 分页查询公司信息
*
* @param reqVo 继承了分页对象
* @return 公司列表分页对象
*/
@Override
public PageSizeData<CompanyVo> list(ListCompanyReqVo reqVo) {
PageSizeData<CompanyVo> pageSizeData = companyDao.getCompanyList(reqVo);
if (null == pageSizeData || null == pageSizeData.getList() || pageSizeData.getList().isEmpty()){
if (null == pageSizeData || null == pageSizeData.getList() || pageSizeData.getList().isEmpty()) {
throw new CodeException("暂无公司信息");
}
return pageSizeData;
......@@ -83,6 +88,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
*
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
*/
......@@ -94,18 +100,18 @@ public class CompanyServiceImpl implements CompanyService{
req.setCompanyId(reqVo.getId());
req.setAdminRoleId(RoleConstant.ADMIN_ROLE_ID);
UserVo userVo = userDaoImpl.getAdmin(req);
if (null != userVo){
if (null != userVo) {
resVo.setUserVo(userVo);
}
return resVo;
}
@Override
public CompanyResVo getDetail(CompanyGetReqVo reqVo){
public CompanyResVo getDetail(CompanyGetReqVo reqVo) {
CompanyResVo resVo = new CompanyResVo();
/*获取公司表信息*/
CompanyVo companyVo = companyDao.load(reqVo,CompanyVo.class);
if (null != companyVo){
CompanyVo companyVo = companyDao.load(reqVo, CompanyVo.class);
if (null != companyVo) {
resVo.setCompanyVo(companyVo);
}
......@@ -116,26 +122,26 @@ public class CompanyServiceImpl implements CompanyService{
companyScenicInfoReqVo.setReqId(reqVo.getReqId());
try {
ResponseResult result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
if (null != result && "00".equals(result.getCode())){
if (null != result && "00".equals(result.getCode())) {
resVo.setMerchant((Merchant) result.getData());
}
}catch (Exception e){
} catch (Exception e) {
resVo.setMerchant(null);
}
/*获取公司扩展表信息*/
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setId(reqVo.getId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class);
if (null != companyExtendVo){
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null != companyExtendVo) {
resVo.setCompanyExtendVo(companyExtendVo);
}
/*获取公司银行卡列表*/
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setCompanyId(reqVo.getId());
companyBankCardGetReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo){
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
if (null != companyBankCardVo) {
resVo.setBankCardVo(companyBankCardVo);
}
return resVo;
......@@ -143,6 +149,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
*
* @param reqVo 公司以及公司扩展表信息
* @return 公司id
*/
......@@ -155,14 +162,14 @@ public class CompanyServiceImpl implements CompanyService{
userServiceImpl.isValid(reqVo.getAccount());
UserVo userReqVo = new UserVo();
userReqVo.setAccount(reqVo.getAccount());
if (null != reqVo.getUserId() && !reqVo.getUserId().isEmpty()){
if (null != reqVo.getUserId() && !reqVo.getUserId().isEmpty()) {
userReqVo.setId(reqVo.getUserId());
}
userServiceImpl.checkAccount(userReqVo);
/*公司主表*/
CompanyVo companyVo = new CompanyVo();
companyVo.setId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(companyVo,reqVo);
ObjectHelper.writeWithFrom(companyVo, reqVo);
companyVo.setAddress(reqVo.getCompanyAddress());
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setStatus(0);
......@@ -171,12 +178,12 @@ public class CompanyServiceImpl implements CompanyService{
/*注册服务请求对象*/
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
/*银行卡*/
if (reqVo.getCompanyType() == 1){
if (reqVo.getCompanyType() == 1) {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,reqVo);
ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
......@@ -185,7 +192,7 @@ public class CompanyServiceImpl implements CompanyService{
companyBankCardVo.setCompanyId(companyVo.getId());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
ObjectHelper.writeWithFrom(companyBankReqVo, companyBankCardVo);
companyReqVo.getBankList().add(companyBankReqVo);
}
/*注册*/
......@@ -206,10 +213,10 @@ public class CompanyServiceImpl implements CompanyService{
/*保存银行卡表*/
/*之后要将companyReqVo.getBankList()改为res.getBankList()*/
List<CompanyBankReqVo> companyBankReqVoList = companyReqVo.getBankList();
if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()){
if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()) {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
ObjectHelper.writeWithFrom(companyBankCardVo,companyBankReqVo);
ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardDao.create(companyBankCardVo);
......@@ -221,9 +228,9 @@ public class CompanyServiceImpl implements CompanyService{
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(companyVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
.replace("-", "")
.replace(":", "")
.replace(" ", "");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.create(extendVo);
resVo.setCompanyExtendId(extendVo.getId());
......@@ -241,7 +248,7 @@ public class CompanyServiceImpl implements CompanyService{
ResponseResult result1 = storeFeign.merchantCreate(merchantCreateReqVo);
if (null == result1 || !"00".equals(result1.getCode())){
if (null == result1 || !"00".equals(result1.getCode())) {
throw new CodeException("获取失败，请重试");
}
String merchantId = (String) result1.getData();
......@@ -277,6 +284,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 添加公司提交按钮
*
* @param reqVo 封装了公司id和验证码的请求对象
* @return
*/
......@@ -288,7 +296,7 @@ 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.setCompanyAttribute(reqVo.getCompanyAttribute());
companyVo.setCompanyName(reqVo.getCompanyName());
companyVo.setAddress(reqVo.getCompanyAddress());
......@@ -303,17 +311,17 @@ public class CompanyServiceImpl implements CompanyService{
/*注册请求对象*/
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList<CompanyBankReqVo>());
ObjectHelper.writeWithFrom(companyReqVo,companyVo);
if (null != reqVo.getVerifyCode() && !reqVo.getVerifyCode().isEmpty()){
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
if (null != reqVo.getVerifyCode() && !reqVo.getVerifyCode().isEmpty()) {
companyReqVo.setValidateCode(reqVo.getVerifyCode());
}
companyReqVo.setId(reqVo.getId());
/*银行卡*/
if (null != reqVo.getCompanyBankCardId() && !reqVo.getCompanyBankCardId().isEmpty()){
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(companyBankCardGetReqVo, CompanyBankCardVo.class);
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setIdCard(reqVo.getContactCode());
companyBankCardVo.setPhone(reqVo.getContactPhone());
......@@ -322,7 +330,7 @@ public class CompanyServiceImpl implements CompanyService{
companyBankCardVo.setBankCardCode(reqVo.getBankCardCode());
companyBankCardVo.setBankCode(reqVo.getBankCode());
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
ObjectHelper.writeWithFrom(companyBankReqVo, companyBankCardVo);
companyReqVo.getBankList().add(companyBankReqVo);
resVo.setCompanyBankCardId(companyBankCardVo.getId());
......@@ -346,10 +354,10 @@ public class CompanyServiceImpl implements CompanyService{
/*更新银行卡表*/
/*之后以下需要由companyReqVo.getBankList()改为res.getBankList()*/
List<CompanyBankReqVo> companyBankReqVoList = companyReqVo.getBankList();
if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()){
if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()) {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
ObjectHelper.writeWithFrom(companyBankCardVo,companyBankReqVo);
ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardDao.update(companyBankCardVo);
}
......@@ -358,16 +366,16 @@ public class CompanyServiceImpl implements CompanyService{
MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
ObjectHelper.writeWithFrom(companyScenicInfoReqVo,companyVo);
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())){
if (null == result1 || !"00".equals(result1.getCode())) {
throw new CodeException("验证失败，请重试");
}
Merchant merchant = (Merchant) result1.getData();
ObjectHelper.writeWithFrom(merchantCreateReqVo,merchant);
ObjectHelper.writeWithFrom(merchantCreateReqVo, merchant);
merchantCreateReqVo.setReqId(reqVo.getReqId());
merchantCreateReqVo.setType(reqVo.getCompanyAttribute());
merchantCreateReqVo.setName(reqVo.getMerchantName());
......@@ -376,14 +384,14 @@ public class CompanyServiceImpl implements CompanyService{
resVo.setMerchantId(merchant.getId());
ResponseResult result2 = storeFeign.merchantCreate(merchantCreateReqVo);
if (null == result2 || !"00".equals(result2.getCode())){
if (null == result2 || !"00".equals(result2.getCode())) {
throw new CodeException("验证失败，请重试");
}
/*更新用户表*/
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(reqVo.getUserId());
UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
userVo.setAccount(reqVo.getAccount());
userVo.setName(reqVo.getContactName());
userVo.setPhone(reqVo.getContactPhone());
......@@ -396,6 +404,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 修改公司审核状态
*
* @param reqVo 封装了公司id 的请求对象
* @return
*/
......@@ -404,7 +413,7 @@ public class CompanyServiceImpl implements CompanyService{
CompanyGetReqVo getReqVo = new CompanyGetReqVo();
getReqVo.setId(reqVo.getCompanyId());
CompanyVo companyVo = companyDao.load(getReqVo,CompanyVo.class);
CompanyVo companyVo = companyDao.load(getReqVo, CompanyVo.class);
companyVo.setExamineStatus(reqVo.getExamineStatus());
companyVo.setUpdateTime(DateHelper.getNow());
companyDao.update(companyVo);
......@@ -423,7 +432,7 @@ public class CompanyServiceImpl implements CompanyService{
/*若该卡存在，则修改*/
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
if (null != reqVo.getId() && !"".equals(reqVo.getId())){
if (null != reqVo.getId() && !"".equals(reqVo.getId())) {
/*检查银行卡号是否存在*/
CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
checkReqVo.setId(reqVo.getId());
......@@ -431,8 +440,8 @@ public class CompanyServiceImpl implements CompanyService{
companyBankCardDao.checkBankCardCode(checkReqVo);
getReqVo.setId(reqVo.getId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo){
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
if (null != companyBankCardVo) {
reqVo.setStatus(companyBankCardVo.getStatus());
reqVo.setBindingCode(companyBankCardVo.getBindingCode());
reqVo.setBindingTime(companyBankCardVo.getBindingTime());
......@@ -441,7 +450,7 @@ public class CompanyServiceImpl implements CompanyService{
}
}
/*若卡不存在，则新增*/
else{
else {
/*检查银行卡号是否存在*/
CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
checkReqVo.setBankCardCode(reqVo.getBankCardCode());
......@@ -452,9 +461,9 @@ public class CompanyServiceImpl implements CompanyService{
PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
/*若该银行卡是第一张银行卡，则设为默认*/
if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()){
if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()) {
reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
}else{
} else {
reqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
}
reqVo.setStatus(0);
......@@ -478,25 +487,26 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 调用支付服务解绑银行卡，并更新银行卡状态
*
* @param reqVo 封装了银行卡id的请求对象
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteBank(CompanyBankCardVo reqVo) {
CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo,CompanyBankCardVo.class);
CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo, CompanyBankCardVo.class);
CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
ObjectHelper.writeWithFrom(companyBankReqVo,bankCardVo);
ObjectHelper.writeWithFrom(companyBankReqVo, bankCardVo);
/*ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
if (null == result || !"00".equals(result.getCode())){
throw new CodeException("解绑失败，请重试");
}*/
/*若删除的银行卡为默认银行卡，则需要设置其他一张卡为默认银行卡*/
if (CompanyBankCardConstant.IS_DEFAULT.equals(bankCardVo.getIsDefault())){
if (CompanyBankCardConstant.IS_DEFAULT.equals(bankCardVo.getIsDefault())) {
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setCompanyId(bankCardVo.getCompanyId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVo){
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
if (null != companyBankCardVo) {
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyExtendDaoImpl.update(companyBankCardVo);
}
......@@ -506,6 +516,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 设置该银行卡为默认支付，并取消其他银行卡的默认
*
* @param reqVo 封装了银行卡id的请求对象
* @return
*/
......@@ -513,7 +524,7 @@ public class CompanyServiceImpl implements CompanyService{
@Transactional(rollbackFor = Exception.class)
public void setDefault(CompanyBankCardVo reqVo) {
/*获取该银行卡的公司id*/
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(reqVo,CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(reqVo, CompanyBankCardVo.class);
String companyId = companyBankCardVo.getCompanyId();
/*现将该公司其他银行卡设为非默认*/
CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo = new CompanyBankCardSetNotDefaultReqVo();
......@@ -526,6 +537,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 提交银行卡信息，验证手机验证码，并更新银行卡状态
*
* @param reqVo 银行卡表数据+验证码
* @return 目前返回验证码
*/
......@@ -535,7 +547,7 @@ public class CompanyServiceImpl implements CompanyService{
/*根据银行卡id获取银行卡信息*/
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setId(reqVo.getId());
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
/*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
/*CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
......@@ -555,15 +567,17 @@ public class CompanyServiceImpl implements CompanyService{
return companyBankCardVo;
}
/**y
/**
* y
* 我的二维码页面
*
* @param reqVo 公司扩展表请求对象
* @return 公司主表信息
*/
@Override
public CompanyVo myQrCodeUrl(CompanyGetReqVo reqVo) {
CompanyVo companyVo = companyDao.load(reqVo,CompanyVo.class);
if (null == companyVo){
CompanyVo companyVo = companyDao.load(reqVo, CompanyVo.class);
if (null == companyVo) {
throw new CodeException("暂无公司信息");
}
return companyVo;
......@@ -571,6 +585,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 获取二维码url，有则直接返回，没有则调用微信服务生成url
*
* @param reqVo 封装了公司id，页面选项的请求对象
* @return 二维码url
*/
......@@ -579,22 +594,22 @@ 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);
if (null == companyExtendVo){
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo1, CompanyExtendVo.class);
if (null == companyExtendVo) {
companyExtendVo = new CompanyExtendVo();
companyExtendVo.setId(reqVo.getCompanyId());
companyExtendDaoImpl.save(companyExtendVo);
}
String url = companyExtendVo.getQrCodeUrl();
if (null != url && !url.isEmpty() && reqVo.getSelect() == 1){
if (null != url && !url.isEmpty() && reqVo.getSelect() == 1) {
return url;
}
String qrCode = companyExtendVo.getQrCode();
if (null == qrCode || qrCode.isEmpty()){
if (null == qrCode || qrCode.isEmpty()) {
String code = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
.replace("-", "")
.replace(":", "")
.replace(" ", "");
companyExtendVo.setQrCode(code);
}
int select = reqVo.getSelect();
......@@ -607,23 +622,23 @@ public class CompanyServiceImpl implements CompanyService{
scene.setScene_str(companyExtendVo.getQrCode());
sceneInfo.setScene(scene);
qrCodeReqVo.setAction_info(sceneInfo);
if (select == 0){
qrCodeReqVo.setExpire_seconds(60*30);
if (select == 0) {
qrCodeReqVo.setExpire_seconds(60 * 30);
qrCodeReqVo.setAction_name("QR_STR_SCENE");
}else{
} else {
qrCodeReqVo.setAction_name("QR_LIMIT_STR_SCENE");
}
ResponseResult result;
try {
result= wxFeign.qcCodeGet(qrCodeReqVo);
}catch (CodeException e){
throw new CodeException(e.getCode(),e.getMessage());
result = wxFeign.qcCodeGet(qrCodeReqVo);
} catch (CodeException e) {
throw new CodeException(e.getCode(), e.getMessage());
}
WxVo wxVo = (WxVo) result.getData();
String qrCodeUrl = "http://192.168.0.120:8888/"+wxVo.getPdUrl();
if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())){
String qrCodeUrl = "http://192.168.0.120:8888/" + wxVo.getPdUrl();
if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())) {
companyExtendVo.setQrCodeUrl(qrCodeUrl);
companyExtendDaoImpl.update(companyExtendVo);
}
......@@ -632,6 +647,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 获取银行卡列表
*
* @param reqVo 继承了分页对象，含公司id
* @return 银行卡列表分页对象
*/
......@@ -647,6 +663,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 添加用户
*
* @param reqVo 封装了用户信息和用户角色信息的请求对象
* @return 用户id
*/
......@@ -657,15 +674,16 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 根据请求的数据返回对应的供应商或是接口商列表
*
* @param reqVo
* @return
*/
@Override
public List<CompanyVo> productOrInterface(ProductOrInterfaceReqVo reqVo) {
CompanyGetReqVo getReqVo = new CompanyGetReqVo();
ObjectHelper.writeWithFrom(getReqVo,reqVo);
List<CompanyVo> companyVoList = companyDao.loadList(getReqVo,CompanyVo.class);
if (null == companyVoList || companyVoList.isEmpty()){
ObjectHelper.writeWithFrom(getReqVo, reqVo);
List<CompanyVo> companyVoList = companyDao.loadList(getReqVo, CompanyVo.class);
if (null == companyVoList || companyVoList.isEmpty()) {
throw new CodeException("未找到公司信息");
}
return companyVoList;
......@@ -673,6 +691,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 批量删除用户
*
* @param reqVo 封装了用户id列表的请求对象
* @return
*/
......@@ -680,10 +699,10 @@ public class CompanyServiceImpl implements CompanyService{
@Transactional(rollbackFor = Exception.class)
public void batchDelete(BatchDeleteReqVo reqVo) {
List<String> userIdList = reqVo.getUserIdList();
if (null == userIdList || userIdList.isEmpty()){
if (null == userIdList || userIdList.isEmpty()) {
throw new CodeException("删除列表为空，请添加");
}
for (String userId:userIdList) {
for (String userId : userIdList) {
UserGetReqVo getReqVo = new UserGetReqVo();
getReqVo.setId(userId);
userDaoImpl.remove(getReqVo);
......@@ -692,35 +711,36 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 批量更新用户信息
*
* @param reqVo 封装了用户列表的请求对象
* @return
*/
@Override
public void batchUpdate(BatchUpdateReqVo reqVo) throws Exception {
List<UserVo> userVoList = reqVo.getUserVoList();
if (null == userVoList || userVoList.isEmpty()){
if (null == userVoList || userVoList.isEmpty()) {
throw new CodeException("更新列表为空，请添加");
}
for (UserVo userVo:userVoList) {
for (UserVo userVo : userVoList) {
UserGetReqVo getReqVo = new UserGetReqVo();
getReqVo.setId(userVo.getId());
UserVo userVoOld = userDaoImpl.load(getReqVo,UserVo.class);
if (!StringHelper.compare(userVo.getAccount(),userVoOld.getAccount())){
UserVo userVoOld = userDaoImpl.load(getReqVo, UserVo.class);
if (!StringHelper.compare(userVo.getAccount(), userVoOld.getAccount())) {
userServiceImpl.isValid(userVo.getAccount());
userServiceImpl.checkAccount(userVo);
}
if ("".equals(userVo.getPassword())){
if ("".equals(userVo.getPassword())) {
userVo.setPassword(userVoOld.getPassword());
userVo.setRemark(userVoOld.getRemark());
}else{
} else {
String password = RSAUtils.decryptionByPrivateKey(userVo.getPassword(), RsaConstant.privateKey);
userVo.setPassword(StringHelper.md5(password));
userVo.setRemark(password);
}
if (!StringHelper.compare(userVo.getEmail(),userVoOld.getEmail())){
if (!StringHelper.compare(userVo.getEmail(), userVoOld.getEmail())) {
userServiceImpl.checkEmail(userVo.getEmail());
}
if (!StringHelper.compare(userVo.getPhone(),userVoOld.getPhone())){
if (!StringHelper.compare(userVo.getPhone(), userVoOld.getPhone())) {
userServiceImpl.checkPhone(userVo);
}
userDaoImpl.update(userVo);
......@@ -729,6 +749,7 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 通过公司id查询该公司邀请的公司
*
* @param reqVo 封装了公司id的请求对象
* @return
*/
......@@ -744,23 +765,43 @@ public class CompanyServiceImpl implements CompanyService{
/**
* 根据二维码源码获取公司数据
*
* @param reqVo 封装了二维码源码的请求对象
* @return
*/
@Override
public CompanyVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo) {
public GetCompanyResVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo) {
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
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());
CompanyVo companyVo = companyDao.load(companyGetReqVo,CompanyVo.class);
if (null == companyVo){
GetCompanyResVo companyVo = companyDao.load(companyGetReqVo, GetCompanyResVo.class);
if (null == companyVo) {
throw new CodeException("未查询到对应公司数据");
}
CompanyMsgReqVo companyMsgReqVo = new CompanyMsgReqVo();
companyMsgReqVo.setCompanyId(companyVo.getId());
companyMsgReqVo.setType(companyVo.getCompanyAttribute());
List<GetCompanyMsgResVo> companyMsgVoList = companyMsgDao.findCompanyMsgList(companyMsgReqVo);
companyVo.setMsgList(companyMsgVoList);
return companyVo;
}
@Override
public List<GetCompanyDivideResVo> findCompanyDivideInfo(CompanyDivideReqVo req){
List<GetCompanyDivideResVo> companyDivideResVoList = new ArrayList<>();
List<GetCompanyReqVo> companyList = req.getCompanyIdList();
for (int i = 0; i < companyList.size(); i++){
GetCompanyReqVo getCompanyReqVo = companyList.get(i);
GetCompanyDivideResVo companyDivideResVo = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
companyDivideResVo.setCompanyChannelType(getCompanyReqVo.getCompanyChannelType());
companyDivideResVoList.add(companyDivideResVo);
}
return companyDivideResVoList;
}
}
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 158ed33a
package com.pangding.web.authority.service.impl;
import com.pangding.login.feign.TokenFeign;
import com.pangding.web.authority.dao.*;
import com.pangding.web.authority.feign.PayFeign;
import com.pangding.web.authority.feign.StoreFeign;
......@@ -16,14 +17,13 @@ import com.yanzuoguang.token.TokenHelper;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.JsonHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.ArrayList;
......@@ -62,6 +62,8 @@ public class RegisterServiceImpl implements RegisterService {
AuthorityService authorityServiceImpl;
@Autowired
PayFeign payFeign;
@Autowired
private TokenService tokenService;
/**
* 判断注册编码是否存在
......@@ -360,6 +362,13 @@ public class RegisterServiceImpl implements RegisterService {
LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
loginCompanyResVo.setCompanyVo(companyVo);
resVo.setCompanyResVo(loginCompanyResVo);
reqVo.setToken(token);
LoginVo loginVo = new LoginVo();
loginVo.setToken(token);
loginVo.setData(JsonHelper.serialize(reqVo));
loginVo.setExpairTime(DateHelper.getNow());
tokenService.save(loginVo);
/*判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面*/
if (companyVo.getStatus()!=(LoginConstant.FINISHED_BASIC_INFO) && CompanyConstant.COMPANY_TYPE_PERSON==(companyVo.getCompanyType())){
......
src/main/java/com/pangding/web/authority/util/TokenUtil.java
View file @ 158ed33a
package com.pangding.web.authority.util;
import com.pangding.web.util.RSAUtils;
import com.yanzuoguang.util.helper.StringHelper;
public class TokenUtil {
......@@ -12,6 +13,7 @@ public class TokenUtil {
String token = "";
try{
token = RSAUtils.encryptionByPublicKey(accountOrPhone, publicKey);
token = StringHelper.md5(token);
}catch (Exception e){
}
......
src/main/java/com/pangding/web/authority/vo/CompanyDivideRuleVo.java
View file @ 158ed33a
......@@ -3,7 +3,7 @@ package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_company_divide_rule")
public class CompanyDivideRuleVo extends CompanyVo{
public class CompanyDivideRuleVo{
@TableAnnotation("id")
private String companyDivideId;
......
src/main/java/com/pangding/web/authority/vo/CompanyMsgVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.vo.BaseVo;
@TableAnnotation("pd_company_msg")
public class CompanyMsgVo extends BaseVo{
/**
* 主键id
*/
@TableAnnotation("id")
private String companyMsgId;
/**
* 消息id
*/
@TableAnnotation("msg_id")
private String msgId;
/**
* 消息位置
*/
@TableAnnotation("msg_location")
private int msgLocation;
/**
* 适用类型
*/
private int type;
/**
* 公司id
*/
@TableAnnotation("company_id")
private String companyId;
/**
* 公司名称
*/
@TableAnnotation("company_name")
private String companyName;
/**
* 商户编号
*/
@TableAnnotation("merchant_id")
private String merchantId;
/**
* 商户名称
*/
@TableAnnotation("merchant_name")
private String merchantName;
public String getCompanyMsgId() {
return companyMsgId;
}
public void setCompanyMsgId(String companyMsgId) {
this.companyMsgId = companyMsgId;
}
public int getMsgLocation() {
return msgLocation;
}
public void setMsgLocation(int msgLocation) {
this.msgLocation = msgLocation;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
public String getMerchantName() {
return merchantName;
}
public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}
public String getMsgId() {
return msgId;
}
public void setMsgId(String msgId) {
this.msgId = msgId;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyVo.java
View file @ 158ed33a
......@@ -8,6 +8,7 @@ import com.yanzuoguang.util.vo.InitDao;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
/**
* @Author zhangjinyao
......
src/main/java/com/pangding/web/authority/vo/MsgVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_msg")
public class MsgVo {
/**
* 主键
*/
@TableAnnotation("id")
private String msgId;
@TableAnnotation("msg_title")
private String msgTitle;
@TableAnnotation("msg_content")
private String msgContent;
@TableAnnotation("msg_url")
private String msgUrl;
@TableAnnotation("msg_pic_url")
private String msgPicUrl;
@TableAnnotation("msg_type")
private int msgType;
@TableAnnotation("msg_status")
private int msgStatus;
@TableAnnotation("msg_sort")
private int msgSort;
public String getMsgId() {
return msgId;
}
public void setMsgId(String msgId) {
this.msgId = msgId;
}
public String getMsgTitle() {
return msgTitle;
}
public void setMsgTitle(String msgTitle) {
this.msgTitle = msgTitle;
}
public String getMsgUrl() {
return msgUrl;
}
public void setMsgUrl(String msgUrl) {
this.msgUrl = msgUrl;
}
public String getMsgPicUrl() {
return msgPicUrl;
}
public void setMsgPicUrl(String msgPicUrl) {
this.msgPicUrl = msgPicUrl;
}
public int getMsgType() {
return msgType;
}
public void setMsgType(int msgType) {
this.msgType = msgType;
}
public int getMsgStatus() {
return msgStatus;
}
public void setMsgStatus(int msgStatus) {
this.msgStatus = msgStatus;
}
public int getMsgSort() {
return msgSort;
}
public void setMsgSort(int msgSort) {
this.msgSort = msgSort;
}
public String getMsgContent() {
return msgContent;
}
public void setMsgContent(String msgContent) {
this.msgContent = msgContent;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyDivideReqVo.java
View file @ 158ed33a
......@@ -6,7 +6,7 @@ public class CompanyDivideReqVo {
public String companyId;
private List<String> companyIdList;
private List<GetCompanyReqVo> companyIdList;
public String getCompanyId() {
return companyId;
......@@ -16,13 +16,11 @@ public class CompanyDivideReqVo {
this.companyId = companyId;
}
public List<String> getCompanyIdList() {
public List<GetCompanyReqVo> getCompanyIdList() {
return companyIdList;
}
public void setCompanyIdList(List<String> companyIdList) {
public void setCompanyIdList(List<GetCompanyReqVo> companyIdList) {
this.companyIdList = companyIdList;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyMsgReqVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo.reqvo;
public class CompanyMsgReqVo {
private String companyId;
private int type;
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/GetCompanyReqVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo.reqvo;
public class GetCompanyReqVo {
private String companyId;
private int companyChannelType;
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public int getCompanyChannelType() {
return companyChannelType;
}
public void setCompanyChannelType(int companyChannelType) {
this.companyChannelType = companyChannelType;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/LoginReqVo.java
View file @ 158ed33a
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{
public class LoginReqVo extends LoginVo {
private String reqId;
private String accountOrPhone;
......@@ -30,14 +32,6 @@ public class LoginReqVo extends LoginVo{
this.code = code;
}
public String getReqId() {
return reqId;
}
public void setReqId(String reqId) {
this.reqId = reqId;
}
public String getAccountOrPhone() {
return accountOrPhone;
}
......@@ -53,4 +47,12 @@ public class LoginReqVo extends LoginVo{
public void setPassword(String password) {
this.password = password;
}
public String getReqId() {
return reqId;
}
public void setReqId(String reqId) {
this.reqId = reqId;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/MerchantCreateReqVo.java
View file @ 158ed33a
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.Merchant;
import com.sun.org.apache.xml.internal.security.Init;
import com.yanzuoguang.util.vo.InitDao;
/**
* @Author zhangjinyao
......
src/main/java/com/pangding/web/authority/vo/resvo/GetCompanyDivideResVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
public class GetCompanyDivideResVo extends CompanyDivideRuleVo{
private int divideStatus;
private String companyName;
private String companyId;
private int companyChannelType;
public int getDivideStatus() {
return divideStatus;
}
public void setDivideStatus(int divideStatus) {
this.divideStatus = divideStatus;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
@Override
public String getCompanyId() {
return companyId;
}
@Override
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public int getCompanyChannelType() {
return companyChannelType;
}
public void setCompanyChannelType(int companyChannelType) {
this.companyChannelType = companyChannelType;
}
}
src/main/java/com/pangding/web/authority/vo/resvo/GetCompanyMsgResVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.MsgVo;
public class GetCompanyMsgResVo extends MsgVo{
private String companyId;
private String companyName;
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
}
src/main/java/com/pangding/web/authority/vo/resvo/GetCompanyResVo.java 0 → 100644
View file @ 158ed33a
package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.CompanyVo;
import java.util.List;
public class GetCompanyResVo extends CompanyVo {
private List<GetCompanyMsgResVo> msgList;
public List<GetCompanyMsgResVo> getMsgList() {
return msgList;
}
public void setMsgList(List<GetCompanyMsgResVo> msgList) {
this.msgList = msgList;
}
}
src/main/resources/bootstrap-test.yml 0 → 100644
View file @ 158ed33a
eureka:
client:
service-url:
defaultZone: http://register.pangdly.com/eureka/
yzg:
logAll: true
PrintSql: true
\ No newline at end of file
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