Skip to content

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

修改注册判断银行卡

parent 0b3b7f94
Show whitespace changes
Inline Side-by-side
Showing with 967 additions and 227 deletions
src/main/java/com/pangding/web/authority/controller/FinanceController.java
View file @ ec99e28b
......@@ -89,13 +89,18 @@ public class FinanceController {
* @param req
* @return
*/
// @RequestMapping(value = "/divideSettlment")
// public ResponseResult<String> divideSettlment(@RequestBody OrderMoneyDetailReqVo req) {
// CheckerHelper.newInstance()
// .notBlankCheck("id", req.getId())
// .checkException();
// return financeService.divideSettlement(req);
// }
@RequestMapping(value = "/divideSettlment")
@ApiOperation(value = "转账", notes = "返回转账结果")
public ResponseResult<CapitalFlowReqVo> divideSettlment(@RequestBody CapitalFlowReqVo req) {
CheckerHelper.newInstance()
.notBlankCheck("companyId", req.getCompanyId())
.notBlankCheck("companyName", req.getCompanyName())
.notBlankCheck("bankId", req.getBankId())
.notBlankCheck("bankCardCode", req.getBankCardCode())
.notBlankCheck("orderMoney", req.getOrderMoney())
.checkException();
return financeService.applyWithdrawal(req);
}
@RequestMapping(value = "findCompanyMoneyList")
@ApiOperation(value = "找到公司资金汇总列表", notes = "返回公司资金汇总列表")
......
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ ec99e28b
......@@ -321,6 +321,7 @@ public class PangdingManagementController {
*/
@RequestMapping(value = "/examineConfig",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult examineConfig(@RequestBody ExamineConfigReqVo reqVo){
CheckerHelper.newInstance().notBlankCheck("comapnyId", reqVo.getCompanyId()).checkException();
companyServiceImpl.examineConfig(reqVo);
return new ResponseResult();
}
......
src/main/java/com/pangding/web/authority/controller/RegisterController.java deleted 100644 → 0
View file @ 0b3b7f94
package com.pangding.web.authority.controller;
import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author tf
* 注册controller
*/
@RestController
@RequestMapping(value = "/register")
@Api(value = "注册类", description = "注册用户，新增用户")
public class RegisterController {
@RequestMapping(value = "/saveUser")
public ResponseResult saveUser(@RequestBody SaveUserReqVo req){
CheckerHelper.newInstance().notBlankCheck("", req.getAccount())
.notBlankCheck("", req.getPassword())
.notBlankCheck("", req.getConfirmPassword())
.notBlankCheck("", req.getInvitationCode())
.notBlankCheck("", req.getCompanyType())
.checkException();
return ResponseResult.result("");
}
}
src/main/java/com/pangding/web/authority/dao/CompanyDao.java
View file @ ec99e28b
......@@ -2,6 +2,7 @@ package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -18,4 +19,18 @@ public interface CompanyDao extends BaseDao {
* @return
*/
PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo);
/**
* 找到公司详情
* @param req
* @return
*/
CompanyResVo findCompany(CompanyReqVo req);
/**
* 获取公司总数
* @param req
* @return
*/
CompanyResVo findCompanyTotal(CompanyReqVo req);
}
src/main/java/com/pangding/web/authority/dao/CompanyExtendDao.java
View file @ ec99e28b
......@@ -11,4 +11,6 @@ public interface CompanyExtendDao extends BaseDao {
void updateCompanyMoney(UpdateCompanyMoneyReqVo req);
void updateCompanyInvitedPeople(UpdateCompanyMoneyReqVo req);
}
src/main/java/com/pangding/web/authority/dao/CompanyInvitationRuleDao.java 0 → 100644
View file @ ec99e28b
package com.pangding.web.authority.dao;
import com.yanzuoguang.dao.BaseDao;
public interface CompanyInvitationRuleDao extends BaseDao {
}
src/main/java/com/pangding/web/authority/dao/impl/CapitalFlowDaoImpl.java
View file @ ec99e28b
......@@ -27,8 +27,8 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
.add("category", " AND category = ?")
.add("status"," AND status = ? ");
table.add(QUERY_LIST_TOTAL, "SELECT sum(order_money) as order_money,sum(order_fee) as order_fee,sum(actual_money) as actual_money " +
"FROM pd_capital_flow where 1=1 {WHERE} order by time desc")
table.add(QUERY_LIST_TOTAL, "SELECT count(id) as num,sum(order_money) as order_money,sum(order_fee) as order_fee," +
"sum(actual_money) as actual_money FROM pd_capital_flow where 1=1 {WHERE} order by time desc")
.add("companyId","AND company_id = ? ")
.add("companyName","AND company_name LIKE concat(?,'%')")
.add("startDate", "AND time >= ? ")
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @ ec99e28b
......@@ -3,6 +3,7 @@ package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyDao;
import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.dao.DaoConst;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
......@@ -16,7 +17,9 @@ import org.springframework.stereotype.Component;
@Component
public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
private static final String SELECT = "SELECT";
private static final String QUERY_COMPANY = "QUERY_COMPANY";
private static final String QUERY_COMPANY_TOTAL= "QUERY_COMPANY_TOTAL";
......@@ -25,13 +28,32 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
register(CompanyVo.class);
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 " +
table.add(QUERY_COMPANY,"select a.*,b.subledger_status,b.subledger_rule,b.subledger_rule_time,b.divide_status,b.scan_code_pay_status," +
"invitation_status,invitation_rule_id,invitation_code,invitees_people,invited_people,activation_status,withdraw_rule,min_withdraw_money," +
"withdraw_fee,withdraw_type,grade,withdraw_total_cash,frozen_money " +
" 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 LIKE concat('%', ?,'%') ")
.add("companyType","and company_type = ? ")
.add("companyAttribute","and company_attribute = ? ")
.add("examineStatus","and examine_status = ?")
.add("companyId","and invitation_company_id = ? ")
.add("invitationCode","and invitation_code = ? ")
.add("contactName","and contact_name LIKE concat('%', ?,'%') ")
.add("contactPhone","and contact_phone = ? ")
.add("status","and status = ? ")
.add("startDate","and create_time >= ? ")
.add("endDate","and create_time <= ? ");
table.add(QUERY_COMPANY_TOTAL,"select count(a.id) as company_num " +
" 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 LIKE concat('%', ?,'%') ")
.add("companyType","and company_type = ? ")
.add("companyAttribute","and company_attribute = ? ")
.add("examineStatus","and examine_status = ?")
.add("invitationCompanyId","and invitation_company_id = ? ")
.add("invitationCode","and invitation_code = ? ")
.add("contactName","and contact_name LIKE concat('%', ?,'%') ")
.add("contactPhone","and contact_phone = ? ")
.add("status","and status = ? ")
......@@ -46,6 +68,16 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
@Override
public PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo) {
return this.queryPage(CompanyResVo.class,reqVo,SELECT,reqVo);
return this.queryPage(CompanyResVo.class,reqVo,QUERY_COMPANY,reqVo);
}
@Override
public CompanyResVo findCompany(CompanyReqVo req) {
return this.queryFirst(CompanyResVo.class, QUERY_COMPANY, req);
}
@Override
public CompanyResVo findCompanyTotal(CompanyReqVo req) {
return this.queryFirst(CompanyResVo.class, QUERY_COMPANY, req);
}
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyExtendDaoImpl.java
View file @ ec99e28b
......@@ -16,6 +16,8 @@ public class CompanyExtendDaoImpl extends BaseDaoImpl implements CompanyExtendDa
private static final String UPDATE_COMPANY_MONEY = "UPDATE_COMPANY_MONEY";
private static final String UPDATE_COMPANY_INVITED_PEOPLE = "UPDATE_COMPANY_INVITED_PEOPLE";
@Override
protected void init() {
......@@ -24,6 +26,9 @@ public class CompanyExtendDaoImpl extends BaseDaoImpl implements CompanyExtendDa
table.add(UPDATE_COMPANY_MONEY, "UPDATE pd_company_extend SET withdraw_total_cash = withdraw_total_cash + @newWithdrawTotalCash " +
"WHERE id = @companyId ");
table.add(UPDATE_COMPANY_INVITED_PEOPLE, "UPDATE pd_company_extend SET " +
"invited_people = invited_people + @invitedPeople " +
"WHERE id = @companyId ");
}
......@@ -33,4 +38,8 @@ public class CompanyExtendDaoImpl extends BaseDaoImpl implements CompanyExtendDa
}
@Override
public void updateCompanyInvitedPeople(UpdateCompanyMoneyReqVo req) {
this.updateSql(UPDATE_COMPANY_INVITED_PEOPLE, req);
}
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyInvitationRuleDaoImpl.java 0 → 100644
View file @ ec99e28b
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyInvitationRuleDao;
import com.pangding.web.vo.system.pd.company.CompanyInvitationRuleVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class CompanyInvitationRuleDaoImpl extends BaseDaoImpl implements CompanyInvitationRuleDao {
@Override
protected void init() {
register(CompanyInvitationRuleVo.class);
}
}
src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java
View file @ ec99e28b
package com.pangding.web.authority.mq;
import com.pangding.web.authority.service.CompanyMsgService;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.service.FinanceService;
import com.pangding.web.constant.MqConstant;
import com.pangding.web.mq.CompanyProducer;
......@@ -49,6 +50,8 @@ public class CompanyConsumer {
private CompanyMsgService companyMsgService;
@Autowired
private FinanceService financeService;
@Autowired
private CompanyService companyService;
/**
* 初始化mq
......@@ -131,6 +134,14 @@ public class CompanyConsumer {
payProducer.cashWithdrawal(cashWithdrawalReqVo);
}
/**
* 转账
* @param cashWithdrawalReqVo
*/
public void divideSettlement(CashWithdrawalReqVo cashWithdrawalReqVo) {
payProducer.divideSettlement(cashWithdrawalReqVo);
}
/**
* 提现回调
*
......@@ -194,7 +205,7 @@ public class CompanyConsumer {
log.info("[divideSettlementBack 监听的消息] - [消费时间] - [{}] - [{}]", DateHelper.getNow(), content);
CashWithdrawalBackReqVo req = JsonHelper.deserialize(content, CashWithdrawalBackReqVo.class);
try {
// financeService.divideSettlementBack(req);
financeService.divideSettlementBack(req);
// 保存订单日志MQ
OrderLogReqVo orderLogReqVo = new OrderLogReqVo(StringHelper.getNewID(), req.getId(), "转账回调",
JsonHelper.serialize(req), "", req.getCompanyId(), "");
......@@ -228,4 +239,46 @@ public class CompanyConsumer {
distributionProducer.synCompany(companyResVo);
}
/**
* 公司激活
* @param companyResVo
*/
public void cmpanyActiviat(CompanyResVo companyResVo) {
companyProducer.companyActivat(companyResVo);
}
@RabbitListener(queues = {MqConstant.COMPANY_ACTIVAT})
public void activiatCompany(String content, Message message, Channel channel) {
log.info("[activiatCompany监听的消息] - [消费时间] - [{}] - [{}]", DateHelper.getNow(), content);
try {
CompanyResVo companyResVo = JsonHelper.deserialize(content, CompanyResVo.class);
companyService.activiatCompany(companyResVo);
} catch (Exception e) {
Log.error(CompanyConsumer.class, e);
} finally {
mqService.basicAck(message, channel);
}
}
/**
* 公司奖励
*
* @param companyResVo
*/
public void companyReward(CompanyResVo companyResVo) {
companyProducer.companyReward(companyResVo);
}
@RabbitListener(queues = {MqConstant.COMPANY_REWARD})
public void companyReward(String content, Message message, Channel channel) {
log.info("[companyReward 监听的消息] - [消费时间] - [{}] - [{}]", DateHelper.getNow(), content);
try {
CompanyResVo companyResVo = JsonHelper.deserialize(content, CompanyResVo.class);
companyService.companyReward(companyResVo);
} catch (Exception e) {
Log.error(CompanyConsumer.class, e);
} finally {
mqService.basicAck(message, channel);
}
}
}
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ ec99e28b
......@@ -216,4 +216,18 @@ public interface CompanyService{
*/
ResponseResult synCompanyInfo(CompanyReqVo req);
CompanyResVo findCompany(String invitationCode);
/**
* 激活公司
* @param companyResVo
*/
void activiatCompany(CompanyResVo companyResVo);
/**
* 奖励公司
* @param companyResVo
*/
void companyReward(CompanyResVo companyResVo);
}
src/main/java/com/pangding/web/authority/service/FinanceService.java
View file @ ec99e28b
......@@ -32,6 +32,8 @@ public interface FinanceService {
*/
ResponseResult<String> withdrawalBack(CashWithdrawalBackReqVo req);
ResponseResult<String> divideSettlementBack(CashWithdrawalBackReqVo req);
/**
* 修改公司余额
* @param req
......@@ -41,4 +43,6 @@ public interface FinanceService {
void updateCompanyMoney(UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo);
void divideSettlement(CapitalFlowReqVo req);
}
src/main/java/com/pangding/web/authority/service/impl/CompanyNewServiceImpl.java
View file @ ec99e28b
......@@ -21,9 +21,10 @@ public class CompanyNewServiceImpl implements CompanyNewService {
return companyResVoPageSizeData;
}
public void findCompanyDetail(CompanyReqVo req){
public CompanyResVo findCompanyDetail(CompanyReqVo req){
CompanyResVo companyResVo = companyDao.load(req, CompanyResVo.class);
return companyResVo;
}
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ ec99e28b
......@@ -6,6 +6,7 @@ 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.CompanyService;
import com.pangding.web.authority.service.FinanceService;
import com.pangding.web.authority.service.PangdingPartnerService;
import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.util.CompanyBankCardConstant;
......@@ -17,7 +18,9 @@ import com.pangding.web.authority.vo.reqvo.OldSaveCompanyReqVo;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.constant.CompanyConstant;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.order.pd.CapitalFlowVo;
import com.pangding.web.vo.order.req.CapitalFlowReqVo;
import com.pangding.web.vo.order.res.CapitalFlowResVo;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.pangding.web.vo.system.pd.CompanyMsgVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
......@@ -55,6 +58,8 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private PangdingPartnerService pangdingPartnerService;
@Autowired
private FinanceService financeService;
@Autowired
private CompanyDao companyDao;
@Autowired
private CompanyExtendDao companyExtendDao;
......@@ -67,6 +72,8 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private CompanyCodeDao companyCodeDao;
@Autowired
private CompanyMoneyDao companyMoneyDao;
@Autowired
private CompanyMsgDao companyMsgDao;
@Autowired
private CompanyDivideRuleDao companyDivideRuleDao;
......@@ -77,6 +84,10 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private CompanyRuleDao companyRuleDao;
@Autowired
private CompanyInvitationRuleDao companyInvitationRuleDao;
@Autowired
private CapitalFlowDao capitalFlowDao;
@Autowired
private PayFeign payFeign;
@Autowired
private StoreFeign storeFeign;
......@@ -251,6 +262,31 @@ public class CompanyServiceImpl implements CompanyService {
companyRuleReqVo.setCompanyId(companyVo.getId());
List<CompanyRuleVo> companyRuleVoList = companyRuleDao.loadList(companyRuleReqVo, CompanyRuleVo.class);
resVo.setCompanyRuleVoList(companyRuleVoList);
// 获取公司分润规则信息
CompanyDivideRuleReqVo companyDivideRuleReqVo = new CompanyDivideRuleReqVo();
companyDivideRuleReqVo.setCompanyId(companyVo.getId());
List<CompanyDivideRuleVo> companyDivideRuleVoList = companyDivideRuleDao.loadList(companyDivideRuleReqVo, CompanyDivideRuleVo.class);
resVo.setCompanyDivideRuleVoList(companyDivideRuleVoList);
List<CompanyInvitationRuleVo> companyInvitationActivatRuleVoList = new ArrayList<>();
List<CompanyInvitationRuleVo> companyInvitationRewardRuleVoList = new ArrayList<>();
// 获取邀请规则信息
CompanyInvitationRuleVo companyInvitationRuleReqVo = new CompanyInvitationRuleVo();
companyInvitationRuleReqVo.setCompanyId(companyVo.getId());
List<CompanyInvitationRuleVo> companyInvitationRuleVoList = companyInvitationRuleDao.loadList(companyInvitationRuleReqVo, CompanyInvitationRuleVo.class);
for (int i = 0; i < companyInvitationRuleVoList.size(); i++) {
CompanyInvitationRuleVo companyInvitationRuleVo = companyInvitationRuleVoList.get(i);
if (0 == companyInvitationRuleVo.getRewardRuleType()) {
// 激活规则
companyInvitationActivatRuleVoList.add(companyInvitationRuleVo);
}
if (1 == companyInvitationRuleVo.getRewardRuleType()) {
// 奖励规则
companyInvitationRewardRuleVoList.add(companyInvitationRuleVo);
}
}
resVo.setCompanyInvitationActivatRuleVoList(companyInvitationActivatRuleVoList);
resVo.setCompanyInvitationRewardRuleVoList(companyInvitationRewardRuleVoList);
/*获取公司银行卡列表*/
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
......@@ -1057,48 +1093,36 @@ public class CompanyServiceImpl implements CompanyService {
public void examineConfig(ExamineConfigReqVo reqVo) {
/*更新公司表*/
CompanyVo companyVo = companyDao.load(reqVo.getCompanyId(), CompanyVo.class);
companyVo.setExamineStatus(reqVo.getExamineStatus());
companyVo.setExamineFailedReason(reqVo.getExamineFailedReason());
companyDao.update(companyVo);
if (StringHelper.isEmpty(companyVo)) {
throw new CodeException("99", "未找到公司信息");
}
/*更新公司扩展表*/
CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getCompanyId(), CompanyExtendVo.class);
if (null == companyExtendVo) {
if (StringHelper.isEmpty(companyExtendVo)) {
companyExtendVo = new CompanyExtendVo();
companyExtendVo.setId(reqVo.getCompanyId());
ObjectHelper.writeWithFromClass(companyExtendVo, reqVo);
companyExtendVo.setId(companyVo.getId());
companyExtendVo.setQrCode(DateHelper.getNow()
.replace("-", "")
.replace(":", "")
.replace(" ", ""));
companyExtendVo.setWithdrawMoney(reqVo.getWithdrawMoney());
companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
companyExtendDao.create(companyExtendVo);
} else {
companyExtendVo.setWithdrawMoney(reqVo.getWithdrawMoney());
companyExtendVo.setWithdrawRule(reqVo.getWithdrawRule());
companyExtendVo.setWithdrawFee(reqVo.getWithdrawFee());
companyExtendVo.setQrCodeType(reqVo.getQrCodeType());
ObjectHelper.writeWithFromClass(companyExtendVo, reqVo);
companyExtendDao.update(companyExtendVo);
}
companyVo.setExamineStatus(reqVo.getExamineStatus());
companyVo.setExamineFailedReason(reqVo.getExamineFailedReason());
companyDao.update(companyVo);
// 更新或新增公司规则表
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);
}
}
// 更新或新增提现规则表
saveCompanyRule(reqVo.getCompanyRuleVoList(), companyVo);
// 更新或新增邀请规则表
saveCompanyInvitationRule(reqVo.getCompanyInvitationActivatRuleVoList(), companyVo, 0);
// 更新或新增邀请规则表
saveCompanyInvitationRule(reqVo.getCompanyInvitationRewardRuleVoList(), companyVo, 1);
/*新增或更新pd_company_divide_rule表*/
CompanyDivideRuleVo companyDivideRuleVo = new CompanyDivideRuleVo();
......@@ -1138,6 +1162,68 @@ public class CompanyServiceImpl implements CompanyService {
userRoleDao.create(userRoleVo);
}
if (1 == reqVo.getActivationStatus() && 1 == reqVo.getExamineStatus()) {
// 公司激活状态 审核通过状态 公司邀请奖励
CompanyResVo companyResVo = new CompanyResVo();
ObjectHelper.writeWithFromClass(companyResVo, companyVo);
ObjectHelper.writeWithFromClass(companyResVo, companyExtendVo);
companyConsumer.companyReward(companyResVo);
}
}
public void saveCompanyRule(List<CompanyRuleVo> companyRuleVoList, CompanyVo companyVo) {
CompanyRuleVo delCompanyRuleVo = new CompanyRuleVo();
delCompanyRuleVo.setCompanyId(companyVo.getId());
companyRuleDao.remove(delCompanyRuleVo);
if (!StringHelper.isEmpty(companyRuleVoList) && companyRuleVoList.size() > 0) {
for (int i = 0; i < companyRuleVoList.size(); i++) {
CompanyRuleVo companyRuleVo = companyRuleVoList.get(i);
if (StringHelper.isEmpty(companyRuleVo.getCompanyRuleId())) {
companyRuleVo.setCompanyRuleId(StringHelper.getNewID());
}
CompanyRuleVo sqlCompanyRuleVo = companyRuleDao.load(companyRuleVo.getCompanyRuleId(), CompanyRuleVo.class);
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);
}
}
}
}
public void saveCompanyInvitationRule(List<CompanyInvitationRuleVo> companyInvitationRuleVoList, CompanyVo companyVo, int rewardRuleType) {
CompanyInvitationRuleVo delCompanyinvitationRuleVo = new CompanyInvitationRuleVo();
delCompanyinvitationRuleVo.setCompanyId(companyVo.getId());
delCompanyinvitationRuleVo.setRewardRuleType(rewardRuleType);
companyInvitationRuleDao.remove(delCompanyinvitationRuleVo);
if (!StringHelper.isEmpty(companyInvitationRuleVoList) && companyInvitationRuleVoList.size() > 0) {
for (int i = 0; i < companyInvitationRuleVoList.size(); i++) {
CompanyInvitationRuleVo companyInvitationRuleVo = companyInvitationRuleVoList.get(i);
if (StringHelper.isEmpty(companyInvitationRuleVo.getRewardRuleId())) {
companyInvitationRuleVo.setRewardRuleId(StringHelper.getNewID());
}
CompanyInvitationRuleVo sqlCompanyInvitationRuleVo = companyInvitationRuleDao.load(companyInvitationRuleVo.getRewardRuleId(), CompanyInvitationRuleVo.class);
if (StringHelper.isEmpty(sqlCompanyInvitationRuleVo)) {
sqlCompanyInvitationRuleVo = new CompanyInvitationRuleVo();
ObjectHelper.writeWithFromClass(sqlCompanyInvitationRuleVo, companyInvitationRuleVo);
sqlCompanyInvitationRuleVo.setCompanyId(companyVo.getId());
sqlCompanyInvitationRuleVo.setRewardRuleId(StringHelper.getNewID());
sqlCompanyInvitationRuleVo.setRewardRuleType(rewardRuleType);
sqlCompanyInvitationRuleVo.setCreateTime(DateHelper.getNow());
companyInvitationRuleDao.create(sqlCompanyInvitationRuleVo);
} else {
ObjectHelper.writeWithFromClass(sqlCompanyInvitationRuleVo, companyInvitationRuleVo);
companyInvitationRuleDao.update(sqlCompanyInvitationRuleVo);
}
}
}
}
......@@ -1292,13 +1378,127 @@ public class CompanyServiceImpl implements CompanyService {
}
public ResponseResult synCompanyInfo(CompanyReqVo req) {
req.setStatus(6);
List<CompanyResVo> companyResVoList = companyDao.loadList(req, CompanyResVo.class);
for (int i = 0; i < companyResVoList.size(); i++) {
CompanyResVo companyResVo = companyResVoList.get(i);
if (!StringHelper.isEmpty(companyResVo.getStatus()) && companyResVo.getStatus() >= 6) {
companyConsumer.synCompany(companyResVo);
}
}
return ResponseResult.result("同步完成");
}
@Override
public CompanyResVo findCompany(String invitationCode) {
CompanyReqVo req = new CompanyReqVo();
req.setInvitationCode(invitationCode);
CompanyResVo companyExtendVo = companyDao.findCompany(req);
return companyExtendVo;
}
/**
* 激活公司
*/
public void activiatCompany(CompanyResVo companyResVo) {
//查询改公司的总交易次数
int orderNumTotal = 0;
CompanyMoneyReqVo companyMoneyReqVo = new CompanyMoneyReqVo();
companyMoneyReqVo.setCompanyId(companyResVo.getId());
CompanyMoneyVo companyMoneyVo = companyMoneyDao.findReport(companyMoneyReqVo);
if (!StringHelper.isEmpty(companyMoneyVo)) {
orderNumTotal = companyMoneyVo.getInNumber();
}
// 查询公司激活规则
CompanyInvitationRuleVo companyInvitationRuleReqVo = new CompanyInvitationRuleVo();
companyInvitationRuleReqVo.setCompanyId(companyResVo.getId());
companyInvitationRuleReqVo.setRewardRuleType(0);
List<CompanyInvitationRuleVo> companyInvitationRuleVoList = companyInvitationRuleDao.loadList(companyInvitationRuleReqVo, CompanyInvitationRuleVo.class);
for (int i = 0; i < companyInvitationRuleVoList.size(); i++) {
CompanyInvitationRuleVo companyInvitationRuleVo = companyInvitationRuleVoList.get(i);
if(!StringHelper.isEmpty(companyInvitationRuleVo.getEndDate()) && !StringHelper.isEmpty(companyInvitationRuleVo.getStartDate())){
if (DateHelper.compare(DateHelper.getDateTime(DateHelper.getToday(DateHelper.getCurDate())),
DateHelper.getDateTime(companyInvitationRuleVo.getEndDate().substring(0, 10))) >= 0 &&
DateHelper.compare(DateHelper.getDateTime(DateHelper.getToday(DateHelper.getCurDate())),
DateHelper.getDateTime(companyInvitationRuleVo.getEndDate().substring(0, 10))) <= 0) {
// 当前时间和开始时间和结束时间进行对比
if (orderNumTotal >= companyInvitationRuleVo.getOrderNum()) {
System.out.println("==============用户激活==============");
// 可激活公司
CompanyExtendVo companyExtendVo = new CompanyExtendVo();
ObjectHelper.writeWithFromClass(companyExtendVo, companyResVo);
companyExtendVo.setActivationStatus(1);
companyExtendDao.update(companyExtendVo);
}
}
}else{
if (orderNumTotal >= companyInvitationRuleVo.getOrderNum()) {
// 可激活公司
System.out.println("==============用户激活==============");
CompanyExtendVo companyExtendVo = new CompanyExtendVo();
ObjectHelper.writeWithFromClass(companyExtendVo, companyResVo);
companyExtendVo.setActivationStatus(1);
companyExtendDao.update(companyExtendVo);
}
}
}
}
/**
* 邀请人的奖励
*/
public void companyReward(CompanyResVo companyResVo) {
// 查询邀请公司是否已获取了该公司的激活奖励了
CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo();
capitalFlowReqVo.setCompanyId(companyResVo.getInvitationCompanyId());
capitalFlowReqVo.setOrderId(companyResVo.getId());
capitalFlowReqVo.setCategory(7);
capitalFlowReqVo.setStatus(1);
CapitalFlowResVo capitalFlowResVo = capitalFlowDao.load(capitalFlowReqVo, CapitalFlowResVo.class);
if (StringHelper.isEmpty(capitalFlowResVo)) {
// 未获取到该公司的激活奖励 查询邀请公司的激活规则
CompanyInvitationRuleVo companyInvitationRuleReqVo = new CompanyInvitationRuleVo();
companyInvitationRuleReqVo.setCompanyId(companyResVo.getInvitationCompanyId());
companyInvitationRuleReqVo.setRewardRuleType(1);
List<CompanyInvitationRuleVo> companyInvitationRuleVoList = companyInvitationRuleDao.loadList(companyInvitationRuleReqVo, CompanyInvitationRuleVo.class);
for (int i = 0; i < companyInvitationRuleVoList.size(); i++) {
CompanyInvitationRuleVo companyInvitationRuleVo = companyInvitationRuleVoList.get(i);
if (3 == companyInvitationRuleVo.getRewardType()) {
// 对象激活时奖励
System.out.println("==============对象激活时奖励==============");
dd(companyResVo, companyInvitationRuleVo);
}
if (4 == companyInvitationRuleVo.getRewardType()) {
// 对象激活后交易多少笔后奖励 查询该公司的总交易次数
int orderNumTotal = 0;
CompanyMoneyReqVo companyMoneyReqVo = new CompanyMoneyReqVo();
companyMoneyReqVo.setCompanyId(companyResVo.getId());
CompanyMoneyVo companyMoneyVo = companyMoneyDao.findReport(companyMoneyReqVo);
if (!StringHelper.isEmpty(companyMoneyVo)) {
orderNumTotal = companyMoneyVo.getInNumber();
if (orderNumTotal >= companyInvitationRuleVo.getOrderNum()) {
// 邀请公司可获取奖励
System.out.println("==============邀请公司可获取奖励==============");
dd(companyResVo, companyInvitationRuleVo);
}
}
}
}
}
}
public void dd(CompanyResVo companyResVo, CompanyInvitationRuleVo companyInvitationRuleVo) {
CapitalFlowReqVo capitalFlowVo = new CapitalFlowReqVo();
capitalFlowVo.setId(StringHelper.getNewID());
capitalFlowVo.setCompanyId(companyResVo.getInvitationCompanyId());
capitalFlowVo.setCompanyName(companyResVo.getInvitationCompanyName());
capitalFlowVo.setTime(DateHelper.getNow());
capitalFlowVo.setOrderId(companyResVo.getId());
capitalFlowVo.setCategory(7);
capitalFlowVo.setOrderMoney(companyInvitationRuleVo.getRewardMoney());
capitalFlowVo.setOrderFee(0d);
capitalFlowVo.setActualMoney(companyInvitationRuleVo.getRewardMoney());
financeService.divideSettlement(capitalFlowVo);
}
}
src/main/java/com/pangding/web/authority/service/impl/FinanceServiceImpl.java
View file @ ec99e28b
......@@ -16,6 +16,8 @@ import com.pangding.web.vo.order.tl.CashWithdrawalReqVo;
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.CompanyMoneyVo;
import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
import com.pangding.web.vo.system.req.company.CompanyRuleReqVo;
import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.util.base.ObjectHelper;
......@@ -45,12 +47,13 @@ public class FinanceServiceImpl implements FinanceService {
private CapitalFlowDao capitalFlowDao;
@Autowired
private CompanyMoneyDao companyMoneyDao;
@Autowired
private CompanyBankCardDao companyBankCardDao;
@Autowired
private CompanyRuleDao companyRuleDao;
@Autowired
private CompanyConsumer companyConsumer;
@Autowired
private CompanyBankCardDao companyBankCardDaoImpl;
@Override
public WithdrawalResVo withdrawal(WithdrawalReqVo reqVo) {
......@@ -66,7 +69,7 @@ public class FinanceServiceImpl implements FinanceService {
resVo.setWithdrawTotalCash(extendVo.getWithdrawTotalCash());
resVo.setCompanyExtend(extendVo);
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(reqVo, CompanyBankCardVo.class);
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(reqVo, CompanyBankCardVo.class);
if (null == companyBankCardVoList || companyBankCardVoList.isEmpty()) {
throw new CodeException("该公司暂无银行卡信息，请添加");
}
......@@ -98,7 +101,6 @@ public class FinanceServiceImpl implements FinanceService {
return capitalFlowListResVo;
}
/**
* 申请提现
*
......@@ -109,12 +111,40 @@ public class FinanceServiceImpl implements FinanceService {
public ResponseResult<CapitalFlowReqVo> applyWithdrawal(CapitalFlowReqVo req) {
// 查找公司信息，提现信息
CompanyResVo companyResVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);
CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(req.getBankId(), CompanyBankCardVo.class);
if (!StringHelper.isEmpty(companyResVo) && !StringHelper.isEmpty(companyBankCardVo)) {
// 查询银行卡信息
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(req.getBankId(), CompanyBankCardVo.class);
if (StringHelper.isEmpty(companyResVo) || StringHelper.isEmpty(companyBankCardVo)) {
throw new CodeException("未找到公司信息");
}
// 提现手续费
double withdrawFee = companyResVo.getWithdrawFee();
// 可提现余额
double withdrawTotalCash = companyResVo.getWithdrawTotalCash();
if (withdrawTotalCash < req.getOrderMoney()) {
throw new CodeException("提现金额大于可提现余额");
throw new CodeException("提现金额不能大于可提现余额");
}
if (companyResVo.getMinWithdrawMoney() > req.getOrderMoney() || companyResVo.getMaxWithdrawMoney() < req.getOrderMoney()) {
throw new CodeException("提现金额必须在范围内");
}
// 该公司有优惠
if (1 == companyResVo.getDiscountRule()) {
// 查询公司提现规则信息
CompanyRuleReqVo companyRuleReqVo = new CompanyRuleReqVo();
companyRuleReqVo.setCompanyId(companyResVo.getId());
List<CompanyRuleVo> companyRuleVoList = companyRuleDao.loadList(companyRuleReqVo, CompanyRuleVo.class);
for (int i = 0; i < companyRuleVoList.size(); i++) {
CompanyRuleVo companyRuleVo = companyRuleVoList.get(i);
int dateType = companyRuleVo.getDateType();
int minNum = companyRuleVo.getMinNum();
int maxNum = companyRuleVo.getMaxNum();
// 获取提现笔数
int withdrawNum = findWithdrawNum(companyResVo.getId(), dateType);
// 判断总提现笔数在哪个优惠区间
if (minNum <= withdrawNum && withdrawNum <= maxNum) {
withdrawFee = companyRuleVo.getWithdrawFee();
break;
}
}
}
CapitalFlowVo capitalFlowVo = new CapitalFlowVo();
ObjectHelper.writeWithFrom(capitalFlowVo, req);
......@@ -133,9 +163,40 @@ public class FinanceServiceImpl implements FinanceService {
ResponseResult<CapitalFlowReqVo> responseResult = new ResponseResult<>();
responseResult.setData(req);
return responseResult;
} else {
throw new CodeException("未找到公司信息");
}
public int findWithdrawNum(String companyId, int dateType) {
CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo();
capitalFlowReqVo.setCompanyId(companyId);
capitalFlowReqVo.setStatus(1);
capitalFlowReqVo.setCategory(1);
// 判断优惠按什么维度优惠
switch (dateType) {
case 0:
// 按天
capitalFlowReqVo.setStartDate(DateHelper.getDateTimeString(DateHelper.getDayStart(DateHelper.getCurDate())));
capitalFlowReqVo.setEndDate(DateHelper.getDateTimeString(DateHelper.getDayEnd(DateHelper.getCurDate())));
break;
case 1:
// 按月
capitalFlowReqVo.setStartDate(DateHelper.getDateTimeString(DateHelper.getMonthStart(DateHelper.getCurDate())));
capitalFlowReqVo.setEndDate(DateHelper.getDateTimeString(DateHelper.getMonthEnd(DateHelper.getCurDate())));
break;
case 2:
// 按年
capitalFlowReqVo.setStartDate(DateHelper.getDateTimeString(DateHelper.getYearStart(DateHelper.getCurDate())));
capitalFlowReqVo.setEndDate(DateHelper.getDateTimeString(DateHelper.getYearEnd(DateHelper.getCurDate())));
break;
default:
break;
}
CapitalFlowResVo capitalFlowResVo = capitalFlowDao.findCapitalFlowTotal(capitalFlowReqVo);
int withdrawNum = 0;
if (!StringHelper.isEmpty(capitalFlowResVo)) {
withdrawNum = capitalFlowResVo.getNum();
}
return withdrawNum;
}
/**
......@@ -156,7 +217,7 @@ public class FinanceServiceImpl implements FinanceService {
// 修改公司金额
UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
updateCompanyMoneyReqVo.setNewWithdrawTotalCash( -capitalFlowVo.getOrderMoney());
updateCompanyMoneyReqVo.setNewWithdrawTotalCash(-capitalFlowVo.getOrderMoney());
companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
CompanyResVo companyResVo = companyDao.load(capitalFlowVo.getCompanyId(), CompanyResVo.class);
......@@ -175,6 +236,55 @@ public class FinanceServiceImpl implements FinanceService {
return ResponseResult.result("");
}
/**
* 转账
*
* @param req
*/
public void divideSettlement(CapitalFlowReqVo req) {
CashWithdrawalReqVo cashWithdrawalReqVo = new CashWithdrawalReqVo();
ObjectHelper.writeWithFromClass(cashWithdrawalReqVo, req);
capitalFlowDao.create(req);
companyConsumer.divideSettlement(cashWithdrawalReqVo);
}
/**
* 提现回调
*
* @param req
*/
@Transactional
@Override
public ResponseResult<String> divideSettlementBack(CashWithdrawalBackReqVo req) {
CapitalFlowVo capitalFlowVo = capitalFlowDao.load(req.getId(), CapitalFlowVo.class);
if (!StringHelper.isEmpty(capitalFlowVo)) {
capitalFlowVo.setStatus(req.getStatus());
capitalFlowVo.setErrorMessage(req.getErrorMessage());
capitalFlowVo.setTonglianId(req.getTonglianId());
capitalFlowVo.setTime(DateHelper.getNow());
if (1 == req.getStatus()) {
// 修改公司金额
UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
updateCompanyMoneyReqVo.setNewWithdrawTotalCash(capitalFlowVo.getActualMoney());
companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
CompanyResVo companyResVo = companyDao.load(capitalFlowVo.getCompanyId(), CompanyResVo.class);
if (!StringHelper.isEmpty(companyResVo)) {
double oldMoney = companyResVo.getWithdrawTotalCash() + capitalFlowVo.getActualMoney();
double newMoney = oldMoney + capitalFlowVo.getActualMoney();
capitalFlowVo.setInitMoney(oldMoney);
capitalFlowVo.setFinalMoney(newMoney);
saveCompanyMoney(capitalFlowVo, companyResVo, oldMoney);
}
}
capitalFlowDao.update(capitalFlowVo);
} else {
throw new CodeException("订单信息错误。");
}
return ResponseResult.result("");
}
@Transactional
@Override
public ResponseResult<String> saveCapitalFlow(CapitalFlowReqVo req) {
......@@ -222,14 +332,14 @@ public class FinanceServiceImpl implements FinanceService {
}
@Override
public void updateCompanyMoney(UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo){
public void updateCompanyMoney(UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo) {
companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
}
public void saveCompanyMoney(CapitalFlowVo capitalFlowVo, CompanyResVo companyVo, double initMoney){
public void saveCompanyMoney(CapitalFlowVo capitalFlowVo, CompanyResVo companyVo, double initMoney) {
//修改公司余额
double oldMoney = initMoney ;
double oldMoney = initMoney;
double inMoney = 0d, outMoney = 0d, refundMoney = 0d;
int inNumber = 0, outNumber = 0, refundNumber = 0;
if (CompanyConstant.CATEGORY_ENTRY == capitalFlowVo.getCategory()
......@@ -270,17 +380,24 @@ public class FinanceServiceImpl implements FinanceService {
companyMoneyVo.setRefundNumber(refundNumber);
companyMoneyDao.create(companyMoneyVo);
} else {
companyMoneyVo.setInMoney(inMoney );
companyMoneyVo.setOutMoney(outMoney );
companyMoneyVo.setInMoney(inMoney);
companyMoneyVo.setOutMoney(outMoney);
companyMoneyVo.setRefundMoney(refundMoney);
companyMoneyVo.setInNumber(inNumber );
companyMoneyVo.setOutNumber(outNumber );
companyMoneyVo.setInNumber(inNumber);
companyMoneyVo.setOutNumber(outNumber);
companyMoneyVo.setRefundNumber(refundNumber);
companyMoneyDao.updateCompanyMoney(companyMoneyVo);
}
if (0 == companyVo.getActivationStatus() && 1 == companyVo.getExamineStatus()) {
// 公司未激活 激活公司
companyConsumer.cmpanyActiviat(companyVo);
}
if (1 == companyVo.getActivationStatus() && 1 == companyVo.getExamineStatus()) {
// 公司激活状态 审核通过状态 公司邀请奖励
companyConsumer.companyReward(companyVo);
}
}
}
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ ec99e28b
......@@ -20,6 +20,7 @@ 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.CompanyVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.token.TokenHelper;
import com.yanzuoguang.util.base.ObjectHelper;
......@@ -48,31 +49,34 @@ import java.util.*;
public class RegisterServiceImpl implements RegisterService {
@Autowired
CompanyDao companyDaoImpl;
CompanyDao companyDao;
@Autowired
UserDao userDaoImpl;
UserDao userDao;
@Autowired
UserService userServiceImpl;
UserService userService;
@Autowired
CompanyExtendDao companyExtendDaoImpl;
CompanyExtendDao companyExtendDao;
@Autowired
CompanyBankCardDao companyBankCardDaoImpl;
CompanyBankCardDao companyBankCardDao;
@Autowired
UserRoleDao userRoleDaoImpl;
UserRoleDao userRoleDao;
@Autowired
private StoreFeign storeFeign;
VerifyCodeService verifyCodeService;
@Autowired
VerifyCodeService verifyCodeServiceImpl;
RoleAuthorityDao roleAuthorityDao;
@Autowired
RoleAuthorityDao roleAuthorityDaoImpl;
AuthorityDao authorityDao;
@Autowired
AuthorityDao authorityDaoImpl;
AuthorityService authorityService;
@Autowired
AuthorityService authorityServiceImpl;
private PayFeign payFeign;
@Autowired
PayFeign payFeign;
private StoreFeign storeFeign;
@Autowired
private TokenService tokenService;
@Autowired
private CompanyService companyService;
/**
* 判断注册编码是否存在
......@@ -84,7 +88,7 @@ public class RegisterServiceImpl implements RegisterService {
public CompanyExtendVo checkInvitationCode(String invitationCode) {
CompanyExtendGetReqVo reqVo = new CompanyExtendGetReqVo();
reqVo.setInvitationCode(invitationCode);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo, CompanyExtendVo.class);
CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo, CompanyExtendVo.class);
return companyExtendVo;
}
......@@ -99,12 +103,12 @@ public class RegisterServiceImpl implements RegisterService {
public CompanyVo saveUser(RegisterUserReqVo registerUserReqVo) throws Exception {
// 检查账户是否合法
userServiceImpl.isValid(registerUserReqVo.getAccount());
userService.isValid(registerUserReqVo.getAccount());
UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setAccount(registerUserReqVo.getAccount());
// 检查用户名是否存在
UserVo userVoCheck = userDaoImpl.load(userGetReqVo, UserVo.class);
UserVo userVoCheck = userDao.load(userGetReqVo, UserVo.class);
if (null != userVoCheck) {
throw new CodeException("用户名" + registerUserReqVo.getAccount() + "已存在");
}
......@@ -116,11 +120,23 @@ public class RegisterServiceImpl implements RegisterService {
if (!StringHelper.compare(password, confirmPassword)) {
throw new CodeException("确认密码错误");
}
CompanyExtendVo companyExtendVo = checkInvitationCode(registerUserReqVo.getInvitationCode());
if (null == companyExtendVo) {
CompanyResVo companyExtendVo = companyService.findCompany(registerUserReqVo.getInvitationCode());
if (StringHelper.isEmpty(companyExtendVo)) {
throw new CodeException("注册编码错误");
}
// 判断邀请公司状态
if(0 == companyExtendVo.getInvitationStatus() || 1 != companyExtendVo.getExamineStatus()){
throw new CodeException("用户邀请状态错误：" + companyExtendVo.getInvitationStatus() + ",状态错误：" + companyExtendVo.getExamineStatus());
}
// 判断该账户已经邀请的人数
if(companyExtendVo.getInviteesPeople() <= companyExtendVo.getInvitedPeople()){
throw new CodeException("邀请人数已超过可邀请人数，注册失败。可邀请人数为：" + companyExtendVo.getInviteesPeople());
}
// 添加用户邀请人数
UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
updateCompanyMoneyReqVo.setCompanyId(companyExtendVo.getId());
updateCompanyMoneyReqVo.setInvitedPeople(1);
companyExtendDao.updateCompanyInvitedPeople(updateCompanyMoneyReqVo);
/*保存用户*/
UserVo userVo = new UserVo();
......@@ -131,16 +147,18 @@ public class RegisterServiceImpl implements RegisterService {
userVo.setRemark(password);
userVo.setCompanyId(companyId);
userVo.setIsFirst(1);
userDaoImpl.create(userVo);
userVo.setCreateTime(DateHelper.getNow());
userDao.create(userVo);
/*保存公司*/
CompanyVo companyVo = new CompanyVo();
companyVo.setId(companyId);
companyVo.setInvitationCompanyId(companyExtendVo.getId());
companyVo.setInvitationCompanyName(companyExtendVo.getCompanyName());
companyVo.setCompanyType(registerUserReqVo.getCompanyType());
companyVo.setExamineStatus(0);
companyVo.setStatus(0);
companyDaoImpl.create(companyVo);
companyDao.create(companyVo);
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
......@@ -150,7 +168,7 @@ public class RegisterServiceImpl implements RegisterService {
.replace(":", "")
.replace(" ", "");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.create(extendVo);
companyExtendDao.create(extendVo);
return companyVo;
}
......@@ -173,7 +191,7 @@ public class RegisterServiceImpl implements RegisterService {
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getId());
CompanyVo company = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
CompanyVo company = companyDao.load(companyGetReqVo, CompanyVo.class);
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, reqVo);
companySaveReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
......@@ -190,15 +208,15 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyDaoImpl.update(companyVo);
companyDao.update(companyVo);
/*跟新用户表添加联系方式*/
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userReqVo, UserVo.class);
UserVo userVo = userDao.load(userReqVo, UserVo.class);
userVo.setPhone(reqVo.getContactPhone());
userVo.setName(reqVo.getContactName());
userDaoImpl.update(userVo);
userDao.update(userVo);
/*保存或更新商户表*/
MerchantCreateReqVo req = new MerchantCreateReqVo();
......@@ -243,7 +261,7 @@ public class RegisterServiceImpl implements RegisterService {
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
// 找到公司信息
CompanyVo company = companyDaoImpl.load(reqVo.getId(), CompanyVo.class);
CompanyVo company = companyDao.load(reqVo.getId(), CompanyVo.class);
// 初始化通联参数
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
......@@ -267,7 +285,7 @@ public class RegisterServiceImpl implements RegisterService {
companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo.setExamineStatus(0);
companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
companyDaoImpl.update(companyVo);
companyDao.update(companyVo);
List<CompanyBankReqVo1> bankList = resCompanySaveReqVo.getBankList();
if (null == bankList || bankList.isEmpty()) {
......@@ -286,12 +304,12 @@ public class RegisterServiceImpl implements RegisterService {
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setCompanyId(reqVo.getId());
companyBankCardGetReqVo.setBankCardCode(companyBankCardVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo1 = companyBankCardDao.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
if (null == companyBankCardVo1) {
companyBankCardDaoImpl.create(companyBankCardVo);
companyBankCardDao.create(companyBankCardVo);
} else {
companyBankCardVo.setId(companyBankCardVo1.getId());
companyBankCardDaoImpl.update(companyBankCardVo);
companyBankCardDao.update(companyBankCardVo);
}
......@@ -303,7 +321,7 @@ public class RegisterServiceImpl implements RegisterService {
.replace(":", "")
.replace(" ", "");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.save(extendVo);
companyExtendDao.save(extendVo);
SaveCompanyResVo resVo = new SaveCompanyResVo();
......@@ -312,10 +330,10 @@ public class RegisterServiceImpl implements RegisterService {
/*更新用户信息，保存联系方式*/
UserVo userReqVo = new UserVo();
userReqVo.setCompanyId(reqVo.getId());
UserVo userVo = userDaoImpl.load(userReqVo, UserVo.class);
UserVo userVo = userDao.load(userReqVo, UserVo.class);
userVo.setPhone(reqVo.getContactPhone());
userVo.setName(reqVo.getContactName());
userDaoImpl.update(userVo);
userDao.update(userVo);
/*保存或更新商户表*/
MerchantCreateReqVo req = new MerchantCreateReqVo();
......@@ -362,10 +380,10 @@ public class RegisterServiceImpl implements RegisterService {
public LoginResVo login(LoginReqVo reqVo) throws Exception {
String accountOrPhone = reqVo.getAccountOrPhone();
UserVo userVo;
if (userServiceImpl.isNumeric(accountOrPhone)) {
userVo = userServiceImpl.getUserByPhone(accountOrPhone);
if (userService.isNumeric(accountOrPhone)) {
userVo = userService.getUserByPhone(accountOrPhone);
} else {
userVo = userServiceImpl.getUserByAccount(accountOrPhone);
userVo = userService.getUserByAccount(accountOrPhone);
}
if (userVo == null) {
throw new CodeException("用户名不存在");
......@@ -399,7 +417,7 @@ public class RegisterServiceImpl implements RegisterService {
throw new CodeException("用户信息有误，请联系管理员");
}
// 找到登录用户公司信息
CompanyResVo companyVo = companyDaoImpl.load(userVo.getCompanyId(), CompanyResVo.class);
CompanyResVo companyVo = companyDao.load(userVo.getCompanyId(), CompanyResVo.class);
if (StringHelper.isEmpty(companyVo)) {
throw new CodeException("注册信息有误");
}
......@@ -410,9 +428,9 @@ public class RegisterServiceImpl implements RegisterService {
// 找到公司银行信息
CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
getReqVo.setCompanyId(companyVo.getId());
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo, CompanyBankCardVo.class);
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDao.loadList(getReqVo, CompanyBankCardVo.class);
getReqVo.setIsDefault(1);
CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(getReqVo, CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo, CompanyBankCardVo.class);
loginCompanyResVo.setCompanyBankCardVo(companyBankCardVo);
resVo.setCompanyResVo(loginCompanyResVo);
......@@ -432,7 +450,7 @@ public class RegisterServiceImpl implements RegisterService {
/*获取用户权限列表*/
RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
roleAuthorityGetReqVo.setUserId(userVo.getId());
List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
// 判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面
......@@ -483,7 +501,7 @@ public class RegisterServiceImpl implements RegisterService {
for (int i = 0; i < authorityIds.size(); i++) {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityIds.get(i));
AuthorityVo authorityVo1 = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
AuthorityVo authorityVo1 = authorityDao.load(authorityGetReqVo, AuthorityVo.class);
if (!StringHelper.isEmpty(authorityVo1)) {
if (authorityVo1.getPid().equals(authorityVo.getId())) {
List<String> authorityIdList = new ArrayList<>();
......@@ -507,7 +525,7 @@ public class RegisterServiceImpl implements RegisterService {
@Override
public LoginResVo verifyLogin(ComputerLoginReqVo reqVo, HttpSession session, HttpServletRequest request) throws Exception {
verifyCodeServiceImpl.validImage(reqVo.getVerifyCode(), session, request);
verifyCodeService.validImage(reqVo.getVerifyCode(), session, request);
LoginReqVo reqVo1 = new LoginReqVo();
ObjectHelper.writeWithFrom(reqVo1, reqVo);
return this.login(reqVo1);
......@@ -523,7 +541,7 @@ public class RegisterServiceImpl implements RegisterService {
public String individualSubmit(IndividualSubmitReqVo reqVo) {
CompanyGetReqVo getReqVo = new CompanyGetReqVo();
getReqVo.setId(reqVo.getId());
CompanyVo companyVo = companyDaoImpl.load(getReqVo, CompanyVo.class);
CompanyVo companyVo = companyDao.load(getReqVo, CompanyVo.class);
/*此处应该将companyVo和verifyCode发送到第三方接口，返回的数据用于更新公司信息*/
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, companyVo);
......@@ -541,7 +559,7 @@ public class RegisterServiceImpl implements RegisterService {
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
companyVo1.setExamineStatus(0);
companyDaoImpl.update(companyVo1);
companyDao.update(companyVo1);
return reqVo.getVerifyCode();
}
......@@ -553,7 +571,7 @@ public class RegisterServiceImpl implements RegisterService {
*/
@Override
public String enterpriceSubmit(EnterpriceSubmitReqVo reqVo) {
CompanyVo companyVo = companyDaoImpl.load(reqVo.getId(), CompanyVo.class);
CompanyVo companyVo = companyDao.load(reqVo.getId(), CompanyVo.class);
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
CompanySaveReqVo companySaveReqVo = new CompanySaveReqVo();
ObjectHelper.writeWithFrom(companySaveReqVo, companyVo);
......@@ -568,7 +586,7 @@ public class RegisterServiceImpl implements RegisterService {
companyBankReqVo1.setPhone(reqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setBankCardCode(reqVo.getBankCardCode());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo1 = companyBankCardDao.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
companyBankReqVo1.setStatus(companyBankCardVo1.getStatus());
companyBankReqVo1.setId(StringHelper.getNewID());
companyBankReqVo1.setValidateCode(reqVo.getVerifyCode());
......@@ -587,7 +605,7 @@ public class RegisterServiceImpl implements RegisterService {
companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
companyVo1.setExamineStatus(0);
companyVo1.setCompanyAttribute(companyVo.getCompanyAttribute());
companyDaoImpl.update(companyVo1);
companyDao.update(companyVo1);
List<CompanyBankReqVo1> bankList = resCompanySaveReqVo.getBankList();
if (null == bankList || bankList.isEmpty()) {
......@@ -613,12 +631,12 @@ public class RegisterServiceImpl implements RegisterService {
CompanyBankCardGetReqVo companyBankCardGetReqVo1 = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo1.setCompanyId(companyBankCardVo.getCompanyId());
companyBankCardGetReqVo1.setBankCardCode(bankList.get(0).getBankCardCode());
CompanyBankCardVo companyBankCardVo2 = companyBankCardDaoImpl.load(companyBankCardGetReqVo1, CompanyBankCardVo.class);
CompanyBankCardVo companyBankCardVo2 = companyBankCardDao.load(companyBankCardGetReqVo1, CompanyBankCardVo.class);
if (null == companyBankCardVo2) {
companyBankCardDaoImpl.create(companyBankCardVo);
companyBankCardDao.create(companyBankCardVo);
} else {
companyBankCardVo.setId(companyBankCardVo2.getId());
companyBankCardDaoImpl.update(companyBankCardVo);
companyBankCardDao.update(companyBankCardVo);
}
return reqVo.getVerifyCode();
}
......@@ -635,7 +653,7 @@ public class RegisterServiceImpl implements RegisterService {
public void businesslicenseCode(BusinessLicenseCodeReqVo reqVo) {
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(reqVo.getCompanyId());
CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
CompanyVo companyVo = companyDao.load(companyGetReqVo, CompanyVo.class);
if (null == companyVo) {
throw new CodeException("未查询到该公司信息，请稍后重试");
}
......@@ -665,7 +683,7 @@ public class RegisterServiceImpl implements RegisterService {
// saveCompanyReqVo.setPicType(reqVo.getPicType());
// ResponseResult<Boolean> responseResult = payFeign.idcardCollect(saveCompanyReqVo);
// if(responseResult.getData()){
companyDaoImpl.update(companyVo);
companyDao.update(companyVo);
// }else{
// throw new CodeException("图片上传失败");
// }
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ ec99e28b
package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.*;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.util.RsaConstant;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.service.UserService;
......@@ -19,8 +20,10 @@ import com.pangding.web.vo.system.req.authority.AuthorityReqVo;
import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
import com.pangding.web.vo.system.req.authority.UserReqVo;
import com.pangding.web.vo.system.req.company.CompanyExtendReqVo;
import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
import com.pangding.web.vo.system.res.authority.AuthorityResVo;
import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
......@@ -54,6 +57,8 @@ public class UserServiceImpl implements UserService {
private CompanyDao companyDao;
@Autowired
private CompanyExtendDao companyExtendDao;
@Autowired
private CompanyService companyService;
@Override
@Transactional(rollbackFor = Exception.class)
......@@ -361,14 +366,25 @@ public class UserServiceImpl implements UserService {
}
// 验证邀请码是否正确
CompanyExtendReqVo companyReqVo = new CompanyExtendReqVo();
companyReqVo.setInvitationCode(saveUserReqVo.getInvitationCode());
CompanyExtendResVo companyResVo = companyExtendDao.load(companyReqVo, CompanyExtendResVo.class);
CompanyResVo companyResVo = companyService.findCompany(saveUserReqVo.getInvitationCode());
if (StringHelper.isEmpty(companyResVo)) {
// 邀请码不正确
return ResponseResult.error("99", "邀请码错误");
return ResponseResult.error("99", "注册编码错误");
}
// 判断邀请公司状态
if(0 == companyResVo.getInvitationStatus() || 1 != companyResVo.getExamineStatus()){
return ResponseResult.error("99", "用户邀请状态错误：" + companyResVo.getInvitationStatus() + ",状态错误：" + companyResVo.getExamineStatus());
}
// 判断该账户已经邀请的人数
if(companyResVo.getInviteesPeople() <= companyResVo.getInvitedPeople()){
throw new CodeException("邀请人数已超过可邀请人数，注册失败。可邀请人数为：" + companyResVo.getInviteesPeople());
}
// TODO 是否需要判断商户的状态
// 添加用户邀请人数
UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
updateCompanyMoneyReqVo.setCompanyId(companyResVo.getId());
updateCompanyMoneyReqVo.setInvitedPeople(1);
companyExtendDao.updateCompanyInvitedPeople(updateCompanyMoneyReqVo);
String companyId = StringHelper.getNewID();
String userId = StringHelper.getNewID();
......@@ -390,6 +406,7 @@ public class UserServiceImpl implements UserService {
CompanyVo companyVo = new CompanyVo();
companyVo.setId(companyId);
companyVo.setInvitationCompanyId(companyResVo.getId());
companyVo.setInvitationCompanyName(companyResVo.getCompanyName());
companyVo.setStatus(CompanyConstant.COMPANY_STATUS_INIT);
companyVo.setNature(saveUserReqVo.getCompanyType());
if(3 == companyVo.getNature()){
......
src/main/java/com/pangding/web/authority/vo/reqvo/CompanySaveReqVo.java
View file @ ec99e28b
......@@ -22,6 +22,8 @@ public class CompanySaveReqVo {
*/
private String invitationCompanyId;
private String invitationCompanyName;
/**
* 通联会员id
*/
......@@ -282,4 +284,12 @@ public class CompanySaveReqVo {
public void setValidateCode(String validateCode) {
this.validateCode = validateCode;
}
public String getInvitationCompanyName() {
return invitationCompanyName;
}
public void setInvitationCompanyName(String invitationCompanyName) {
this.invitationCompanyName = invitationCompanyName;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/ExamineConfigReqVo.java
View file @ ec99e28b
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.vo.system.pd.company.CompanyInvitationRuleVo;
import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
......@@ -12,126 +14,155 @@ public class ExamineConfigReqVo {
/**
* 公司id
*/
@ApiModelProperty(notes = "公司id")
private String companyId;
/**
* 入口比例
*/
@ApiModelProperty(notes = "入口比例")
private Double sourceValue;
/**
* 实际入口比例
*/
@ApiModelProperty(notes = "实际入口比例")
private Double realSourceValue;
/**
* 入口比例说明
*/
@ApiModelProperty(notes = "入口比例说明")
private String sourceExplain;
/**
* 过境比例
*/
@ApiModelProperty(notes = "过境比例")
private Double passValue;
/**
* 实际过境比例
*/
@ApiModelProperty(notes = "实际过境比例")
private Double realPassValue;
/**
* 过境比例说明
*/
@ApiModelProperty(notes = "过境比例说明")
private String passExplain;
/**
* 上级比例
*/
@ApiModelProperty(notes = "上级比例")
private Double superValue;
/**
* 实际上级比例
*/
@ApiModelProperty(notes = "实际上级比例")
private Double realSuperValue;
/**
* 上级比例说明
*/
@ApiModelProperty(notes = "上级比例说明")
private String superExplain;
/**
* 限额
*/
private Double withdrawMoney;
@ApiModelProperty(notes = "手续费")
private Double fee;
@ApiModelProperty(notes = "税费")
private Double taxFee;
/**
* 提现规则(0自动 ,1手动)
*/
@ApiModelProperty(notes = "是否分账")
private Integer subledgerStatus;
@ApiModelProperty(notes = "分账规则 0 核销分账，1 购买分账，2过期自动分账")
private Integer subledgerRule;
@ApiModelProperty(notes = "核销时间 多少时间核销")
private Integer subledgerRuleTime;
@ApiModelProperty(notes = "是否分润 0不能分，1能分")
private Integer divideStatus;
@ApiModelProperty(notes = "是否能扫码支付")
private Integer scanCodePayStatus;
@ApiModelProperty(notes = "是否邀请(0不能邀请，1能邀请)")
private Integer invitationStatus;
@ApiModelProperty(notes = "邀请码")
private String invitationCode;
@ApiModelProperty(notes = "可邀请人数")
private Integer inviteesPeople;
@ApiModelProperty(notes = "激活状态 0 未激活 1激活 2 停用")
private Integer activationStatus;
@ApiModelProperty(notes = "提现规则 (0自动 ,1手动)")
private Integer withdrawRule;
/**
* 提现手续费
*/
@ApiModelProperty(notes = "最小限额")
private Double minWithdrawMoney;
@ApiModelProperty(notes = "最大限额")
private Double maxWithdrawMoney;
@ApiModelProperty(notes = "是否有优惠 0 无 1有")
private Integer discountRule;
@ApiModelProperty(notes = "提现手续费")
private Double withdrawFee;
@ApiModelProperty(notes = "提现到账方式")
private String withdrawType;
@ApiModelProperty(notes = "用户星级")
private Integer grade;
@ApiModelProperty(notes = "服务费状态")
private Integer serviceChargeStatus;
@ApiModelProperty(notes = "服务费类型")
private Integer serviceChargeType;
@ApiModelProperty(notes = "服务费")
private Double serviceCharge;
/**
* 二维码类型(0:关注;1:付款;2:源码)
*/
@ApiModelProperty(notes = "二维码类型(0:关注;1:付款;2:源码)")
private Integer qrCodeType;
/**
* 0:未审核;1:审核通过,2审核不通过,3停用
*/
@ApiModelProperty(notes = "0:未审核;1:审核通过,2审核不通过,3停用")
private Integer examineStatus;
/**
* 审核失败原因
*/
@ApiModelProperty(notes = "审核失败原因")
private String examineFailedReason;
/**
* 给该用户分配的角色id
*/
@ApiModelProperty(notes = "给该用户分配的角色id")
private String roleId;
/**
* 用户id
*/
@ApiModelProperty(notes = "用户id")
private String userId;
@ApiModelProperty(notes = "公司提现规则")
private List<CompanyRuleVo> companyRuleVoList;
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getRoleId() {
return roleId;
}
public void setRoleId(String roleId) {
this.roleId = roleId;
}
public Integer getExamineStatus() {
return examineStatus;
}
public void setExamineStatus(Integer examineStatus) {
this.examineStatus = examineStatus;
}
public String getExamineFailedReason() {
return examineFailedReason;
}
@ApiModelProperty(notes = "公司邀请规则")
private List<CompanyInvitationRuleVo> companyInvitationActivatRuleVoList;
public void setExamineFailedReason(String examineFailedReason) {
this.examineFailedReason = examineFailedReason;
}
@ApiModelProperty(notes = "公司邀请规则")
private List<CompanyInvitationRuleVo> companyInvitationRewardRuleVoList;
public String getCompanyId() {
return companyId;
......@@ -213,12 +244,76 @@ public class ExamineConfigReqVo {
this.superExplain = superExplain;
}
public Double getWithdrawMoney() {
return withdrawMoney;
public Integer getSubledgerStatus() {
return subledgerStatus;
}
public void setSubledgerStatus(Integer subledgerStatus) {
this.subledgerStatus = subledgerStatus;
}
public Integer getSubledgerRule() {
return subledgerRule;
}
public void setSubledgerRule(Integer subledgerRule) {
this.subledgerRule = subledgerRule;
}
public Integer getSubledgerRuleTime() {
return subledgerRuleTime;
}
public void setSubledgerRuleTime(Integer subledgerRuleTime) {
this.subledgerRuleTime = subledgerRuleTime;
}
public Integer getDivideStatus() {
return divideStatus;
}
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
public Integer getScanCodePayStatus() {
return scanCodePayStatus;
}
public void setScanCodePayStatus(Integer scanCodePayStatus) {
this.scanCodePayStatus = scanCodePayStatus;
}
public Integer getInvitationStatus() {
return invitationStatus;
}
public void setInvitationStatus(Integer invitationStatus) {
this.invitationStatus = invitationStatus;
}
public String getInvitationCode() {
return invitationCode;
}
public void setInvitationCode(String invitationCode) {
this.invitationCode = invitationCode;
}
public Integer getInviteesPeople() {
return inviteesPeople;
}
public void setWithdrawMoney(Double withdrawMoney) {
this.withdrawMoney = withdrawMoney;
public void setInviteesPeople(Integer inviteesPeople) {
this.inviteesPeople = inviteesPeople;
}
public Integer getActivationStatus() {
return activationStatus;
}
public void setActivationStatus(Integer activationStatus) {
this.activationStatus = activationStatus;
}
public Integer getWithdrawRule() {
......@@ -229,6 +324,30 @@ public class ExamineConfigReqVo {
this.withdrawRule = withdrawRule;
}
public Double getMinWithdrawMoney() {
return minWithdrawMoney;
}
public void setMinWithdrawMoney(Double minWithdrawMoney) {
this.minWithdrawMoney = minWithdrawMoney;
}
public Double getMaxWithdrawMoney() {
return maxWithdrawMoney;
}
public void setMaxWithdrawMoney(Double maxWithdrawMoney) {
this.maxWithdrawMoney = maxWithdrawMoney;
}
public Integer getDiscountRule() {
return discountRule;
}
public void setDiscountRule(Integer discountRule) {
this.discountRule = discountRule;
}
public Double getWithdrawFee() {
return withdrawFee;
}
......@@ -237,6 +356,22 @@ public class ExamineConfigReqVo {
this.withdrawFee = withdrawFee;
}
public String getWithdrawType() {
return withdrawType;
}
public void setWithdrawType(String withdrawType) {
this.withdrawType = withdrawType;
}
public Integer getGrade() {
return grade;
}
public void setGrade(Integer grade) {
this.grade = grade;
}
public Integer getQrCodeType() {
return qrCodeType;
}
......@@ -245,6 +380,38 @@ public class ExamineConfigReqVo {
this.qrCodeType = qrCodeType;
}
public Integer getExamineStatus() {
return examineStatus;
}
public void setExamineStatus(Integer examineStatus) {
this.examineStatus = examineStatus;
}
public String getExamineFailedReason() {
return examineFailedReason;
}
public void setExamineFailedReason(String examineFailedReason) {
this.examineFailedReason = examineFailedReason;
}
public String getRoleId() {
return roleId;
}
public void setRoleId(String roleId) {
this.roleId = roleId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public List<CompanyRuleVo> getCompanyRuleVoList() {
return companyRuleVoList;
}
......@@ -252,4 +419,60 @@ public class ExamineConfigReqVo {
public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
this.companyRuleVoList = companyRuleVoList;
}
public List<CompanyInvitationRuleVo> getCompanyInvitationActivatRuleVoList() {
return companyInvitationActivatRuleVoList;
}
public void setCompanyInvitationActivatRuleVoList(List<CompanyInvitationRuleVo> companyInvitationActivatRuleVoList) {
this.companyInvitationActivatRuleVoList = companyInvitationActivatRuleVoList;
}
public List<CompanyInvitationRuleVo> getCompanyInvitationRewardRuleVoList() {
return companyInvitationRewardRuleVoList;
}
public void setCompanyInvitationRewardRuleVoList(List<CompanyInvitationRuleVo> companyInvitationRewardRuleVoList) {
this.companyInvitationRewardRuleVoList = companyInvitationRewardRuleVoList;
}
public Double getFee() {
return fee;
}
public void setFee(Double fee) {
this.fee = fee;
}
public Double getTaxFee() {
return taxFee;
}
public void setTaxFee(Double taxFee) {
this.taxFee = taxFee;
}
public Integer getServiceChargeStatus() {
return serviceChargeStatus;
}
public void setServiceChargeStatus(Integer serviceChargeStatus) {
this.serviceChargeStatus = serviceChargeStatus;
}
public Integer getServiceChargeType() {
return serviceChargeType;
}
public void setServiceChargeType(Integer serviceChargeType) {
this.serviceChargeType = serviceChargeType;
}
public Double getServiceCharge() {
return serviceCharge;
}
public void setServiceCharge(Double serviceCharge) {
this.serviceCharge = serviceCharge;
}
}
src/main/java/com/pangding/web/authority/vo/resvo/CompanyLoginResVo.java
View file @ ec99e28b
......@@ -3,10 +3,8 @@ package com.pangding.web.authority.vo.resvo;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
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 com.pangding.web.vo.system.pd.company.*;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
......@@ -30,6 +28,13 @@ public class CompanyLoginResVo {
private List<RoleVo> roleVoList;
private List<CompanyRuleVo> companyRuleVoList;
@ApiModelProperty(notes = "公司分润规则列表")
private List<CompanyDivideRuleVo> companyDivideRuleVoList;
@ApiModelProperty(notes = "邀请规则列表")
private List<CompanyInvitationRuleVo> companyInvitationActivatRuleVoList;
@ApiModelProperty(notes = "邀请奖励规则列表")
private List<CompanyInvitationRuleVo> companyInvitationRewardRuleVoList;
public List<RoleVo> getRoleVoList() {
return roleVoList;
......@@ -94,4 +99,28 @@ public class CompanyLoginResVo {
public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
this.companyRuleVoList = companyRuleVoList;
}
public List<CompanyDivideRuleVo> getCompanyDivideRuleVoList() {
return companyDivideRuleVoList;
}
public void setCompanyDivideRuleVoList(List<CompanyDivideRuleVo> companyDivideRuleVoList) {
this.companyDivideRuleVoList = companyDivideRuleVoList;
}
public List<CompanyInvitationRuleVo> getCompanyInvitationActivatRuleVoList() {
return companyInvitationActivatRuleVoList;
}
public void setCompanyInvitationActivatRuleVoList(List<CompanyInvitationRuleVo> companyInvitationActivatRuleVoList) {
this.companyInvitationActivatRuleVoList = companyInvitationActivatRuleVoList;
}
public List<CompanyInvitationRuleVo> getCompanyInvitationRewardRuleVoList() {
return companyInvitationRewardRuleVoList;
}
public void setCompanyInvitationRewardRuleVoList(List<CompanyInvitationRuleVo> companyInvitationRewardRuleVoList) {
this.companyInvitationRewardRuleVoList = companyInvitationRewardRuleVoList;
}
}
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