user/role/tright 6.13

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

@@ -34,7 +34,7 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> saveAuthority(@RequestBody AuthorityVo authorityVo){
+    public ResponseResult<List<AuthorityListByLevelResVo>> saveAuthority(@RequestBody AuthorityVo authorityVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("authorityName",authorityVo.getName())
                 .notBlankCheck("type",authorityVo.getType())
@@ -53,7 +53,7 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> updateAuthority(@RequestBody AuthorityVo authorityVo){
+    public ResponseResult<List<AuthorityListByLevelResVo>> updateAuthority(@RequestBody AuthorityVo authorityVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("authorityName",authorityVo.getName())
                 .notBlankCheck("type",authorityVo.getType())

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.service.DataService;
+import com.pangding.web.authority.vo.reqvo.SaveDataReqVo;
+import com.pangding.web.authority.vo.resvo.FindResVo;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:32
+ */
+@RestController
+@RequestMapping(value = "/data")
+public class DataController {
+    @Autowired
+    DataService dataServiceImpl;
+
+    @PostMapping(value = "/save", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult save(@RequestBody FindResVo reqVo){
+        dataServiceImpl.save(reqVo);
+        return new ResponseResult();
+    }
+}

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

@@ -39,6 +39,7 @@ public class RoleController {
         CheckerHelper.newInstance()
                 .notBlankCheck("roleName",webRoleReqVo.getName())
                 .notBlankCheck("remark",webRoleReqVo.getRemark())
+                .notBlankCheck("companyId",webRoleReqVo.getCompanyId())
                 .checkException();
         return ResponseResult.result(roleServiceImpl.saveRole(webRoleReqVo));
     }

src/main/java/com/pangding/web/authority/feign/DataFeign.java

+package com.pangding.web.authority.feign;
+
+import com.pangding.web.authority.vo.reqvo.FindReqVo;
+import com.pangding.web.authority.vo.resvo.FindResVo;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:10
+ */
+@FeignClient(value = "pd-data-old")
+@RequestMapping(value = "data")
+public interface DataFeign {
+    @RequestMapping(value = "find")
+    ResponseResult<List<FindResVo>> find(@RequestBody FindReqVo reqVo);
+}

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

@@ -19,7 +19,7 @@ public interface AuthorityService {
      * @param authorityVo authorityVo对象
      * @return 用户id
      */
-    String save(AuthorityVo authorityVo);
+    List<AuthorityListByLevelResVo> save(AuthorityVo authorityVo);
 
     /**
      * 更新authorityVo对象数据
@@ -27,7 +27,7 @@ public interface AuthorityService {
      * @param authorityVo authorityVo对象
      * @return 用户id
      */
-    String update(AuthorityVo authorityVo);
+    List<AuthorityListByLevelResVo> update(AuthorityVo authorityVo);
 
     /**
      * 通过权限表主键获取authorityVo对象

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

+package com.pangding.web.authority.service;
+
+import com.pangding.web.authority.vo.reqvo.SaveDataReqVo;
+import com.pangding.web.authority.vo.resvo.FindResVo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:45
+ */
+public interface DataService {
+    void save(FindResVo reqVo);
+}

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

@@ -45,19 +45,22 @@ public class AuthorityServiceImpl implements AuthorityService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String save(AuthorityVo authorityVo) {
-        this.checkValid(authorityVo);
+    public List<AuthorityListByLevelResVo> save(AuthorityVo authorityVo) {
+        /*this.checkValid(authorityVo);*/
         if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
             authorityVo.setPid("");
         }
         afterPlus(authorityVo);
         authorityVo.setId(StringHelper.getNewID());
         authorityDao.create(authorityVo);
-        return authorityVo.getId();
+
+        AuthorityListReqVo reqVo = new AuthorityListReqVo();
+        reqVo.setLevelOne("levelOne");
+        return this.getListByLevel(reqVo);
     }
 
     /**
-     * 检查权限排序是否重复
+     * 将权限新排序后面所有的权限排序+1
      * @param authorityVo 权限对象
      */
     private void afterPlus(AuthorityVo authorityVo){
@@ -78,6 +81,23 @@ public class AuthorityServiceImpl implements AuthorityService {
         }
     }
 
+    private void afterSub(AuthorityVo authorityVo){
+        AuthorityGetReqVo getReqVo = new AuthorityGetReqVo();
+        getReqVo.setId(authorityVo.getId());
+        AuthorityVo authorityVo1 = authorityDao.load(getReqVo,AuthorityVo.class);
+        if (authorityVo1 != null){
+            AuthorityAfterReqVo afterReqVo = new AuthorityAfterReqVo();
+            ObjectHelper.writeWithFrom(afterReqVo,authorityVo);
+            List<AuthorityVo> authorityVoList = authorityDao.after(afterReqVo);
+            for (AuthorityVo authorityVo2:authorityVoList) {
+                String sort = authorityVo2.getSort();
+                String newSort = (Integer.parseInt(sort)-1) + "";
+                authorityVo2.setSort(newSort);
+                authorityDao.update(authorityVo2);
+            }
+        }
+    }
+
     /**
      * 更新authorityVo对象数据
      *
@@ -86,14 +106,17 @@ public class AuthorityServiceImpl implements AuthorityService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String update(AuthorityVo authorityVo) {
-        this.checkValid(authorityVo);
-        if (null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()){
+    public List<AuthorityListByLevelResVo> update(AuthorityVo authorityVo) {
+        /*this.checkValid(authorityVo);*/
+        if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
             authorityVo.setPid("");
         }
+        afterSub(authorityVo);
         afterPlus(authorityVo);
         authorityDao.update(authorityVo);
-        return authorityVo.getId();
+        AuthorityListReqVo reqVo = new AuthorityListReqVo();
+        reqVo.setLevelOne("levelOne");
+        return this.getListByLevel(reqVo);
     }
 
     /**
@@ -146,6 +169,14 @@ public class AuthorityServiceImpl implements AuthorityService {
     @Transactional(rollbackFor = Exception.class)
     public void deleteAuthorityById(WebAuthorityReqVo reqVo) {
 
+        /*将该权限排序后的权限排序-1*/
+        AuthorityGetReqVo getReqVo = new AuthorityGetReqVo();
+        getReqVo.setId(reqVo.getId());
+        AuthorityVo authority = authorityDao.load(getReqVo,AuthorityVo.class);
+        if (null != authority){
+            afterSub(authority);
+        }
+
         AuthorityGetReqVo reqVo1 = new AuthorityGetReqVo();
         reqVo1.setPid(reqVo.getId());
         List<AuthorityVo> childList = authorityDao.loadList(reqVo1,AuthorityVo.class);
@@ -187,6 +218,12 @@ public class AuthorityServiceImpl implements AuthorityService {
         for (AuthorityVo authorityVo:authorityVoList) {
             WebAuthorityResVo resVo = new WebAuthorityResVo();
             ObjectHelper.writeWithFrom(resVo,authorityVo);
+            if (null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()){
+                AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
+                authorityGetReqVo.setId(authorityVo.getPid());
+                AuthorityVo parent = authorityDao.load(authorityGetReqVo,AuthorityVo.class);
+                resVo.setParentName(parent.getName());
+            }
             webAuthorityResVoList.add(resVo);
         }
         ObjectHelper.writeWithFrom(webAuthorityResVoPageSizeData,authorityVoPageSizeData);

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

@@ -558,7 +558,9 @@ public class CompanyServiceImpl implements CompanyService{
         reqVo1.setId(reqVo.getCompanyId());
         CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo1,CompanyExtendVo.class);
         if (null == companyExtendVo){
-            throw new CodeException("暂无公司扩展表信息");
+            companyExtendVo = new CompanyExtendVo();
+            companyExtendVo.setId(reqVo.getCompanyId());
+            companyExtendDaoImpl.save(companyExtendVo);
         }
         String url = companyExtendVo.getQrCodeUrl();
         if (null != url && !url.isEmpty() && reqVo.getSelect() == 1){

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

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.CompanyBankCardDao;
+import com.pangding.web.authority.dao.CompanyDao;
+import com.pangding.web.authority.dao.CompanyExtendDao;
+import com.pangding.web.authority.dao.UserDao;
+import com.pangding.web.authority.feign.DataFeign;
+import com.pangding.web.authority.service.DataService;
+import com.pangding.web.authority.vo.*;
+import com.pangding.web.authority.vo.reqvo.*;
+import com.pangding.web.authority.vo.resvo.FindResVo;
+import com.yanzuoguang.util.exception.CodeException;
+import com.yanzuoguang.util.helper.StringHelper;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:45
+ */
+@Service
+public class DataServiceImpl implements DataService {
+    @Autowired
+    private CompanyDao companyDaoImpl;
+    @Autowired
+    private UserDao userDaoImpl;
+    @Autowired
+    private CompanyExtendDao companyExtendDaoImpl;
+    @Autowired
+    private CompanyBankCardDao companyBankCardDaoImpl;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FindResVo reqVo) {
+
+        TyyCompanyVo tyyCompanyVo = reqVo.getTyyCompanyVo();
+        TyyCompanyExtendVo tyyCompanyExtendVo = reqVo.getTyyCompanyExtendVo();
+        EnterpriseVo enterpriseVo = reqVo.getEnterpriseVo();
+        List<EnterpriseBankVo> enterpriseBankVoList = reqVo.getEnterpriseBankVoList();
+
+        /*保存公司主表*/
+        CompanyVo companyVo = new CompanyVo();
+        companyVo.setId(tyyCompanyVo.getId());
+        companyVo.setPid(tyyCompanyVo.getPid());
+        companyVo.setInvitationCompanyId(tyyCompanyVo.getInvatationId());
+        companyVo.setNature(tyyCompanyVo.getCompanyType());
+        if (tyyCompanyVo.getCompanyType() == 1 || tyyCompanyVo.getCompanyType() == 2){
+            companyVo.setCompanyType(1);
+        }else if (tyyCompanyVo.getCompanyType() == 3){
+            companyVo.setCompanyType(0);
+        }
+        companyVo.setCompanyName(tyyCompanyVo.getCompanyName());
+        companyVo.setAddress(tyyCompanyVo.getCompanyAddress());
+        companyVo.setBusinessLicenseCode(tyyCompanyVo.getCompanyCardNo());
+        companyVo.setContactName(tyyCompanyVo.getContactName());
+        companyVo.setContactCode(tyyCompanyVo.getContactNo());
+        companyVo.setContactPhone(tyyCompanyVo.getContactTel());
+        companyVo.setStatus(tyyCompanyVo.getStatus());
+        companyVo.setCreateTime(tyyCompanyVo.getCreateTime());
+        companyVo.setExamineStatus(Integer.parseInt(enterpriseVo.getExamine()));
+        companyVo.setCompanyAttribute(Integer.parseInt(enterpriseVo.getUsertype()));
+        if (null != tyyCompanyExtendVo ){
+            companyVo.setElectromicAgreementCode(tyyCompanyExtendVo.getCode());
+            companyVo.setSigningStatus(tyyCompanyExtendVo.getStatus());
+        }
+        CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
+        companyGetReqVo.setId(companyVo.getId());
+        CompanyVo companyVo1 = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
+        if (null == companyVo1){
+            companyDaoImpl.create(companyVo);
+        }
+
+        /*保存用户表*/
+        UserVo userVo = new UserVo();
+        userVo.setId(StringHelper.getNewID());
+        userVo.setCompanyId(enterpriseVo.getId());
+        userVo.setAccount(enterpriseVo.getAccount());
+        userVo.setPassword(enterpriseVo.getPasswd());
+        userVo.setRemark(enterpriseVo.getPlainPassword());
+        userVo.setName(tyyCompanyVo.getContactName());
+        userVo.setPhone(tyyCompanyVo.getContactTel());
+        userVo.setCreateTime(tyyCompanyVo.getCreateTime());
+        userVo.setEmail(enterpriseVo.getEmail());
+        UserGetReqVo userGetReqVo = new UserGetReqVo();
+        userGetReqVo.setAccount(userVo.getAccount());
+        UserVo userVo1 = userDaoImpl.load(userGetReqVo,UserVo.class);
+        if (null == userVo1){
+            userDaoImpl.create(userVo);
+        }
+
+        /*保存公司扩展表*/
+        CompanyExtendVo companyExtendVo = new CompanyExtendVo();
+        companyExtendVo.setId(tyyCompanyVo.getId());
+        companyExtendVo.setQrCodeUrl(enterpriseVo.getQrcodepath());
+        companyExtendVo.setQrCode(enterpriseVo.getQrcodesrc());
+        companyExtendVo.setInvitationCode(enterpriseVo.getInvitationCode());
+        companyExtendVo.setDivedeStatus(Integer.parseInt(enterpriseVo.getIsShare()));
+        if (null != tyyCompanyExtendVo ){
+            companyExtendVo.setWithdrawTotalCash(tyyCompanyExtendVo.getMoney());
+        }
+        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
+        companyExtendGetReqVo.setId(companyExtendVo.getId());
+        CompanyExtendVo companyExtendVo1 = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class);
+        if (null == companyExtendVo1){
+            companyExtendDaoImpl.create(companyExtendVo);
+        }
+
+        /*保存银行卡表*/
+        for (EnterpriseBankVo enterpriseBankVo:enterpriseBankVoList) {
+            CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
+            companyBankCardVo.setId(enterpriseBankVo.getId());
+            companyBankCardVo.setName(enterpriseBankVo.getName());
+            companyBankCardVo.setBankCardCode(enterpriseBankVo.getBanknum());
+            companyBankCardVo.setBankName(enterpriseBankVo.getBankname());
+            companyBankCardVo.setType(enterpriseBankVo.getType());
+            companyBankCardVo.setCompanyId(enterpriseBankVo.getEnterpriseid());
+            companyBankCardVo.setBankAddress(enterpriseBankVo.getAddr());
+            companyBankCardVo.setPhone(enterpriseBankVo.getPhone());
+            companyBankCardVo.setIdCard(enterpriseBankVo.getIdcard());
+            companyBankCardVo.setBankCode(enterpriseBankVo.getUnionBank());
+            companyBankCardVo.setStatus(enterpriseBankVo.getBankStatus());
+            companyBankCardVo.setBindingCode(enterpriseBankVo.getBindId());
+            companyBankCardVo.setBindingTime(enterpriseBankVo.getBindDate());
+            CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
+            companyBankCardGetReqVo.setId(companyBankCardVo.getId());
+            CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
+            if (null == companyBankCardVo1){
+                companyBankCardDaoImpl.create(companyBankCardVo);
+            }
+        }
+    }
+}

src/main/java/com/pangding/web/authority/vo/CompanyVo.java

@@ -27,7 +27,7 @@ public class CompanyVo extends BaseVo implements InitDao {
     private String companyName;
 
     @TableAnnotation("company_type")
-    private int companyType;
+    private Integer companyType;
 
     @TableAnnotation("business_license_code")
     private String businessLicenseCode;
@@ -35,7 +35,7 @@ public class CompanyVo extends BaseVo implements InitDao {
     private String address;
 
     @TableAnnotation("company_attribute")
-    private int companyAttribute;
+    private Integer companyAttribute;
 
     @TableAnnotation("contact_name")
     private String contactName;
@@ -50,9 +50,9 @@ public class CompanyVo extends BaseVo implements InitDao {
     private String electromicAgreementCode;
 
     @TableAnnotation("signing_status")
-    private int signingStatus;
+    private Integer signingStatus;
 
-    private int status;
+    private Integer status;
 
     @TableAnnotation("create_time")
     private String createTime;
@@ -60,27 +60,27 @@ public class CompanyVo extends BaseVo implements InitDao {
     @TableAnnotation("update_time")
     private String updateTime;
 
-    private int nature;
+    private Integer nature;
 
     @TableAnnotation("product_or_interface")
-    private int productOrInterface;
+    private Integer productOrInterface;
 
     @TableAnnotation("examine_status")
-    private int examineStatus;
+    private Integer examineStatus;
 
-    public int getExamineStatus() {
+    public Integer getExamineStatus() {
         return examineStatus;
     }
 
-    public void setExamineStatus(int examineStatus) {
+    public void setExamineStatus(Integer examineStatus) {
         this.examineStatus = examineStatus;
     }
 
-    public int getProductOrInterface() {
+    public Integer getProductOrInterface() {
         return productOrInterface;
     }
 
-    public void setProductOrInterface(int productOrInterface) {
+    public void setProductOrInterface(Integer productOrInterface) {
         this.productOrInterface = productOrInterface;
     }
 
@@ -116,11 +116,11 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.companyName = companyName;
     }
 
-    public int getCompanyType() {
+    public Integer getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(int companyType) {
+    public void setCompanyType(Integer companyType) {
         this.companyType = companyType;
     }
 
@@ -140,11 +140,11 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.address = address;
     }
 
-    public int getCompanyAttribute() {
+    public Integer getCompanyAttribute() {
         return companyAttribute;
     }
 
-    public void setCompanyAttribute(int companyAttribute) {
+    public void setCompanyAttribute(Integer companyAttribute) {
         this.companyAttribute = companyAttribute;
     }
 
@@ -180,19 +180,19 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.electromicAgreementCode = electromicAgreementCode;
     }
 
-    public int getSigningStatus() {
+    public Integer getSigningStatus() {
         return signingStatus;
     }
 
-    public void setSigningStatus(int signingStatus) {
+    public void setSigningStatus(Integer signingStatus) {
         this.signingStatus = signingStatus;
     }
 
-    public int getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(int status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
@@ -212,11 +212,11 @@ public class CompanyVo extends BaseVo implements InitDao {
         this.updateTime = updateTime;
     }
 
-    public int getNature() {
+    public Integer getNature() {
         return nature;
     }
 
-    public void setNature(int nature) {
+    public void setNature(Integer nature) {
         this.nature = nature;
     }
 

src/main/java/com/pangding/web/authority/vo/EnterpriseBankVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:22
+ */
+public class EnterpriseBankVo extends BaseVo {
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 卡号
+     */
+    private String banknum;
+
+    /**
+     * 开户行名称
+     */
+    private String bankname;
+
+    /**
+     * 账户类型   1个人  2 公司
+     */
+    private Integer type;
+
+    /**
+     * 商户ID
+     */
+    private String enterpriseid;
+
+    /**
+     * 所在省
+     */
+    private String province;
+
+    /**
+     * 省编码
+     */
+    private String provincecode;
+
+    /**
+     * 所在市
+     */
+    private String city;
+
+    /**
+     * 市编码
+     */
+    private String citycode;
+
+    /**
+     * 具体地址
+     */
+    private String addr;
+
+    /**
+     * 银行预留电话
+     */
+    private String phone;
+
+    /**
+     * 身份证
+     */
+    private String idcard;
+
+    /**
+     * 支付行号， 12 位数字
+     */
+    private String unionBank;
+
+    /**
+     * 提现方式,默认T1
+     */
+    private String applyMoneyType;
+
+    /**
+     * 绑定状态 0:未绑定 1: 已绑定 2：绑定失败 3:绑定解除
+     */
+    @TableAnnotation("bank_status")
+    private Integer bankStatus;
+
+    /**
+     * 绑定流水号
+     */
+    @TableAnnotation("bind_id")
+    private String bindId;
+
+    /**
+     * 绑定时间
+     */
+    @TableAnnotation("bind_date")
+    private String bindDate;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBanknum() {
+        return banknum;
+    }
+
+    public void setBanknum(String banknum) {
+        this.banknum = banknum;
+    }
+
+    public String getBankname() {
+        return bankname;
+    }
+
+    public void setBankname(String bankname) {
+        this.bankname = bankname;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getEnterpriseid() {
+        return enterpriseid;
+    }
+
+    public void setEnterpriseid(String enterpriseid) {
+        this.enterpriseid = enterpriseid;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getProvincecode() {
+        return provincecode;
+    }
+
+    public void setProvincecode(String provincecode) {
+        this.provincecode = provincecode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCitycode() {
+        return citycode;
+    }
+
+    public void setCitycode(String citycode) {
+        this.citycode = citycode;
+    }
+
+    public String getAddr() {
+        return addr;
+    }
+
+    public void setAddr(String addr) {
+        this.addr = addr;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
+
+    public String getUnionBank() {
+        return unionBank;
+    }
+
+    public void setUnionBank(String unionBank) {
+        this.unionBank = unionBank;
+    }
+
+    public String getApplyMoneyType() {
+        return applyMoneyType;
+    }
+
+    public void setApplyMoneyType(String applyMoneyType) {
+        this.applyMoneyType = applyMoneyType;
+    }
+
+    public Integer getBankStatus() {
+        return bankStatus;
+    }
+
+    public void setBankStatus(Integer bankStatus) {
+        this.bankStatus = bankStatus;
+    }
+
+    public String getBindId() {
+        return bindId;
+    }
+
+    public void setBindId(String bindId) {
+        this.bindId = bindId;
+    }
+
+    public String getBindDate() {
+        return bindDate;
+    }
+
+    public void setBindDate(String bindDate) {
+        this.bindDate = bindDate;
+    }
+}

src/main/java/com/pangding/web/authority/vo/RoleVo.java

@@ -20,6 +20,17 @@ public class RoleVo extends BaseVo {
 
     private String remark;
 
+    @TableAnnotation("company_id")
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
     public String getId() {
         return id;
     }

src/main/java/com/pangding/web/authority/vo/TyyCompanyExtendVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+import com.yanzuoguang.util.vo.BaseVo;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:24
+ */
+public class TyyCompanyExtendVo extends BaseVo {
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 二维码
+     */
+    @TableAnnotation("qr_code")
+    private String qrCode;
+
+    /**
+     * 二维码地址
+     */
+    @TableAnnotation("qr_coee_url")
+    private String qrCoeeUrl;
+
+    /**
+     * 支付密码
+     */
+    @TableAnnotation("pay_password")
+    private String payPassword;
+
+    /**
+     * 电子协议编号
+     */
+    private String code;
+
+    /**
+     * 签订结果 0 为签约  1 签约成功
+     */
+    private Integer status;
+
+    /**
+     * 可提现余额
+     */
+    private BigDecimal money;
+
+    /**
+     * 提现手续费
+     */
+    @TableAnnotation("payment_fee")
+    private Integer paymentFee;
+
+    /**
+     * 是否自动提现   0 自动  1 手动
+     */
+    @TableAnnotation("is_automatic")
+    private Integer isAutomatic;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCoeeUrl() {
+        return qrCoeeUrl;
+    }
+
+    public void setQrCoeeUrl(String qrCoeeUrl) {
+        this.qrCoeeUrl = qrCoeeUrl;
+    }
+
+    public String getPayPassword() {
+        return payPassword;
+    }
+
+    public void setPayPassword(String payPassword) {
+        this.payPassword = payPassword;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
+    public Integer getPaymentFee() {
+        return paymentFee;
+    }
+
+    public void setPaymentFee(Integer paymentFee) {
+        this.paymentFee = paymentFee;
+    }
+
+    public Integer getIsAutomatic() {
+        return isAutomatic;
+    }
+
+    public void setIsAutomatic(Integer isAutomatic) {
+        this.isAutomatic = isAutomatic;
+    }
+}

src/main/java/com/pangding/web/authority/vo/TyyCompanyVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+import com.yanzuoguang.util.vo.BaseVo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:24
+ */
+public class TyyCompanyVo extends BaseVo {
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 父级商户(集团、公司)
+     */
+    private String pid;
+
+    /**
+     * 邀请商户
+     */
+    @TableAnnotation("invatation_id")
+    private String invatationId;
+
+    /**
+     * 性质（1.集团、2.公司、3.个人）
+     */
+    @TableAnnotation("company_type")
+    private Integer companyType;
+
+    /**
+     * 名称
+     */
+    @TableAnnotation("company_name")
+    private String companyName;
+
+    /**
+     * 分润级别（联盟商等级），对应了一个分润规则
+     */
+    @TableAnnotation("company_level")
+    private String companyLevel;
+
+    /**
+     * 地址
+     */
+    @TableAnnotation("company_address")
+    private String companyAddress;
+
+    /**
+     * 营业执照编号
+     */
+    @TableAnnotation("company_card_no")
+    private String companyCardNo;
+
+    /**
+     * 联系人名称
+     */
+    private String contactName;
+
+    /**
+     * 联系人证件类型
+     */
+    private Integer contactType;
+
+    /**
+     * 联系人证件号
+     */
+    private String contactNo;
+
+    /**
+     * 联系人电话
+     */
+    private String contactTel;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 邀请码
+     */
+    @TableAnnotation("invatation_code")
+    private String invatationCode;
+
+    /**
+     * 通错误信息
+     */
+    @TableAnnotation("error_message")
+    private String errorMessage;
+
+    /**
+     * 第三方id
+     */
+    @TableAnnotation("third_id")
+    private String thirdId;
+
+    @TableAnnotation("create_time")
+    private String createTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getInvatationId() {
+        return invatationId;
+    }
+
+    public void setInvatationId(String invatationId) {
+        this.invatationId = invatationId;
+    }
+
+    public Integer getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(Integer companyType) {
+        this.companyType = companyType;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyLevel() {
+        return companyLevel;
+    }
+
+    public void setCompanyLevel(String companyLevel) {
+        this.companyLevel = companyLevel;
+    }
+
+    public String getCompanyAddress() {
+        return companyAddress;
+    }
+
+    public void setCompanyAddress(String companyAddress) {
+        this.companyAddress = companyAddress;
+    }
+
+    public String getCompanyCardNo() {
+        return companyCardNo;
+    }
+
+    public void setCompanyCardNo(String companyCardNo) {
+        this.companyCardNo = companyCardNo;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public Integer getContactType() {
+        return contactType;
+    }
+
+    public void setContactType(Integer contactType) {
+        this.contactType = contactType;
+    }
+
+    public String getContactNo() {
+        return contactNo;
+    }
+
+    public void setContactNo(String contactNo) {
+        this.contactNo = contactNo;
+    }
+
+    public String getContactTel() {
+        return contactTel;
+    }
+
+    public void setContactTel(String contactTel) {
+        this.contactTel = contactTel;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getInvatationCode() {
+        return invatationCode;
+    }
+
+    public void setInvatationCode(String invatationCode) {
+        this.invatationCode = invatationCode;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getThirdId() {
+        return thirdId;
+    }
+
+    public void setThirdId(String thirdId) {
+        this.thirdId = thirdId;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:13
+ */
+public class FindReqVo {
+    private String reqId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:44
+ */
+public class SaveDataReqVo {
+    private String reqId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+}

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

+package com.pangding.web.authority.vo.resvo;
+
+import com.pangding.web.authority.vo.EnterpriseBankVo;
+import com.pangding.web.authority.vo.EnterpriseVo;
+import com.pangding.web.authority.vo.TyyCompanyExtendVo;
+import com.pangding.web.authority.vo.TyyCompanyVo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/12 15:15
+ */
+public class FindResVo {
+    private String reqId;
+
+    private EnterpriseVo enterpriseVo;
+
+    private List<EnterpriseBankVo> enterpriseBankVoList;
+
+    private TyyCompanyVo tyyCompanyVo;
+
+    private TyyCompanyExtendVo tyyCompanyExtendVo;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public EnterpriseVo getEnterpriseVo() {
+        return enterpriseVo;
+    }
+
+    public void setEnterpriseVo(EnterpriseVo enterpriseVo) {
+        this.enterpriseVo = enterpriseVo;
+    }
+
+    public List<EnterpriseBankVo> getEnterpriseBankVoList() {
+        return enterpriseBankVoList;
+    }
+
+    public void setEnterpriseBankVoList(List<EnterpriseBankVo> enterpriseBankVoList) {
+        this.enterpriseBankVoList = enterpriseBankVoList;
+    }
+
+    public TyyCompanyVo getTyyCompanyVo() {
+        return tyyCompanyVo;
+    }
+
+    public void setTyyCompanyVo(TyyCompanyVo tyyCompanyVo) {
+        this.tyyCompanyVo = tyyCompanyVo;
+    }
+
+    public TyyCompanyExtendVo getTyyCompanyExtendVo() {
+        return tyyCompanyExtendVo;
+    }
+
+    public void setTyyCompanyExtendVo(TyyCompanyExtendVo tyyCompanyExtendVo) {
+        this.tyyCompanyExtendVo = tyyCompanyExtendVo;
+    }
+}

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

@@ -7,5 +7,13 @@ import com.pangding.web.authority.vo.AuthorityVo;
  * @create 2019/5/15 20:06
  */
 public class WebAuthorityResVo extends AuthorityVo {
+    private String parentName;
 
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
 }