修改分润时公司查询

src/main/java/com/pangding/web/authority/dao/impl/CompanyDivideRuleDaoImpl.java

@@ -16,7 +16,7 @@ public class CompanyDivideRuleDaoImpl extends BaseDaoImpl implements CompanyDivi
     protected void init() {
         register(CompanyDivideRuleVo.class);
 
-        table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name from pd_company_divide_rule cdr " +
+        table.add(QUERY_LIST, "select cdr.*,ce.divide_status,c.company_name,c.pid,c.invitation_company_id from pd_company_divide_rule cdr " +
                 "left join pd_company c on c.id = cdr.company_id " +
                 "left join pd_company_extend ce on c.id = ce.id where 1=1 ")
         .add("companyId"," and cdr.company_id = ?");

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -990,23 +990,6 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     public GetCompanyResVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo) {
-//        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-//        companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
-//        CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
-//        if (null != companyExtendVo) {
-//            CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
-//            companyGetReqVo.setId(companyExtendVo.getId());
-//            GetCompanyResVo companyVo = companyDao.load(companyGetReqVo, GetCompanyResVo.class);
-//            if (null != companyVo) {
-//                CompanyMsgReqVo companyMsgReqVo = new CompanyMsgReqVo();
-//                companyMsgReqVo.setCompanyId(companyVo.getId());
-//                companyMsgReqVo.setType(companyVo.getCompanyAttribute());
-//                List<GetCompanyMsgResVo> companyMsgVoList = companyMsgDao.findCompanyMsgList(companyMsgReqVo);
-//                companyVo.setMsgList(companyMsgVoList);
-//            }
-//            return companyVo;
-//        }
-
         CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
         companyCodeReqVo.setCodeCode(reqVo.getQrCode());
         CompanyCodeResVo companyCodeResVo = companyCodeDao.load(companyCodeReqVo, CompanyCodeResVo.class);
@@ -1036,6 +1019,21 @@ public class CompanyServiceImpl implements CompanyService {
             if (!StringHelper.isEmpty(companyDivideResVo)) {
                 companyDivideResVo.setCompanyChannelType(getCompanyReqVo.getCompanyChannelType());
                 companyDivideResVoList.add(companyDivideResVo);
+                if(!StringHelper.isEmpty(companyDivideResVo.getInvitationCompanyId())){
+                    getCompanyReqVo = new GetCompanyReqVo();
+                    getCompanyReqVo.setCompanyId(companyDivideResVo.getInvitationCompanyId());
+                    GetCompanyDivideResVo companyDivideResVo1 = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
+                    companyDivideResVo1.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_BONUS);
+                    companyDivideResVoList.add(companyDivideResVo1);
+                    if(!StringHelper.isEmpty(companyDivideResVo1) && !StringHelper.isEmpty(companyDivideResVo1.getPid())){
+                            getCompanyReqVo = new GetCompanyReqVo();
+                            getCompanyReqVo.setCompanyId(companyDivideResVo1.getPid());
+                            GetCompanyDivideResVo companyDivideResVo2 = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
+                            companyDivideResVo1.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_SUPER);
+                            companyDivideResVoList.add(companyDivideResVo2);
+                    }
+                }
+
             }
         }
         return companyDivideResVoList;

src/main/java/com/pangding/web/authority/vo/resvo/GetCompanyDivideResVo.java

 package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
+import io.swagger.annotations.ApiModelProperty;
 
 public class GetCompanyDivideResVo extends CompanyDivideRuleVo {
 
@@ -12,6 +13,11 @@ public class GetCompanyDivideResVo extends CompanyDivideRuleVo {
 
     private int companyChannelType;
 
+    @ApiModelProperty(notes = "邀请公司id")
+    private String invitationCompanyId;
+    @ApiModelProperty(notes = "上级公司id")
+    private String pid;
+
     public int getDivideStatus() {
         return divideStatus;
     }
@@ -45,4 +51,20 @@ public class GetCompanyDivideResVo extends CompanyDivideRuleVo {
     public void setCompanyChannelType(int companyChannelType) {
         this.companyChannelType = companyChannelType;
     }
+
+    public String getInvitationCompanyId() {
+        return invitationCompanyId;
+    }
+
+    public void setInvitationCompanyId(String invitationCompanyId) {
+        this.invitationCompanyId = invitationCompanyId;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
 }