user/role/tright 8.1

src/main/java/com/pangding/web/authority/controller/PangdingPartnerController.java

@@ -184,4 +184,17 @@ public class PangdingPartnerController {
                 .checkException();
         return ResponseResult.result(pangdingPartnerServiceImpl.invitation(reqVo));
     }
+
+    /**
+     * 邀请商家列表
+     * @param reqVo
+     * @return
+     */
+    @PostMapping(value = "/inviteMembers",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<InviteMembersResVo> inviteMembers(@RequestBody InviteMembersReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("invitationCompanyId",reqVo.getInvitationCompanyId())
+                .checkException();
+        return ResponseResult.result(pangdingPartnerServiceImpl.inviteMembers(reqVo));
+    }
 }

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -4,10 +4,7 @@ package com.pangding.web.authority.service;
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyResVo;
-import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
-import com.pangding.web.authority.vo.resvo.GetCompanyResVo;
-import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import com.pangding.web.authority.vo.resvo.*;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 

src/main/java/com/pangding/web/authority/service/PangdingPartnerService.java

@@ -2,10 +2,7 @@ package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.HomeResVo;
-import com.pangding.web.authority.vo.resvo.ManagementResVo;
-import com.pangding.web.authority.vo.resvo.MobileWithdrawalResVo;
-import com.pangding.web.authority.vo.resvo.PrecipitationResVo;
+import com.pangding.web.authority.vo.resvo.*;
 
 import java.util.List;
 
@@ -90,4 +87,11 @@ public interface PangdingPartnerService {
      * @return
      */
     String invitation(InvitationReqVo reqVo);
+
+    /**
+     * 邀请商家列表
+     * @param reqVo
+     * @return
+     */
+    InviteMembersResVo inviteMembers(InviteMembersReqVo reqVo);
 }

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

@@ -8,10 +8,7 @@ import com.pangding.web.authority.util.CompanyBankCardConstant;
 import com.pangding.web.authority.util.ShareCodeUtil;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.HomeResVo;
-import com.pangding.web.authority.vo.resvo.ManagementResVo;
-import com.pangding.web.authority.vo.resvo.MobileWithdrawalResVo;
-import com.pangding.web.authority.vo.resvo.PrecipitationResVo;
+import com.pangding.web.authority.vo.resvo.*;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -170,17 +167,12 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
         /*默认银行卡对象*/
         CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
         companyBankCardGetReqVo.setCompanyId(userVo.getCompanyId());
-        companyBankCardGetReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
-        CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
-        /*若没有默认银行卡，则取出数据库中该公司第一张银行卡*/
-        if (null == companyBankCardVo){
-            companyBankCardGetReqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
-            companyBankCardVo = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
-            if (null == companyBankCardVo){
-                throw new CodeException("未查询到该用户银行卡信息");
-            }
+        List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(companyBankCardGetReqVo,CompanyBankCardVo.class);
+
+        if (null != companyBankCardVoList && !companyBankCardVoList.isEmpty()){
+            Collections.sort(companyBankCardVoList);
+            resVo.setCompanyBankCardVoList(companyBankCardVoList);
         }
-        resVo.setCompanyBankCardVo(companyBankCardVo);
         return resVo;
     }
 
@@ -234,6 +226,8 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String invitation(InvitationReqVo reqVo) {
+
+        /*邀请码*/
         CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
         companyExtendGetReqVo.setId(reqVo.getCompanyId());
         CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo,CompanyExtendVo.class);
@@ -251,6 +245,20 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
             companyExtendVo.setInvitationCode(invitationCode);
             companyExtendDaoImpl.update(companyExtendVo);
         }
+
         return invitationCode;
     }
+
+    /**
+     * 邀请商家列表
+     * @param reqVo
+     * @return
+     */
+    @Override
+    public InviteMembersResVo inviteMembers(InviteMembersReqVo reqVo) {
+        InviteMembersResVo resVo = new InviteMembersResVo();
+        PageSizeData<CompanyVo> companyVoPageSizeData = companyDaoImpl.loadPage(reqVo,CompanyVo.class);
+        resVo.setCompanyVoPageSizeData(companyVoPageSizeData);
+        return resVo;
+    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/CompanyGetReqVo.java

@@ -13,6 +13,16 @@ public class CompanyGetReqVo {
 
     private String companyName;
 
+    private String invitationCode;
+
+    public String getInvitationCode() {
+        return invitationCode;
+    }
+
+    public void setInvitationCode(String invitationCode) {
+        this.invitationCode = invitationCode;
+    }
+
     public Integer getProductOrInterface() {
         return productOrInterface;
     }

src/main/java/com/pangding/web/authority/vo/reqvo/InvitationReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
 import com.yanzuoguang.util.vo.BaseVo;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 /**
  * @Author zhangjinyao
  * @create 2019/6/20 17:21
  */
-public class InvitationReqVo extends BaseVo {
+public class InvitationReqVo extends PageSizeData {
     private String reqId;
 
     private String companyId;

src/main/java/com/pangding/web/authority/vo/reqvo/InviteMembersReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+import com.yanzuoguang.util.vo.PageSizeData;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/8/1 14:56
+ */
+public class InviteMembersReqVo extends PageSizeData {
+    private String reqId;
+
+    private String invitationCompanyId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getInvitationCompanyId() {
+        return invitationCompanyId;
+    }
+
+    public void setInvitationCompanyId(String invitationCompanyId) {
+        this.invitationCompanyId = invitationCompanyId;
+    }
+}

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

+package com.pangding.web.authority.vo.resvo;
+
+import com.pangding.web.authority.vo.CompanyVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/8/1 11:16
+ */
+public class InviteMembersResVo {
+
+    private PageSizeData<CompanyVo> companyVoPageSizeData;
+
+    public PageSizeData<CompanyVo> getCompanyVoPageSizeData() {
+        return companyVoPageSizeData;
+    }
+
+    public void setCompanyVoPageSizeData(PageSizeData<CompanyVo> companyVoPageSizeData) {
+        this.companyVoPageSizeData = companyVoPageSizeData;
+    }
+}

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

@@ -4,6 +4,8 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/6/20 11:50
@@ -13,7 +15,7 @@ public class ManagementResVo {
 
     private CompanyVo companyVo;
 
-    private CompanyBankCardVo companyBankCardVo;
+    private List<CompanyBankCardVo> companyBankCardVoList;
 
     public UserVo getUserVo() {
         return userVo;
@@ -31,11 +33,11 @@ public class ManagementResVo {
         this.companyVo = companyVo;
     }
 
-    public CompanyBankCardVo getCompanyBankCardVo() {
-        return companyBankCardVo;
+    public List<CompanyBankCardVo> getCompanyBankCardVoList() {
+        return companyBankCardVoList;
     }
 
-    public void setCompanyBankCardVo(CompanyBankCardVo companyBankCardVo) {
-        this.companyBankCardVo = companyBankCardVo;
+    public void setCompanyBankCardVoList(List<CompanyBankCardVo> companyBankCardVoList) {
+        this.companyBankCardVoList = companyBankCardVoList;
     }
 }