Skip to content

T
tcm-system
Commit 04e07083 authored by tangfang's avatar tangfang
Browse files
Options

修改注册判断银行卡

parent 7b9f4dbc
Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 125 deletions
readme.md
View file @ 04e07083
......@@ -268,19 +268,19 @@ companyVo.setContactPhone(reqVo.getContactPhone());
# 有可能拥有此用户，而没有拥有公司，需要抛出异常
``` java
companyReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
companySaveReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companySaveReqVo,CompanyVo.class);
```
# 函数内实体尽量在引用之前创建，而不是一起创建，代码可读性更好
``` java
CompanyVo companyReqVo = new CompanyVo();
CompanyVo companySaveReqVo = new CompanyVo();
CompanyBankCardVo companyBankCardReqVo = new CompanyBankCardVo();
CompanyExtendVo companyExtendReqVo = new CompanyExtendVo();
companyReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
companySaveReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companySaveReqVo,CompanyVo.class);
companyBankCardReqVo.setCompanyId(userVo.getCompanyId());
CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(companyBankCardReqVo,CompanyBankCardVo.class);
companyExtendReqVo.setId(userVo.getCompanyId());
......@@ -296,9 +296,9 @@ if(StringHelper.isEmpty(userVo.getCompanyId())){
}
// 加载公司
CompanyVo companyReqVo = new CompanyVo();
companyReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
CompanyVo companySaveReqVo = new CompanyVo();
companySaveReqVo.setId(userVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companySaveReqVo,CompanyVo.class);
// 加载公司银行卡
CompanyBankCardVo companyBankCardReqVo = new CompanyBankCardVo();
......
src/main/java/com/pangding/web/authority/controller/CompanyController.java
View file @ 04e07083
......@@ -9,6 +9,7 @@ import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.ApiOperation;
......@@ -70,7 +71,7 @@ public class CompanyController {
@RequestMapping(value = "findCompanyById")
@ApiOperation(value = "找到公司信息", notes = "找到公司信息")
public ResponseResult findCompanyById(@RequestBody CompanyReqVo req){
public ResponseResult<CompanyResVo> findCompanyById(@RequestBody CompanyReqVo req){
CheckerHelper.newInstance().notBlankCheck("", req.getId()).checkException();
return ResponseResult.result(companyService.findCompanyById(req));
}
......
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ 04e07083
......@@ -9,6 +9,7 @@ import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -44,13 +45,16 @@ public class PangdingManagementController {
}
/**
* 根据请求的数据返回对应的供应商或是接口商列表
* @param reqVo
* @return
* 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
*/
@RequestMapping(value = "/productOrInterface", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult productOrInterface(@RequestBody ProductOrInterfaceReqVo reqVo){
return ResponseResult.result(companyServiceImpl.productOrInterface(reqVo));
@RequestMapping(value = "/queryCompanyDetail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyResVo> queryCompanyDetail(@RequestBody CompanyReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("id",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.companyDetail(reqVo));
}
/**y
......@@ -61,11 +65,21 @@ public class PangdingManagementController {
@RequestMapping(value = "/pdDetail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyLoginResVo> pdGetDetail(@RequestBody CompanyGetReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getId())
.notBlankCheck("id",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.pdGetDetail(reqVo));
}
/**
* 根据请求的数据返回对应的供应商或是接口商列表
* @param reqVo
* @return
*/
@RequestMapping(value = "/productOrInterface", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult productOrInterface(@RequestBody ProductOrInterfaceReqVo reqVo){
return ResponseResult.result(companyServiceImpl.productOrInterface(reqVo));
}
/**y
* 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
* @param reqVo 公司以及公司扩展表信息
......
src/main/java/com/pangding/web/authority/dao/CompanyRuleDao.java 0 → 100644
View file @ 04e07083
package com.pangding.web.authority.dao;
import com.yanzuoguang.dao.BaseDao;
public interface CompanyRuleDao extends BaseDao {
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @ 04e07083
......@@ -27,12 +27,12 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
table.add(SELECT,"select a.*,b.invitation_code,b.withdraw_total_cash from pd_company a inner join pd_company_extend b on a.id = b.id " +
"where 1=1 {WHERE} order by create_time desc")
.add("companyName","and company_name = ? ")
.add("companyName","and company_name LIKE concat('%', ?,'%') ")
.add("companyType","and company_type = ? ")
.add("companyAttribute","and company_attribute = ? ")
.add("examineStatus","and examine_status = ?")
.add("companyId","and invitation_company_id = ? ")
.add("contactName","and contact_name = ? ")
.add("contactName","and contact_name LIKE concat('%', ?,'%') ")
.add("contactPhone","and contact_phone = ? ")
.add("status","and status = ? ")
.add("startDate","and create_time >= ? ")
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyRuleDaoImpl.java 0 → 100644
View file @ 04e07083
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyRuleDao;
import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class CompanyRuleDaoImpl extends BaseDaoImpl implements CompanyRuleDao {
@Override
protected void init() {
register(CompanyRuleVo.class);
}
}
src/main/java/com/pangding/web/authority/feign/PayFeign.java
View file @ 04e07083
package com.pangding.web.authority.feign;
import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
import com.pangding.web.authority.vo.reqvo.CompanySaveReqVo;
import com.pangding.web.vo.system.req.DeviceReqVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -27,7 +26,7 @@ public interface PayFeign {
* @return
*/
@RequestMapping(value="/register")
ResponseResult<CompanyReqVo> setCompanyInfo(@RequestBody CompanyReqVo req);
ResponseResult<CompanySaveReqVo> setCompanyInfo(@RequestBody CompanySaveReqVo req);
@RequestMapping(value = "/setCompanyInfo", method = RequestMethod.POST)
ResponseResult<SaveCompanyReqVo> setCompanyInfo1(@RequestBody SaveCompanyReqVo req);
......@@ -55,7 +54,7 @@ public interface PayFeign {
* @throws IOException
*/
@RequestMapping(value = "/sign")
ResponseResult<CompanyReqVo> sign(@RequestBody CompanyReqVo req) throws IOException;
ResponseResult<CompanySaveReqVo> sign(@RequestBody CompanySaveReqVo req) throws IOException;
/**
* 绑定设备编号
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 04e07083
......@@ -6,6 +6,7 @@ import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -18,6 +19,20 @@ import java.util.List;
*/
public interface CompanyService{
/**
* 分页查询公司信息
* @param reqVo 继承了分页对象
* @return 公司列表分页对象
*/
PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo);
/**
* 查询公司详情 （审核）
* @param reqVo
* @return
*/
CompanyResVo companyDetail(CompanyReqVo reqVo);
/**
* 公司个人实名认证
* @param req
......@@ -31,12 +46,7 @@ public interface CompanyService{
*/
void updateCompanyStatus(CompanyVo companyVo);
/**
* 分页查询公司信息
* @param reqVo 继承了分页对象
* @return 公司列表分页对象
*/
PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo);
/**
* 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 04e07083
......@@ -5,7 +5,6 @@ import com.pangding.web.authority.feign.PayFeign;
import com.pangding.web.authority.feign.StoreFeign;
import com.pangding.web.authority.feign.WxFeign;
import com.pangding.web.authority.mq.CompanyConsumer;
import com.pangding.web.authority.service.CompanyCodeService;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.service.PangdingPartnerService;
import com.pangding.web.authority.service.UserService;
......@@ -13,7 +12,7 @@ import com.pangding.web.authority.util.CompanyBankCardConstant;
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.reqvo.CompanyReqVo;
import com.pangding.web.authority.vo.reqvo.CompanySaveReqVo;
import com.pangding.web.authority.vo.reqvo.OldSaveCompanyReqVo;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.constant.CompanyConstant;
......@@ -51,6 +50,10 @@ import java.util.List;
@Service
public class CompanyServiceImpl implements CompanyService {
@Autowired
private UserService userService;
@Autowired
private PangdingPartnerService pangdingPartnerService;
@Autowired
private CompanyDao companyDao;
@Autowired
......@@ -58,22 +61,12 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private CompanyBankCardDao companyBankCardDao;
@Autowired
private UserService userService;
private UserRoleDao userRoleDao;
@Autowired
private UserDao userDao;
@Autowired
private CompanyCodeDao companyCodeDao;
@Autowired
private PayFeign payFeign;
@Autowired
private StoreFeign storeFeign;
@Autowired
private WxFeign wxFeign;
@Autowired
private UserRoleDao userRoleDao;
@Autowired
private PangdingPartnerService pangdingPartnerService;
@Autowired
private CompanyMsgDao companyMsgDao;
@Autowired
private CompanyDivideRuleDao companyDivideRuleDao;
......@@ -82,23 +75,20 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private CompanyMoneyDetailDao companyMoneyDetailDao;
@Autowired
private CompanyRuleDao companyRuleDao;
@Autowired
private PayFeign payFeign;
@Autowired
private StoreFeign storeFeign;
@Autowired
private WxFeign wxFeign;
@Autowired
private CompanyConsumer companyConsumer;
@Value("${msg.payMsgId}")
private String payMsgId;
@Value("${msg.groupProductMsgId}")
private String groupProductMsgId;
/**
* 修改公司信息
*
* @param companyVo
*/
@Override
public void updateCompanyStatus(CompanyVo companyVo) {
CompanyVo company = companyDao.load(companyVo.getId(), CompanyVo.class);
ObjectHelper.writeWithFrom(company, companyVo);
companyDao.update(company);
}
/**
* 分页查询公司信息
......@@ -115,6 +105,87 @@ public class CompanyServiceImpl implements CompanyService {
return pageSizeData;
}
/**
* 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
*
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
*/
@Override
public CompanyResVo companyDetail(CompanyReqVo reqVo) {
// 获取公司信息
CompanyResVo companyResVo = companyDao.load(reqVo.getId(), CompanyResVo.class);
if (StringHelper.isEmpty(companyResVo)) {
throw new CodeException("暂无公司信息");
}
// 查询公司规则信息
CompanyRuleReqVo companyRuleReqVo = new CompanyRuleReqVo();
companyRuleReqVo.setCompanyId(companyResVo.getId());
List<CompanyRuleVo> companyRuleVoList = companyRuleDao.loadList(companyRuleReqVo, CompanyRuleVo.class);
companyResVo.setCompanyRuleVoList(companyRuleVoList);
// 查询公司银行卡信息
CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
companyBankCardReqVo.setCompanyId(companyResVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(companyBankCardReqVo, CompanyBankCardVo.class);
companyResVo.setCompanyBankCardVoList(companyBankCardVoList);
// 查询公司分润信息
CompanyDivideReqVo companyDivideReqVo = new CompanyDivideReqVo();
companyDivideReqVo.setCompanyId(companyResVo.getId());
List<CompanyDivideRuleVo> companyDivideRuleVoList = companyDivideRuleDao.loadList(companyDivideReqVo, CompanyDivideRuleVo.class);
companyResVo.setCompanyDivideRuleVoList(companyDivideRuleVoList);
// 查询公司管理员信息
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setIsFirst(1);
userGetReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDao.load(userGetReqVo, UserVo.class);
companyResVo.setUserVo(userVo);
// 查询公司角色信息
RoleReqVo roleReqVo = new RoleReqVo();
roleReqVo.setCompanyId(reqVo.getId());
RoleVo roleVo = roleDao.load(roleReqVo, RoleVo.class);
return companyResVo;
}
public void updateCompany(CompanyUpdateReqVo reqVo) {
CompanyResVo companyResVo = companyDao.load(reqVo.getId(), CompanyResVo.class);
if(StringHelper.isEmpty(companyResVo)){
throw new CodeException("暂无公司信息");
}
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFromClass(companyVo, companyResVo);
ObjectHelper.writeWithFromClass(companyVo, reqVo);
CompanyExtendVo companyExtendVo = new CompanyExtendVo();
ObjectHelper.writeWithFromClass(companyExtendVo, companyResVo);
ObjectHelper.writeWithFromClass(companyExtendVo, reqVo);
if(StringHelper.isEmpty(companyExtendVo.getQrCode())){
companyExtendVo.setQrCode(DateHelper.getNow()
.replace("-", "")
.replace(":", "")
.replace(" ", ""));
}
}
/**
* 修改公司信息
*
* @param companyVo
*/
@Override
public void updateCompanyStatus(CompanyVo companyVo) {
CompanyVo company = companyDao.load(companyVo.getId(), CompanyVo.class);
ObjectHelper.writeWithFrom(company, companyVo);
companyDao.update(company);
}
/**
* 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
*
......@@ -148,9 +219,6 @@ public class CompanyServiceImpl implements CompanyService {
/*获取没有公司id的角色数组*/
GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
List<RoleVo> roleVoList = roleDao.getEmptyRoles(getEmptyRolesReqVo);
/*if (null == roleVoList || roleVoList.isEmpty()){
throw new CodeException("暂无未分配的角色，请先创建角色");
}*/
resVo.setRoleVoList(roleVoList);
return resVo;
}
......@@ -163,7 +231,7 @@ public class CompanyServiceImpl implements CompanyService {
if (!StringHelper.isEmpty(companyVo)) {
resVo.setCompanyVo(companyVo);
/*此处需要根据公司id和productOrInterface获取商户信息*/
/*此处需要根据公司id和productOrInterface获取商户信息*/
CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
companyScenicInfoReqVo.setCompanyId(companyVo.getId());
companyScenicInfoReqVo.setProductOrInterface(companyVo.getProductOrInterface());
......@@ -177,10 +245,16 @@ public class CompanyServiceImpl implements CompanyService {
resVo.setMerchant(null);
}
/*获取公司扩展表信息*/
/*获取公司扩展表信息*/
CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getId(), CompanyExtendVo.class);
resVo.setCompanyExtendVo(companyExtendVo);
/*获取公司银行卡列表*/
// 获取公司规则信息
CompanyRuleReqVo companyRuleReqVo = new CompanyRuleReqVo();
companyRuleReqVo.setCompanyId(companyVo.getId());
List<CompanyRuleVo> companyRuleVoList = companyRuleDao.loadList(companyRuleReqVo, CompanyRuleVo.class);
resVo.setCompanyRuleVoList(companyRuleVoList);
/*获取公司银行卡列表*/
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setCompanyId(reqVo.getId());
companyBankCardGetReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
......@@ -222,10 +296,10 @@ public class CompanyServiceImpl implements CompanyService {
companyVo.setExamineStatus(0);
/*注册服务请求对象*/
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList<CompanyBankReqVo1>());
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
companySaveReqVo.setBankList(new ArrayList<CompanyBankReqVo1>());
ObjectHelper.writeWithFrom(companySaveReqVo, companyVo);
companySaveReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
/*银行卡*/
if (reqVo.getCompanyType() == 1) {
......@@ -241,19 +315,19 @@ public class CompanyServiceImpl implements CompanyService {
CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
ObjectHelper.writeWithFrom(companyBankReqVo1, companyBankCardVo);
companyReqVo.getBankList().add(companyBankReqVo1);
companySaveReqVo.getBankList().add(companyBankReqVo1);
}
/*注册*/
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
ResponseResult result = payFeign.setCompanyInfo(companySaveReqVo);
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("获取失败，请重试");
}
CompanyReqVo res = (CompanyReqVo) result.getData();
CompanySaveReqVo res = (CompanySaveReqVo) result.getData();
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1, res);
companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
companyVo1.setExamineStatus(companyVo.getExamineStatus());
companyVo1.setCompanyAttribute(companyReqVo.getCompanyAttribution());
companyVo1.setCompanyAttribute(companySaveReqVo.getCompanyAttribution());
/*保存公司主表*/
if (!StringHelper.isEmpty(reqVo.getCompanyId())) {
......@@ -313,7 +387,7 @@ public class CompanyServiceImpl implements CompanyService {
if (null == result1 || !"00".equals(result1.getCode())) {
throw new CodeException("获取失败，请重试");
}
String merchantId = result1.getData().getId();
String merchantId = result1.getData().getId();
resVo.setMerchantId(merchantId);
/*保存用户*/
......@@ -373,13 +447,13 @@ public class CompanyServiceImpl implements CompanyService {
resVo.setCompanyId(companyVo.getId());
resVo.setCompanyExtendId(companyVo.getId());
/*注册请求对象*/
CompanyReqVo companyReqVo = new CompanyReqVo();
companyReqVo.setBankList(new ArrayList<CompanyBankReqVo1>());
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
companySaveReqVo.setBankList(new ArrayList<CompanyBankReqVo1>());
ObjectHelper.writeWithFrom(companySaveReqVo, companyVo);
if (null != reqVo.getVerifyCode() && !reqVo.getVerifyCode().isEmpty()) {
companyReqVo.setValidateCode(reqVo.getVerifyCode());
companySaveReqVo.setValidateCode(reqVo.getVerifyCode());
}
companyReqVo.setId(reqVo.getId());
companySaveReqVo.setId(reqVo.getId());
/*银行卡*/
if (null != reqVo.getCompanyBankCardId() && !reqVo.getCompanyBankCardId().isEmpty()) {
......@@ -393,19 +467,19 @@ public class CompanyServiceImpl implements CompanyService {
companyBankCardVo.setBankCode(reqVo.getBankCode());
CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
ObjectHelper.writeWithFrom(companyBankReqVo1, companyBankCardVo);
companyReqVo.getBankList().add(companyBankReqVo1);
companySaveReqVo.getBankList().add(companyBankReqVo1);
resVo.setCompanyBankCardId(companyBankCardVo.getId());
}
/*注册服务验证验证码*/
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
ResponseResult result = payFeign.setCompanyInfo(companySaveReqVo);
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("验证失败，请重试");
}
/*更新公司主表*/
CompanyReqVo res = (CompanyReqVo) result.getData();
CompanySaveReqVo res = (CompanySaveReqVo) result.getData();
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1, res);
companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
......@@ -533,7 +607,7 @@ public class CompanyServiceImpl implements CompanyService {
BankCardListReqVo reqVo1 = new BankCardListReqVo();
reqVo1.setCompanyId(reqVo.getCompanyId());
PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
/*若该银行卡是第一张银行卡，则设为默认*/
/*若该银行卡是第一张银行卡，则设为默认*/
if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()) {
reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
} else {
......@@ -1009,6 +1083,25 @@ public class CompanyServiceImpl implements CompanyService {
companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
companyExtendDao.update(companyExtendVo);
}
// 更新或新增公司规则表
List<CompanyRuleVo> companyRuleVoList = reqVo.getCompanyRuleVoList();
for(int i = 0; i < companyRuleVoList.size(); i++){
CompanyRuleVo companyRuleVo = companyRuleVoList.get(i);
CompanyRuleVo sqlCompanyRuleVo = companyRuleDao.load(companyRuleVo.getCompanyRuleId(), companyRuleVo.getClass());
if(StringHelper.isEmpty(sqlCompanyRuleVo)){
sqlCompanyRuleVo = new CompanyRuleVo();
ObjectHelper.writeWithFromClass(sqlCompanyRuleVo, companyRuleVo);
sqlCompanyRuleVo.setCompanyId(companyVo.getId());
sqlCompanyRuleVo.setCompanyRuleId(StringHelper.getNewID());
companyRuleDao.create(sqlCompanyRuleVo);
}else{
ObjectHelper.writeWithFromClass(sqlCompanyRuleVo, companyRuleVo);
sqlCompanyRuleVo.setUpdateDate(DateHelper.getNow());
companyRuleDao.update(sqlCompanyRuleVo);
}
}
/*新增或更新pd_company_divide_rule表*/
CompanyDivideRuleVo companyDivideRuleVo = new CompanyDivideRuleVo();
ObjectHelper.writeWithFrom(companyDivideRuleVo, reqVo);
......@@ -1166,7 +1259,7 @@ public class CompanyServiceImpl implements CompanyService {
ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
companyDao.update(companyResVo);
/*保存或更新商户表*/
/*保存或更新商户表*/
MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
ObjectHelper.writeWithFrom(merchantCreateReqVo, req.getMerchantVo());
merchantCreateReqVo.setAddress(req.getCompanyVo().getAddress());
......@@ -1183,7 +1276,7 @@ public class CompanyServiceImpl implements CompanyService {
}
ResponseResult<MerchantVo> merchantResponseResult = storeFeign.merchantCreate(merchantCreateReqVo);
if (merchantResponseResult.getCode().equals("00")) {
MerchantVo merchantVo = merchantResponseResult.getData();
MerchantVo merchantVo = merchantResponseResult.getData();
saveCompanyReqVo.setMerchantVo(merchantVo);
}
if (StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())) {
......
src/main/java/com/pangding/web/authority/service/impl/FinanceServiceImpl.java
View file @ 04e07083
......@@ -109,7 +109,8 @@ public class FinanceServiceImpl implements FinanceService {
public ResponseResult<CapitalFlowReqVo> applyWithdrawal(CapitalFlowReqVo req) {
// 查找公司信息，提现信息
CompanyResVo companyResVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);
if (!StringHelper.isEmpty(companyResVo)) {
CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(req.getBankId(), CompanyBankCardVo.class);
if (!StringHelper.isEmpty(companyResVo) && !StringHelper.isEmpty(companyBankCardVo)) {
double withdrawFee = companyResVo.getWithdrawFee();
double withdrawTotalCash = companyResVo.getWithdrawTotalCash();
if (withdrawTotalCash < req.getOrderMoney()) {
......@@ -127,7 +128,7 @@ public class FinanceServiceImpl implements FinanceService {
CashWithdrawalReqVo cashWithdrawalReqVo = new CashWithdrawalReqVo();
ObjectHelper.writeWithFrom(cashWithdrawalReqVo, capitalFlowVo);
cashWithdrawalReqVo.setActualType(companyResVo.getWithdrawType());
cashWithdrawalReqVo.setBankCardType(companyResVo.getCompanyType());
cashWithdrawalReqVo.setBankCardType(companyBankCardVo.getType());
companyConsumer.cashWithdrawal(cashWithdrawalReqVo);
ResponseResult<CapitalFlowReqVo> responseResult = new ResponseResult<>();
responseResult.setData(req);
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 04e07083
......@@ -21,7 +21,6 @@ import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.sun.org.apache.xpath.internal.operations.Bool;
import com.yanzuoguang.token.TokenHelper;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
......@@ -175,19 +174,19 @@ public class RegisterServiceImpl implements RegisterService {
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getId());
CompanyVo company = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo, reqVo);
companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companyReqVo.setStatus(company.getStatus());
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, reqVo);
companySaveReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companySaveReqVo.setStatus(company.getStatus());
ResponseResult result = payFeign.setCompanyInfo(companySaveReqVo);
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
CompanySaveReqVo resCompanySaveReqVo = (CompanySaveReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo, resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo, resCompanySaveReqVo);
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
......@@ -247,30 +246,30 @@ public class RegisterServiceImpl implements RegisterService {
CompanyVo company = companyDaoImpl.load(reqVo.getId(), CompanyVo.class);
// 初始化通联参数
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo, reqVo);
companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companyReqVo.setStatus(company.getStatus());
companyReqVo.setBankList(new ArrayList());
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, reqVo);
companySaveReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
companySaveReqVo.setStatus(company.getStatus());
companySaveReqVo.setBankList(new ArrayList());
CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
ObjectHelper.writeWithFrom(companyBankReqVo1, reqVo);
companyBankReqVo1.setId(StringHelper.getNewID());
companyReqVo.getBankList().add(companyBankReqVo1);
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
companySaveReqVo.getBankList().add(companyBankReqVo1);
ResponseResult result = payFeign.setCompanyInfo(companySaveReqVo);
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
CompanySaveReqVo resCompanySaveReqVo = (CompanySaveReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo, resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo, resCompanySaveReqVo);
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyDaoImpl.update(companyVo);
List<CompanyBankReqVo1> bankList = resCompanyReqVo.getBankList();
List<CompanyBankReqVo1> bankList = resCompanySaveReqVo.getBankList();
if (null == bankList || bankList.isEmpty()) {
throw new CodeException("保存商户失败，请重试");
}
......@@ -298,7 +297,7 @@ public class RegisterServiceImpl implements RegisterService {
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(resCompanyReqVo.getId());
extendVo.setId(resCompanySaveReqVo.getId());
String qrCode = DateHelper.getNow()
.replace("-", "")
.replace(":", "")
......@@ -450,7 +449,7 @@ public class RegisterServiceImpl implements RegisterService {
}
/*判断电子签约状态，若不等于1，则跳转签约页面*/
/*else if (companyVo.getSigningStatus() != CompanyConstant.COMPANY_STATUS_SIGN_success){
CompanyReqVo companyReqVo = new CompanyReqVo();
CompanySaveReqVo companyReqVo = new CompanySaveReqVo();
companyReqVo.setId(companyVo.getId());
ResponseResult result1 = new ResponseResult();
try {
......@@ -459,7 +458,7 @@ public class RegisterServiceImpl implements RegisterService {
e.printStackTrace();
throw new CodeException("跳转签约页面失败，请重试");
}
CompanyReqVo companyReqVo1 = (CompanyReqVo) result1.getData();
CompanySaveReqVo companyReqVo1 = (CompanySaveReqVo) result1.getData();
resVo.setCode("04");
resVo.setMsg("未签约，跳转签约页面");
resVo.setUrl(companyReqVo1.getSignUrl());
......@@ -526,19 +525,19 @@ public class RegisterServiceImpl implements RegisterService {
getReqVo.setId(reqVo.getId());
CompanyVo companyVo = companyDaoImpl.load(getReqVo, CompanyVo.class);
/*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
companyReqVo.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, companyVo);
companySaveReqVo.setValidateCode(reqVo.getVerifyCode());
companySaveReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
ResponseResult result = payFeign.setCompanyInfo(companySaveReqVo);
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
CompanySaveReqVo resCompanySaveReqVo = (CompanySaveReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1, resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo1, resCompanySaveReqVo);
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
companyVo1.setExamineStatus(0);
......@@ -556,10 +555,10 @@ public class RegisterServiceImpl implements RegisterService {
public String enterpriceSubmit(EnterpriceSubmitReqVo reqVo) {
CompanyVo companyVo = companyDaoImpl.load(reqVo.getId(), CompanyVo.class);
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyReqVo companyReqVo = new CompanyReqVo();
ObjectHelper.writeWithFrom(companyReqVo, companyVo);
companyReqVo.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, companyVo);
companySaveReqVo.setValidateCode(reqVo.getVerifyCode());
companySaveReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
CompanyBankReqVo1 companyBankReqVo1 = new CompanyBankReqVo1();
ObjectHelper.writeWithFrom(companyBankReqVo1, reqVo);
companyBankReqVo1.setType(reqVo.getCompanyType());
......@@ -573,24 +572,24 @@ public class RegisterServiceImpl implements RegisterService {
companyBankReqVo1.setStatus(companyBankCardVo1.getStatus());
companyBankReqVo1.setId(StringHelper.getNewID());
companyBankReqVo1.setValidateCode(reqVo.getVerifyCode());
companyReqVo.setBankList(new ArrayList<>());
companyReqVo.getBankList().add(companyBankReqVo1);
companySaveReqVo.setBankList(new ArrayList<>());
companySaveReqVo.getBankList().add(companyBankReqVo1);
ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
ResponseResult result = payFeign.setCompanyInfo(companySaveReqVo);
if (null == result || !"00".equals(result.getCode())) {
throw new CodeException("保存商户失败，请重试");
}
CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
CompanySaveReqVo resCompanySaveReqVo = (CompanySaveReqVo) result.getData();
/*更新公司表*/
CompanyVo companyVo1 = new CompanyVo();
ObjectHelper.writeWithFrom(companyVo1, resCompanyReqVo);
ObjectHelper.writeWithFrom(companyVo1, resCompanySaveReqVo);
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setExamineStatus(0);
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
companyDaoImpl.update(companyVo1);
List<CompanyBankReqVo1> bankList = resCompanyReqVo.getBankList();
List<CompanyBankReqVo1> bankList = resCompanySaveReqVo.getBankList();
if (null == bankList || bankList.isEmpty()) {
throw new CodeException("保存商户失败，请重试");
}
......@@ -599,18 +598,18 @@ public class RegisterServiceImpl implements RegisterService {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo, bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
if (6 == companyReqVo.getStatus()) {
if (6 == companySaveReqVo.getStatus()) {
companyBankCardVo.setStatus(1);
companyBankCardVo.setBindingTime(
DateHelper.getNow()
.substring(0, 10)
.replace("-", ""));
}
companyBankCardVo.setType(resCompanyReqVo.getCompanyType());
companyBankCardVo.setCompanyId(resCompanyReqVo.getId());
companyBankCardVo.setName(resCompanyReqVo.getContactName());
companyBankCardVo.setIdCard(resCompanyReqVo.getContactCode());
companyBankCardVo.setReservedPhone(resCompanyReqVo.getContactPhone());
companyBankCardVo.setType(resCompanySaveReqVo.getCompanyType());
companyBankCardVo.setCompanyId(resCompanySaveReqVo.getId());
companyBankCardVo.setName(resCompanySaveReqVo.getContactName());
companyBankCardVo.setIdCard(resCompanySaveReqVo.getContactCode());
companyBankCardVo.setReservedPhone(resCompanySaveReqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo1 = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo1.setCompanyId(companyBankCardVo.getCompanyId());
companyBankCardGetReqVo1.setBankCardCode(bankList.get(0).getBankCardCode());
......
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/CompanySaveReqVo.java
View file @ 04e07083
......@@ -6,7 +6,7 @@ import java.util.List;
* @Author zhangjinyao
* @create 2019/6/2 18:10
*/
public class CompanyReqVo {
public class CompanySaveReqVo {
/**
* 公司id
*/
......
src/main/java/com/pangding/web/authority/vo/reqvo/ExamineConfigReqVo.java
View file @ 04e07083
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
import java.util.List;
/**
* @Author zhangjinyao
* @create 2019/7/17 16:46
......@@ -95,6 +99,8 @@ public class ExamineConfigReqVo {
*/
private String userId;
private List<CompanyRuleVo> companyRuleVoList;
public String getUserId() {
return userId;
}
......@@ -238,4 +244,12 @@ public class ExamineConfigReqVo {
public void setQrCodeType(Integer qrCodeType) {
this.qrCodeType = qrCodeType;
}
public List<CompanyRuleVo> getCompanyRuleVoList() {
return companyRuleVoList;
}
public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
this.companyRuleVoList = companyRuleVoList;
}
}
src/main/java/com/pangding/web/authority/vo/resvo/CompanyLoginResVo.java
View file @ 04e07083
......@@ -5,6 +5,7 @@ import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.pd.authority.UserVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import java.util.List;
......@@ -28,6 +29,8 @@ public class CompanyLoginResVo {
private List<RoleVo> roleVoList;
private List<CompanyRuleVo> companyRuleVoList;
public List<RoleVo> getRoleVoList() {
return roleVoList;
}
......@@ -83,4 +86,12 @@ public class CompanyLoginResVo {
public void setRoleVo(RoleVo roleVo) {
this.roleVo = roleVo;
}
public List<CompanyRuleVo> getCompanyRuleVoList() {
return companyRuleVoList;
}
public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
this.companyRuleVoList = companyRuleVoList;
}
}
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