Skip to content

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

修改审核bug

parent 6bd7e3d5
Hide whitespace changes
Inline Side-by-side
Showing with 672 additions and 4 deletions
src/main/java/com/pangding/web/authority/controller/LoginController.java
View file @ 39a3c049
......@@ -44,6 +44,7 @@ public class LoginController {
CheckerHelper.newInstance()
.notBlankCheck("account or phone",reqVo.getAccountOrPhone())
.notBlankCheck("password",reqVo.getPassword())
.notBlankCheck("loginType", reqVo.getLoginType())
.checkException();
return ResponseResult.result(registerServiceImpl.login(reqVo));
}
......
src/main/java/com/pangding/web/authority/dao/impl/RoleAuthorityDaoImpl.java
View file @ 39a3c049
......@@ -23,7 +23,9 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
.add("userId", "AND b.user_id = @userId",
"{INNER}", "INNER JOIN pd_user_role AS b ON ra.role_id = b.role_id")
.add("role", " AND ra.role_id = @role")
.add("authority", " AND ra.authority_id = @authority");
.add("authority", " AND ra.authority_id = @authority")
.add("platformType", " AND a.platform_type = @platformType")
;
}
......
src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java
View file @ 39a3c049
......@@ -3,6 +3,7 @@ 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.company.service.CompanyOtherMoenyService;
import com.pangding.web.constant.MqConstant;
import com.pangding.web.mq.CompanyProducer;
import com.pangding.web.mq.DistributionProducer;
......@@ -19,10 +20,10 @@ import com.pangding.web.vo.system.req.CompanyMsgReqVo;
import com.pangding.web.vo.system.req.SystemWarnReqVo;
import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
import com.rabbitmq.client.Channel;
import com.yanzuoguang.mq.service.MqService;
import com.yanzuoguang.mq.vo.MessageVo;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.JsonHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.log.Log;
......@@ -56,6 +57,8 @@ public class CompanyConsumer {
private CompanyService companyService;
@Autowired
private SystemWarnService systemWarnService;
@Autowired
private CompanyOtherMoenyService companyOtherMoenyService;
/**
* 初始化mq
......@@ -95,6 +98,20 @@ public class CompanyConsumer {
}
}
@RabbitListener(queues = {MqConstant.COMPANY_OTHER_MONEY_UPDATE})
public void updateCompanyOtherMoney(String content, Message message, Channel channel) {
try {
CompanyOtherMoneyUpdateReqVo updateCompanyMoneyReqVo = JsonHelper.deserialize(content, CompanyOtherMoneyUpdateReqVo.class);
companyOtherMoenyService.updateMoney(updateCompanyMoneyReqVo);
} catch (Exception e) {
Log.error(CompanyConsumer.class, e);
mqService.message(new MessageVo(MqConstant.COMPANY_OTHER_MONEY_UPDATE, MqConstant.COMPANY_OTHER_MONEY_UPDATE,
content, 2000));
} finally {
mqService.basicAck(message, channel);
}
}
@RabbitListener(queues = {MqConstant.SAVE_CAPITAL_FLOW})
public void saveCapitalFlow(String content, Message message, Channel channel) {
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ 39a3c049
......@@ -19,6 +19,8 @@ import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.reqvo.CompanyDivideReqVo;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.company.dao.CompanyOtherMoneyDao;
import com.pangding.web.company.service.CompanyOtherMoenyService;
import com.pangding.web.constant.CompanyConstant;
import com.pangding.web.constant.PangdConstant;
import com.pangding.web.util.RSAUtils;
......@@ -39,6 +41,9 @@ import com.pangding.web.vo.system.res.company.*;
import com.pangding.web.vo.wechat.req.code.QrCodeReqVo;
import com.pangding.web.vo.wechat.req.code.Scene;
import com.pangding.web.vo.wechat.req.code.SceneInfo;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyQueryPageReqVo;
import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
......@@ -68,6 +73,8 @@ public class CompanyServiceImpl implements CompanyService {
@Autowired
private FinanceService financeService;
@Autowired
private CompanyOtherMoneyDao companyOtherMoneyDao;
@Autowired
private CompanyDao companyDao;
@Autowired
private CompanyExtendDao companyExtendDao;
......@@ -1544,6 +1551,11 @@ public class CompanyServiceImpl implements CompanyService {
CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFromClass(companyVo, companyResVo);
CompanyOtherMoneyQueryPageReqVo companyOtherMoneyQueryPageReqVo = new CompanyOtherMoneyQueryPageReqVo();
companyOtherMoneyQueryPageReqVo.setCompanyId(req.getCompanyId());
List<CompanyOtherMoneyVo> companyOtherMoneyQueryResVoList = companyOtherMoneyDao.loadList(companyOtherMoneyQueryPageReqVo, CompanyOtherMoneyVo.class);
companyResVo.setCompanyOtherMoneyList(companyOtherMoneyQueryResVoList);
// 获取支付成功后跳转链接
companyResVo.setPaydJumpUrl(getJumpUrl(companyVo));
return companyResVo;
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 39a3c049
......@@ -445,6 +445,9 @@ public class RegisterServiceImpl implements RegisterService {
if (StringHelper.isEmpty(companyVo)) {
throw new CodeException("注册信息有误");
}
if(CompanyConstant.EXAMINE_STATUS_FAIL == companyVo.getExamineStatus()){
throw new CodeException("公司未审核通过。" + companyVo.getExamineFailedReason());
}
if(CompanyConstant.EXAMINE_STATUS_STOP == companyVo.getExamineStatus()){
throw new CodeException("公司已停用，如有疑问，请联系管理员。");
}
......@@ -489,6 +492,7 @@ public class RegisterServiceImpl implements RegisterService {
/*获取用户权限列表*/
RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
roleAuthorityGetReqVo.setUserId(userVo.getId());
roleAuthorityGetReqVo.setPlatformType(reqVo.getLoginType());
List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
......
src/main/java/com/pangding/web/authority/vo/reqvo/RoleAuthorityGetReqVo.java
View file @ 39a3c049
......@@ -17,6 +17,8 @@ public class RoleAuthorityGetReqVo {
private String userId;
private Integer platformType;
public String getUserId() {
return userId;
}
......@@ -64,4 +66,12 @@ public class RoleAuthorityGetReqVo {
public void setAuthority(String authority) {
this.authority = authority;
}
public Integer getPlatformType() {
return platformType;
}
public void setPlatformType(Integer platformType) {
this.platformType = platformType;
}
}
src/main/java/com/pangding/web/company/dao/CompanyOtherMoneyDao.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.dao;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyQueryPageReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
public interface CompanyOtherMoneyDao extends BaseDao {
PageSizeData<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyPage(CompanyOtherMoneyQueryPageReqVo reqVo);
List<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyList(CompanyOtherMoneyQueryPageReqVo reqVo);
CompanyOtherMoneyQueryResVo queryCompanyOtherMoney(CompanyOtherMoneyQueryPageReqVo reqVo);
void updateMoney(CompanyOtherMoneyUpdateReqVo req);
}
src/main/java/com/pangding/web/company/dao/impl/CompanyOtherMoneyDaoImpl.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.dao.impl;
import com.pangding.web.company.dao.CompanyOtherMoneyDao;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyQueryPageReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class CompanyOtherMoneyDaoImpl extends BaseDaoImpl implements CompanyOtherMoneyDao {
private static final String QUERY_COMPANY_MONEY = "QUERY_COMPANY_MONEY";
private static final String UPDATE_COMPANY_MONEY = "UPDATE_COMPANY_MONEY";
@Override
protected void init() {
register(CompanyOtherMoneyVo.class);
table.add(QUERY_COMPANY_MONEY,"select a.*,b.company_pid as companyPid,b.company_pname as companyPname" +
" from pd_company_other_money a " +
" left join pd_company_relation b on a.company_other_money_id = b.relation_id" +
" where 1=1 {WHERE} order by create_time desc")
.add("","")
.add("companyPid"," and b.company_pid = ? ")
.add("companyId"," and a.company_id = ? ")
.add("merchantId"," and a.merchant_id = ? ")
.add("superOtherMoneyType", " and a.super_other_money_type = ? ")
.add("moneyStatus", " and a.money_status = ? ")
.add("companyName"," and a.company_name LIKE concat('%', ?,'%') ")
.add("merchantName"," and a.merchant_name LIKE concat('%', ?,'%') ");
table.add(UPDATE_COMPANY_MONEY,"update pd_company_other_money set other_money = other_money + @otherMoney " +
" where company_id = @companyId and merchant_id =@merchantId " );
}
@Override
public PageSizeData<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyPage(CompanyOtherMoneyQueryPageReqVo reqVo) {
return this.queryPage(CompanyOtherMoneyQueryResVo.class,reqVo,QUERY_COMPANY_MONEY,reqVo);
}
@Override
public List<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyList(CompanyOtherMoneyQueryPageReqVo reqVo) {
return this.query(CompanyOtherMoneyQueryResVo.class,QUERY_COMPANY_MONEY,reqVo);
}
@Override
public CompanyOtherMoneyQueryResVo queryCompanyOtherMoney(CompanyOtherMoneyQueryPageReqVo reqVo) {
return this.queryFirst(CompanyOtherMoneyQueryResVo.class,QUERY_COMPANY_MONEY,reqVo);
}
@Override
public void updateMoney(CompanyOtherMoneyUpdateReqVo req) {
this.updateSql(UPDATE_COMPANY_MONEY, req);
}
}
src/main/java/com/pangding/web/company/service/CompanyOtherMoenyService.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyDelReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyQueryPageReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
public interface CompanyOtherMoenyService {
PageSizeData<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyPage(CompanyOtherMoneyQueryPageReqVo reqVo);
List<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyList(CompanyOtherMoneyQueryPageReqVo reqVo);
CompanyOtherMoneyQueryResVo queryCompanyOtherMoney(CompanyOtherMoneyQueryPageReqVo reqVo);
String saveCompanyOtherMoney(CompanyOtherMoneySaveReqVo req);
String updateCompanyOtherMoney(CompanyOtherMoneyUpdateReqVo req);
void delCOmpanyOtherMoney(CompanyOtherMoneyDelReqVo req);
String updateMoney(CompanyOtherMoneyUpdateReqVo req);
}
src/main/java/com/pangding/web/company/service/CompanyOtherMoneyDatabase.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service;
import com.pangding.web.company.vo.CompanyOtherMoneyTemp;
public interface CompanyOtherMoneyDatabase {
void saveDatabase(CompanyOtherMoneyTemp temp);
}
src/main/java/com/pangding/web/company/service/CompanyOtherMoneyResource.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service;
public interface CompanyOtherMoneyResource {
}
src/main/java/com/pangding/web/company/service/CompanyOtherMoneySaveService.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service;
import com.pangding.web.company.vo.CompanyOtherMoneyTemp;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
public interface CompanyOtherMoneySaveService {
void companyOtherMoneySaveHand(CompanyOtherMoneyTemp temp, CompanyOtherMoneySaveReqVo req);
}
src/main/java/com/pangding/web/company/service/impl/CompanyOtherMoneyDatabaseImpl.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service.impl;
import com.pangding.web.authority.dao.company.CompanyRelationDao;
import com.pangding.web.company.dao.CompanyOtherMoneyDao;
import com.pangding.web.company.service.CompanyOtherMoneyDatabase;
import com.pangding.web.company.vo.CompanyOtherMoneyTemp;
import org.springframework.stereotype.Component;
@Component
public class CompanyOtherMoneyDatabaseImpl implements CompanyOtherMoneyDatabase {
private CompanyRelationDao companyRelationDao;
private CompanyOtherMoneyDao companyOtherMoneyDao;
public CompanyOtherMoneyDatabaseImpl(CompanyRelationDao companyRelationDao, CompanyOtherMoneyDao companyOtherMoneyDao) {
this.companyRelationDao = companyRelationDao;
this.companyOtherMoneyDao = companyOtherMoneyDao;
}
public void saveDatabase(CompanyOtherMoneyTemp temp){
companyRelationDao.createList(temp.getCompanyRelationVoList());
companyOtherMoneyDao.createList(temp.getCompanyOtherMoneyVoList());
}
}
src/main/java/com/pangding/web/company/service/impl/CompanyOtherMoneySavePdServiceImpl.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service.impl;
import com.pangding.web.company.service.CompanyOtherMoneySaveService;
import com.pangding.web.company.vo.CompanyOtherMoneyTemp;
import com.pangding.web.company.vo.CompanyOtherMoneyUtil;
import com.pangding.web.constant.PangdConstant;
import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class CompanyOtherMoneySavePdServiceImpl implements CompanyOtherMoneySaveService {
private CompanyOtherMoneyUtil companyOtherMoneyUtil;
public CompanyOtherMoneySavePdServiceImpl(CompanyOtherMoneyUtil companyOtherMoneyUtil) {
this.companyOtherMoneyUtil = companyOtherMoneyUtil;
}
public void companyOtherMoneySaveHand(CompanyOtherMoneyTemp temp, CompanyOtherMoneySaveReqVo req) {
if (PangdConstant.SOURCE_TYPE_PD == req.getSourceType()) {
// 胖丁来源
List<CompanyOtherMoneyVo> companyOtherMoneyList = req.getCompanyOtherMoneyList();
for (CompanyOtherMoneyVo companyOtherMoneyVo : companyOtherMoneyList) {
String companyOtherMoneyId = StringHelper.getNewID();
CompanyOtherMoneyVo companyOtherMoney = companyOtherMoneyUtil.checkCompanyOtherMoney(companyOtherMoneyVo.getMerchantId(),
companyOtherMoneyVo.getCompanyId());
if (StringHelper.isEmpty(companyOtherMoney)) {
companyOtherMoney = new CompanyOtherMoneyVo();
ObjectHelper.writeWithFromClass(companyOtherMoney, companyOtherMoneyVo);
companyOtherMoney.setCompanyOtherMoneyId(companyOtherMoneyId);
companyOtherMoney.setCreateTime(DateHelper.getNow());
temp.getCompanyOtherMoneyVoList().add(companyOtherMoney);
}
if (!StringHelper.isEmpty(req.getCompanyId())){
// 检查改公司是否已经添加
CompanyRelationVo companyRelationVo = companyOtherMoneyUtil.checkCompanyRelation(req.getCompanyId(), companyOtherMoneyVo.getCompanyId());
if (StringHelper.isEmpty(companyRelationVo)) {
companyRelationVo = new CompanyRelationVo();
companyRelationVo.setCompanyId(companyOtherMoneyVo.getCompanyId());
companyRelationVo.setCompanyName(companyOtherMoneyVo.getCompanyName());
companyRelationVo.setCompanyPid(req.getCompanyId());
companyRelationVo.setCompanyPname(req.getCompanyName());
companyRelationVo.setCreateTime(DateHelper.getNow());
companyRelationVo.setCompanyRelationId(StringHelper.getNewID());
companyRelationVo.setRelationType("2");
companyRelationVo.setRelationId(companyOtherMoneyId);
temp.getCompanyRelationVoList().add(companyRelationVo);
}
}
}
}
}
}
src/main/java/com/pangding/web/company/service/impl/CompanyOtherMoneySaveServiceImpl.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service.impl;
import com.pangding.web.company.service.CompanyOtherMoneySaveService;
import com.pangding.web.company.vo.CompanyOtherMoneyTemp;
import com.pangding.web.company.vo.CompanyOtherMoneyUtil;
import com.pangding.web.constant.PangdConstant;
import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class CompanyOtherMoneySaveServiceImpl implements CompanyOtherMoneySaveService {
private CompanyOtherMoneyUtil companyOtherMoneyUtil;
public CompanyOtherMoneySaveServiceImpl(CompanyOtherMoneyUtil companyOtherMoneyUtil) {
this.companyOtherMoneyUtil = companyOtherMoneyUtil;
}
public void companyOtherMoneySaveHand(CompanyOtherMoneyTemp temp, CompanyOtherMoneySaveReqVo req){
if(PangdConstant.SOURCE_TYPE_BUSIN == req.getSourceType()){
// 商户来源
List<CompanyOtherMoneyVo> companyOtherMoneyList = req.getCompanyOtherMoneyList();
for(CompanyOtherMoneyVo companyOtherMoneyVo: companyOtherMoneyList){
String companyOtherMoneyId = StringHelper.getNewID();
CompanyOtherMoneyVo companyOtherMoney = companyOtherMoneyUtil.checkCompanyOtherMoney(companyOtherMoneyVo.getMerchantId(),
companyOtherMoneyVo.getCompanyId());
if (StringHelper.isEmpty(companyOtherMoney)) {
companyOtherMoney = new CompanyOtherMoneyVo();
ObjectHelper.writeWithFromClass(companyOtherMoney, companyOtherMoneyVo);
companyOtherMoney.setCompanyOtherMoneyId(companyOtherMoneyId);
companyOtherMoney.setCreateTime(DateHelper.getNow());
temp.getCompanyOtherMoneyVoList().add(companyOtherMoney);
}
if (!StringHelper.isEmpty(req.getCompanyId())){
// 检查改公司是否已经添加
CompanyRelationVo companyRelationVo = companyOtherMoneyUtil.checkCompanyRelation(req.getCompanyId(), companyOtherMoneyVo.getCompanyId());
if (StringHelper.isEmpty(companyRelationVo)) {
companyRelationVo = new CompanyRelationVo();
companyRelationVo.setCompanyId(companyOtherMoneyVo.getCompanyId());
companyRelationVo.setCompanyName(companyOtherMoneyVo.getCompanyName());
companyRelationVo.setCompanyPid(req.getCompanyId());
companyRelationVo.setCompanyPname(req.getCompanyName());
companyRelationVo.setCreateTime(DateHelper.getNow());
companyRelationVo.setCompanyRelationId(StringHelper.getNewID());
companyRelationVo.setRelationType("2");
companyRelationVo.setRelationId(companyOtherMoneyId);
temp.getCompanyRelationVoList().add(companyRelationVo);
}
}
}
}
}
}
src/main/java/com/pangding/web/company/service/impl/CompanyOtherMoneyServiceImpl.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.service.impl;
import com.pangding.web.authority.dao.company.CompanyRelationDao;
import com.pangding.web.company.dao.CompanyOtherMoneyDao;
import com.pangding.web.company.service.CompanyOtherMoenyService;
import com.pangding.web.company.service.CompanyOtherMoneyDatabase;
import com.pangding.web.company.service.CompanyOtherMoneySaveService;
import com.pangding.web.company.vo.CompanyOtherMoneyTemp;
import com.pangding.web.constant.CompanyConstant;
import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyDelReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyQueryPageReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
@Component
public class CompanyOtherMoneyServiceImpl implements CompanyOtherMoenyService {
private CompanyOtherMoneyDao companyOtherMoneyDao;
private CompanyRelationDao companyRelationDao;
private List<CompanyOtherMoneySaveService> companyOtherMoneySaveService;
private List<CompanyOtherMoneyDatabase> companyOtherMoneyDatabases;
public CompanyOtherMoneyServiceImpl(CompanyOtherMoneyDao companyOtherMoneyDao, CompanyRelationDao companyRelationDao,
List<CompanyOtherMoneySaveService> companyOtherMoneySaveService,
List<CompanyOtherMoneyDatabase> companyOtherMoneyDatabases) {
this.companyOtherMoneyDao = companyOtherMoneyDao;
this.companyRelationDao = companyRelationDao;
this.companyOtherMoneySaveService = companyOtherMoneySaveService;
this.companyOtherMoneyDatabases = companyOtherMoneyDatabases;
}
public PageSizeData<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyPage(CompanyOtherMoneyQueryPageReqVo reqVo) {
return companyOtherMoneyDao.queryCompanyOtherMoneyPage(reqVo);
}
public List<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoneyList(CompanyOtherMoneyQueryPageReqVo reqVo) {
return companyOtherMoneyDao.queryCompanyOtherMoneyList(reqVo);
}
public CompanyOtherMoneyQueryResVo queryCompanyOtherMoney(CompanyOtherMoneyQueryPageReqVo reqVo) {
return companyOtherMoneyDao.queryCompanyOtherMoney(reqVo);
}
public String saveCompanyOtherMoney(CompanyOtherMoneySaveReqVo req) {
CompanyOtherMoneyTemp companyOtherMoneyTemp = new CompanyOtherMoneyTemp();
companyOtherMoneySaveService.forEach(k -> k.companyOtherMoneySaveHand(companyOtherMoneyTemp, req));
companyOtherMoneyDatabases.forEach(k -> k.saveDatabase(companyOtherMoneyTemp));
return "提交成功";
}
public String updateCompanyOtherMoney(CompanyOtherMoneyUpdateReqVo req) {
CompanyOtherMoneyVo companyOtherMoneyVo = companyOtherMoneyDao.load(req.getCompanyOtherMoneyId(), CompanyOtherMoneyVo.class);
if (StringHelper.isEmpty(companyOtherMoneyVo)) {
throw new CodeException("未找到信息");
}
if(CompanyConstant.SUPEY_MONEY_TYPE_SUPER == companyOtherMoneyVo.getSuperOtherMoneyType()){
CompanyRelationVo companyRelationReqVo = new CompanyRelationVo();
companyRelationReqVo.setCompanyId(req.getCompanyId());
companyRelationReqVo.setRelationId(companyOtherMoneyVo.getCompanyOtherMoneyId());
CompanyRelationVo companyRelationVo = companyRelationDao.load(companyRelationReqVo, CompanyRelationVo.class);
if(!StringHelper.isEmpty(companyRelationVo)){
if(!req.getCompanyPid().equals(companyRelationVo.getCompanyPid())){
throw new CodeException("上级公司不一致，不能修改上级公司。请先删除，在新增。");
}
}
}
ObjectHelper.writeWithFromClass(companyOtherMoneyVo, req);
companyOtherMoneyDao.update(companyOtherMoneyVo);
return "提交成功";
}
public void delCOmpanyOtherMoney(CompanyOtherMoneyDelReqVo req) {
CompanyOtherMoneyVo companyOtherMoneyVo = companyOtherMoneyDao.load(req.getCompanyOtherMoneyId(), CompanyOtherMoneyVo.class);
if (!StringHelper.isEmpty(companyOtherMoneyVo)) {
if (!StringHelper.isEmpty(companyOtherMoneyVo.getSuperOtherMoneyType())
&& CompanyConstant.SUPEY_MONEY_TYPE_SUPER == companyOtherMoneyVo.getSuperOtherMoneyType()) {
CompanyRelationVo del = new CompanyRelationVo();
del.setCompanyId(req.getCompanyId());
del.setCompanyPid(req.getCompanyPid());
companyRelationDao.remove(del);
// CompanyOtherMoneyVo companyOtherMoneyVo1 = new CompanyOtherMoneyVo();
// companyOtherMoneyVo1.setCompanyId(companyOtherMoneyVo.getCompanyId());
// companyOtherMoneyVo1.setSuperOtherMoneyType(CompanyConstant.SUPEY_MONEY_TYPE_SUPER);
// List<CompanyOtherMoneyVo> list = companyOtherMoneyDao.loadList(companyOtherMoneyVo1, CompanyOtherMoneyVo.class);
// if(StringHelper.isEmpty(list) && list.size() == 0){
//
// }
}
if(!StringHelper.isEmpty(companyOtherMoneyVo.getSuperOtherMoneyType())
&& CompanyConstant.SUPEY_MONEY_TYPE_SELF == companyOtherMoneyVo.getSuperOtherMoneyType()){
// 删除上级 需要查询是否有下级 需一起删除 TODO
CompanyRelationVo delReq = new CompanyRelationVo();
delReq.setCompanyPid(companyOtherMoneyVo.getCompanyId());
List<CompanyRelationVo> companyRelationVoList = companyRelationDao.loadList(delReq, CompanyRelationVo.class);
for(CompanyRelationVo companyRelationVo: companyRelationVoList){
CompanyOtherMoneyVo companyOtherMoneyCli = companyOtherMoneyDao.load(companyRelationVo.getRelationId(), CompanyOtherMoneyVo.class);
companyOtherMoneyDao.remove(companyOtherMoneyCli);
companyRelationDao.remove(companyRelationVo);
}
}
companyOtherMoneyDao.remove(companyOtherMoneyVo);
}
}
public String updateMoney(CompanyOtherMoneyUpdateReqVo req) {
CompanyOtherMoneyUpdateReqVo updateReq = new CompanyOtherMoneyUpdateReqVo();
updateReq.setCompanyId(req.getCompanyId());
updateReq.setMerchantId(req.getMerchantId());
double otherMoney = 0;
if(!StringHelper.isEmpty(req.getMoneyType()) && 11 == req.getMoneyType()){
// 消费
otherMoney = -req.getOtherMoney();
}
if(!StringHelper.isEmpty(req.getMoneyType()) && 12 == req.getMoneyType()){
// 退票
otherMoney = req.getOtherMoney();
}
updateReq.setOtherMoney(otherMoney);
companyOtherMoneyDao.updateMoney(updateReq);
CompanyOtherMoneyVo companyOtherMoneyReqVo = new CompanyOtherMoneyVo();
companyOtherMoneyReqVo.setCompanyId(req.getCompanyId());
companyOtherMoneyReqVo.setMerchantId(req.getMerchantId());
CompanyOtherMoneyVo companyOtherMoneyVo = companyOtherMoneyDao.load(companyOtherMoneyReqVo, CompanyOtherMoneyVo.class);
if (!StringHelper.isEmpty(companyOtherMoneyVo)) {
if(CompanyConstant.SUPEY_MONEY_TYPE_SUPER == companyOtherMoneyVo.getSuperOtherMoneyType()){
// 上级分配的余额
CompanyRelationVo reqVo = new CompanyRelationVo();
reqVo.setCompanyId(companyOtherMoneyVo.getCompanyId());
reqVo.setRelationId(companyOtherMoneyVo.getCompanyOtherMoneyId());
CompanyRelationVo companyRelationVo = companyRelationDao.load(reqVo, CompanyRelationVo.class);
if(!StringHelper.isEmpty(companyRelationVo)){
CompanyOtherMoneyUpdateReqVo superUpdateReq = new CompanyOtherMoneyUpdateReqVo();
superUpdateReq.setCompanyId(companyRelationVo.getCompanyPid());
superUpdateReq.setMerchantId(req.getMerchantId());
superUpdateReq.setOtherMoney(otherMoney);
companyOtherMoneyDao.updateMoney(superUpdateReq);
}
}
}
return "提交成功";
}
}
src/main/java/com/pangding/web/swagger.java → src/main/java/com/pangding/web/company/swagger.java
View file @ 39a3c049
package com.pangding.web;
package com.pangding.web.company;
import com.yanzuoguang.util.helper.SwaggerHelper;
import org.springframework.context.annotation.Bean;
......@@ -25,7 +25,8 @@ public class swagger {
.apis(SwaggerHelper.basePackage(
"com.pangding.web.authority.controller",
"com.pangding.web.system.web",
"com.pangding.web.report.web"
"com.pangding.web.report.web",
"com.pangding.web.company.web"
))
.paths(PathSelectors.any())
.build();
......
src/main/java/com/pangding/web/company/vo/CompanyOtherMoneyTemp.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.vo;
import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import java.util.ArrayList;
import java.util.List;
public class CompanyOtherMoneyTemp {
List<CompanyRelationVo> companyRelationVoList = new ArrayList<>();
List<CompanyOtherMoneyVo> companyOtherMoneyVoList = new ArrayList<>();
public List<CompanyRelationVo> getCompanyRelationVoList() {
return companyRelationVoList;
}
public List<CompanyOtherMoneyVo> getCompanyOtherMoneyVoList() {
return companyOtherMoneyVoList;
}
}
src/main/java/com/pangding/web/company/vo/CompanyOtherMoneyUtil.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.vo;
import com.pangding.web.authority.dao.company.CompanyRelationDao;
import com.pangding.web.company.dao.CompanyOtherMoneyDao;
import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
import org.springframework.stereotype.Component;
@Component
public class CompanyOtherMoneyUtil {
private CompanyRelationDao companyRelationDao;
private CompanyOtherMoneyDao companyOtherMoneyDao;
public CompanyOtherMoneyUtil(CompanyRelationDao companyRelationDao, CompanyOtherMoneyDao companyOtherMoneyDao) {
this.companyRelationDao = companyRelationDao;
this.companyOtherMoneyDao = companyOtherMoneyDao;
}
public CompanyRelationVo checkCompanyRelation(String companyPid, String companyId){
CompanyRelationVo req = new CompanyRelationVo();
req.setCompanyPid(companyPid);
req.setCompanyId(companyId);
CompanyRelationVo companyRelationVo = companyRelationDao.load(req, CompanyRelationVo.class);
return companyRelationVo;
}
public CompanyOtherMoneyVo checkCompanyOtherMoney(String merchantId, String companyId){
CompanyOtherMoneyVo req = new CompanyOtherMoneyVo();
req.setCompanyId(companyId);
req.setMerchantId(merchantId);
CompanyOtherMoneyVo companyOtherMoneyVo = companyOtherMoneyDao.load(req, CompanyOtherMoneyVo.class);
return companyOtherMoneyVo;
}
}
src/main/java/com/pangding/web/company/web/CompanyOtherMoneyController.java 0 → 100644
View file @ 39a3c049
package com.pangding.web.company.web;
import com.pangding.web.company.service.CompanyOtherMoenyService;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyDelReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyQueryPageReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping(value = "/companyOtherMoney", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "代购公司余额", description = "代购公司授信余额管理")
public class CompanyOtherMoneyController {
private CompanyOtherMoenyService companyOtherMoenyService;
public CompanyOtherMoneyController(CompanyOtherMoenyService companyOtherMoenyService) {
this.companyOtherMoenyService = companyOtherMoenyService;
}
@RequestMapping(value = "/queryCompanyOtherMoneyPage")
@ApiOperation(value = "找到下级公司的余额情况", notes = "返回下级公司的余额")
public ResponseResult<PageSizeData<CompanyOtherMoneyQueryResVo>> queryCompanyOtherMoneyPage(@RequestBody CompanyOtherMoneyQueryPageReqVo req) {
CheckerHelper.newInstance().notBlankCheck("companyPid", req.getCompanyPid())
.checkException();
if("10001".equals(req.getCompanyPid())){
req.setCompanyPid("");
}
return ResponseResult.result(companyOtherMoenyService.queryCompanyOtherMoneyPage(req));
}
@RequestMapping(value = "/queryCompanyOtherMoneyList")
@ApiOperation(value = "找到公司的余额情况", notes = "返回公司的余额")
public ResponseResult<List<CompanyOtherMoneyQueryResVo>> queryCompanyOtherMoneyList(@RequestBody CompanyOtherMoneyQueryPageReqVo req) {
CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
.checkException();
if("10001".equals(req.getCompanyId())){
req.setCompanyId("");
}
return ResponseResult.result(companyOtherMoenyService.queryCompanyOtherMoneyList(req));
}
@RequestMapping(value = "/queryCompanyOtherMoney")
@ApiOperation(value = "查询详情", notes = "返回成功")
public ResponseResult<CompanyOtherMoneyQueryResVo> queryCompanyOtherMoney(@RequestBody CompanyOtherMoneyQueryPageReqVo req) {
// CheckerHelper.newInstance().notBlankCheck("companyId", req.getCompanyId())
// .checkException();
return ResponseResult.result(companyOtherMoenyService.queryCompanyOtherMoney(req));
}
@RequestMapping(value = "/saveCompanyOtherMoney")
@ApiOperation(value = "保存公司其他余额", notes = "返回成功")
public ResponseResult<String> saveCompanyOtherMoney(@RequestBody CompanyOtherMoneySaveReqVo req) {
CheckerHelper.newInstance().notBlankCheck("sourceType", req.getSourceType())
.checkException();
return ResponseResult.result(companyOtherMoenyService.saveCompanyOtherMoney(req));
}
@RequestMapping(value = "/updateCompanyOtherMoney")
@ApiOperation(value = "修改公司其他余额", notes = "返回成功")
public ResponseResult<String> updateCompanyOtherMoney(@RequestBody CompanyOtherMoneyUpdateReqVo req) {
CheckerHelper.newInstance().notBlankCheck("compnayOtherMoneyId", req.getCompanyOtherMoneyId())
.checkException();
return ResponseResult.result(companyOtherMoenyService.updateCompanyOtherMoney(req));
}
@RequestMapping(value = "/delCompanyOtherMoney")
@ApiOperation(value = "删除公司其他余额", notes = "返回成功")
public ResponseResult<String> delCompanyOtherMoney(@RequestBody CompanyOtherMoneyDelReqVo req) {
CheckerHelper.newInstance().notBlankCheck("compnayOtherMoneyId", req.getCompanyOtherMoneyId())
.checkException();
companyOtherMoenyService.delCOmpanyOtherMoney(req);
return ResponseResult.resultAllowNull("");
}
}
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