Commit 8b14df73 authored by tangf's avatar tangf

添加公司分润信息

parent de6a1139
......@@ -2,6 +2,7 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
......@@ -13,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 公司我的管理controller
* @author tangfang
......@@ -247,4 +250,10 @@ public class CompanyManagementController {
.checkException();
return ResponseResult.result(companyServiceImpl.invitation(reqVo));
}
}
@RequestMapping(value = "findCompanyDivideInfo")
public ResponseResult<List<CompanyDivideRuleVo>> findCompanyList(@RequestBody CompanyDivideReqVo req){
CheckerHelper.newInstance().notBlankCheck("companyIdList", req.getCompanyIdList()).checkException();
return ResponseResult.result(companyServiceImpl.findCompanyDivideInfo(req));
}
}
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.CompanyDivideReqVo;
import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -23,4 +25,6 @@ public interface CompanyDao extends BaseDao {
* @return
*/
PageSizeData<CompanyVo> getCompanyList(ListCompanyReqVo reqVo);
CompanyDivideRuleVo findCompanyDivideInfo(CompanyDivideReqVo req);
}
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyDao;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.CompanyDivideReqVo;
import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @Author zhangjinyao
* @create 2019/5/13 14:25
......@@ -16,6 +20,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
private static final String CHECK_PHONE = "CHECK_PHONE";
private static final String SELECT = "SELECT";
private static final String QUERY_COMPANY_DIVIDE = "QUERY_COMPANY_DIVIDE";
@Override
protected void init() {
......@@ -30,6 +35,11 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
.add("companyAttribute","and company_attribute = ? ")
.add("examineStatus","and examine_status = ?")
.add("companyId","and pid = ? ");
table.add(QUERY_COMPANY_DIVIDE, "select c.id as comanyId,c.company_name,ce.divide_status,cd.* from pd_company c " +
"left join pd_company_extend ce on c.id = ce.id left join pd_company_divide_rule cd on c.id = cd.company_id " +
"where c.examine_status = 1 ")
.add("companyId", "and c.id = ? ");
}
@Override
......@@ -41,4 +51,9 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
public PageSizeData<CompanyVo> getCompanyList(ListCompanyReqVo reqVo) {
return this.queryPage(CompanyVo.class,reqVo,SELECT,reqVo);
}
@Override
public CompanyDivideRuleVo findCompanyDivideInfo(CompanyDivideReqVo req){
return this.queryFirst(CompanyDivideRuleVo.class, QUERY_COMPANY_DIVIDE, req);
}
}
......@@ -2,6 +2,7 @@ package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
......@@ -149,4 +150,6 @@ public interface CompanyService{
PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo);
String invitation(InvitationReqVo reqVo);
List<CompanyDivideRuleVo> findCompanyDivideInfo(CompanyDivideReqVo req);
}
......@@ -25,6 +25,7 @@ import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.ArrayList;
import java.util.List;
......@@ -737,4 +738,17 @@ public class CompanyServiceImpl implements CompanyService{
public String invitation(InvitationReqVo reqVo) {
return pangdingPartnerServiceImpl.invitation(reqVo);
}
@Override
public List<CompanyDivideRuleVo> findCompanyDivideInfo(CompanyDivideReqVo req){
List<String> companyIdList = req.getCompanyIdList();
List<CompanyDivideRuleVo> companyDivideRuleVoList = new ArrayList<>();
for(int i = 0; i < companyIdList.size(); i++){
String companyId = companyIdList.get(i);
req.setCompanyId(companyId);
CompanyDivideRuleVo companyDivideRule = companyDao.findCompanyDivideInfo(req);
companyDivideRuleVoList.add(companyDivideRule);
}
return companyDivideRuleVoList;
}
}
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_company_divide_rule")
public class CompanyDivideRuleVo extends CompanyVo{
@TableAnnotation("id")
private String companyDivideId;
@TableAnnotation("company_id")
private String companyId;
@TableAnnotation("source_value")
private double sourceValue;
@TableAnnotation("real_source_value")
private double realSourceValue;
@TableAnnotation("source_explain")
private String sourceExplain;
@TableAnnotation("pass_value")
private double passValue;
@TableAnnotation("real_pass_value")
private double realPassValue;
@TableAnnotation("pass_explain")
private String passExplain;
@TableAnnotation("super_value")
private double superValue;
@TableAnnotation("real_super_value")
private double realSuperValue;
@TableAnnotation("super_explain")
private String superExplain;
private double fee;
@TableAnnotation("bonus_type")
private int bonusType;
@TableAnnotation("bonus_value")
private double bonusValue;
@TableAnnotation("real_bonus_value")
private double realBonusValue;
@TableAnnotation("bonus_explain")
private String bonusExlain;
@TableAnnotation("divide_status")
private int divideStatus;
public String getCompanyDivideId() {
return companyDivideId;
}
public void setCompanyDivideId(String companyDivideId) {
this.companyDivideId = companyDivideId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public double getSourceValue() {
return sourceValue;
}
public void setSourceValue(double sourceValue) {
this.sourceValue = sourceValue;
}
public double getRealSourceValue() {
return realSourceValue;
}
public void setRealSourceValue(double realSourceValue) {
this.realSourceValue = realSourceValue;
}
public String getSourceExplain() {
return sourceExplain;
}
public void setSourceExplain(String sourceExplain) {
this.sourceExplain = sourceExplain;
}
public double getPassValue() {
return passValue;
}
public void setPassValue(double passValue) {
this.passValue = passValue;
}
public double getRealPassValue() {
return realPassValue;
}
public void setRealPassValue(double realPassValue) {
this.realPassValue = realPassValue;
}
public String getPassExplain() {
return passExplain;
}
public void setPassExplain(String passExplain) {
this.passExplain = passExplain;
}
public double getSuperValue() {
return superValue;
}
public void setSuperValue(double superValue) {
this.superValue = superValue;
}
public double getRealSuperValue() {
return realSuperValue;
}
public void setRealSuperValue(double realSuperValue) {
this.realSuperValue = realSuperValue;
}
public String getSuperExplain() {
return superExplain;
}
public void setSuperExplain(String superExplain) {
this.superExplain = superExplain;
}
public double getFee() {
return fee;
}
public void setFee(double fee) {
this.fee = fee;
}
public int getBonusType() {
return bonusType;
}
public void setBonusType(int bonusType) {
this.bonusType = bonusType;
}
public double getBonusValue() {
return bonusValue;
}
public void setBonusValue(double bonusValue) {
this.bonusValue = bonusValue;
}
public double getRealBonusValue() {
return realBonusValue;
}
public void setRealBonusValue(double realBonusValue) {
this.realBonusValue = realBonusValue;
}
public String getBonusExlain() {
return bonusExlain;
}
public void setBonusExlain(String bonusExlain) {
this.bonusExlain = bonusExlain;
}
}
package com.pangding.web.authority.vo.reqvo;
import java.util.List;
public class CompanyDivideReqVo {
public String companyId;
private List<String> companyIdList;
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public List<String> getCompanyIdList() {
return companyIdList;
}
public void setCompanyIdList(List<String> companyIdList) {
this.companyIdList = companyIdList;
}
}
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