修改注册判断银行卡

readme.md

@@ -268,19 +268,19 @@ companyVo.setContactPhone(reqVo.getContactPhone());
 
 # 有可能拥有此用户，而没有拥有公司，需要抛出异常
 ``` java
-companyReqVo.setId(userVo.getCompanyId());
-CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
+companySaveReqVo.setId(userVo.getCompanyId());
+CompanyVo companyVo = companyDaoImpl.load(companySaveReqVo,CompanyVo.class);
 ```
 
 # 函数内实体尽量在引用之前创建，而不是一起创建，代码可读性更好
 ``` java 
 
-CompanyVo companyReqVo = new CompanyVo();
+CompanyVo companySaveReqVo = new CompanyVo();
 CompanyBankCardVo companyBankCardReqVo = new CompanyBankCardVo();
 CompanyExtendVo companyExtendReqVo = new CompanyExtendVo();
 
-companyReqVo.setId(userVo.getCompanyId());
-CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
+companySaveReqVo.setId(userVo.getCompanyId());
+CompanyVo companyVo = companyDaoImpl.load(companySaveReqVo,CompanyVo.class);
 companyBankCardReqVo.setCompanyId(userVo.getCompanyId());
 CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(companyBankCardReqVo,CompanyBankCardVo.class);
 companyExtendReqVo.setId(userVo.getCompanyId());
@@ -296,9 +296,9 @@ if(StringHelper.isEmpty(userVo.getCompanyId())){
 }
 
 // 加载公司
-CompanyVo companyReqVo = new CompanyVo();
-companyReqVo.setId(userVo.getCompanyId());
-CompanyVo companyVo = companyDaoImpl.load(companyReqVo,CompanyVo.class);
+CompanyVo companySaveReqVo = new CompanyVo();
+companySaveReqVo.setId(userVo.getCompanyId());
+CompanyVo companyVo = companyDaoImpl.load(companySaveReqVo,CompanyVo.class);
 
 // 加载公司银行卡
 CompanyBankCardVo companyBankCardReqVo = new CompanyBankCardVo();

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

@@ -9,6 +9,7 @@ import com.pangding.web.vo.system.req.company.CompanyMoneyReqVo;
 import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
 import com.pangding.web.vo.system.res.company.CompanyMoneyTotalResVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import io.swagger.annotations.ApiOperation;
@@ -70,7 +71,7 @@ public class CompanyController {
 
     @RequestMapping(value = "findCompanyById")
     @ApiOperation(value = "找到公司信息", notes = "找到公司信息")
-    public ResponseResult findCompanyById(@RequestBody CompanyReqVo req){
+    public ResponseResult<CompanyResVo> findCompanyById(@RequestBody CompanyReqVo req){
         CheckerHelper.newInstance().notBlankCheck("", req.getId()).checkException();
         return ResponseResult.result(companyService.findCompanyById(req));
     }

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

@@ -9,6 +9,7 @@ import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -44,13 +45,16 @@ public class PangdingManagementController {
     }
 
     /**
-     * 根据请求的数据返回对应的供应商或是接口商列表
-     * @param reqVo
-     * @return
+     * 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
+     * @param reqVo 包含公司id的请求对象
+     * @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
      */
-    @RequestMapping(value = "/productOrInterface", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult productOrInterface(@RequestBody ProductOrInterfaceReqVo reqVo){
-        return ResponseResult.result(companyServiceImpl.productOrInterface(reqVo));
+    @RequestMapping(value = "/queryCompanyDetail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<CompanyResVo> queryCompanyDetail(@RequestBody CompanyReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("id",reqVo.getId())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.companyDetail(reqVo));
     }
 
     /**y
@@ -61,11 +65,21 @@ public class PangdingManagementController {
     @RequestMapping(value = "/pdDetail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<CompanyLoginResVo> pdGetDetail(@RequestBody CompanyGetReqVo reqVo){
         CheckerHelper.newInstance()
-                .notBlankCheck("companyId",reqVo.getId())
+                .notBlankCheck("id",reqVo.getId())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.pdGetDetail(reqVo));
     }
 
+    /**
+     * 根据请求的数据返回对应的供应商或是接口商列表
+     * @param reqVo
+     * @return
+     */
+    @RequestMapping(value = "/productOrInterface", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult productOrInterface(@RequestBody ProductOrInterfaceReqVo reqVo){
+        return ResponseResult.result(companyServiceImpl.productOrInterface(reqVo));
+    }
+
     /**y
      * 新增用户表（密码为123456），公司主表，公司扩展表，商户表，银行卡表（企业类型有，个人类型没有）
      * @param reqVo 公司以及公司扩展表信息

src/main/java/com/pangding/web/authority/dao/CompanyRuleDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CompanyRuleDao extends BaseDao {
+
+
+}

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

@@ -27,12 +27,12 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
 
         table.add(SELECT,"select a.*,b.invitation_code,b.withdraw_total_cash  from pd_company a inner join pd_company_extend b on a.id = b.id " +
                 "where 1=1 {WHERE} order by create_time desc")
-                .add("companyName","and company_name = ? ")
+                .add("companyName","and company_name LIKE concat('%', ?,'%')  ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")
                 .add("examineStatus","and examine_status = ?")
                 .add("companyId","and invitation_company_id = ? ")
-                .add("contactName","and contact_name = ? ")
+                .add("contactName","and contact_name LIKE concat('%', ?,'%') ")
                 .add("contactPhone","and contact_phone = ? ")
                 .add("status","and status = ? ")
                 .add("startDate","and create_time >= ? ")

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

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.CompanyRuleDao;
+import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyRuleDaoImpl extends BaseDaoImpl implements CompanyRuleDao {
+
+    @Override
+    protected void init() {
+        register(CompanyRuleVo.class);
+    }
+}

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

 package com.pangding.web.authority.feign;
 
-import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
+import com.pangding.web.authority.vo.reqvo.CompanySaveReqVo;
 import com.pangding.web.vo.system.req.DeviceReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +26,7 @@ public interface PayFeign {
      * @return
      */
     @RequestMapping(value="/register")
-    ResponseResult<CompanyReqVo> setCompanyInfo(@RequestBody CompanyReqVo req);
+    ResponseResult<CompanySaveReqVo> setCompanyInfo(@RequestBody CompanySaveReqVo req);
 
     @RequestMapping(value = "/setCompanyInfo", method = RequestMethod.POST)
     ResponseResult<SaveCompanyReqVo> setCompanyInfo1(@RequestBody SaveCompanyReqVo req);
@@ -55,7 +54,7 @@ public interface PayFeign {
      * @throws IOException
      */
     @RequestMapping(value = "/sign")
-    ResponseResult<CompanyReqVo> sign(@RequestBody CompanyReqVo req) throws IOException;
+    ResponseResult<CompanySaveReqVo> sign(@RequestBody CompanySaveReqVo req) throws IOException;
 
     /**
      * 绑定设备编号

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

@@ -6,6 +6,7 @@ import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -18,6 +19,20 @@ import java.util.List;
  */
 public interface CompanyService{
 
+    /**
+     * 分页查询公司信息
+     * @param reqVo 继承了分页对象
+     * @return 公司列表分页对象
+     */
+    PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo);
+
+    /**
+     * 查询公司详情 （审核）
+     * @param reqVo
+     * @return
+     */
+    CompanyResVo companyDetail(CompanyReqVo reqVo);
+
     /**
      * 公司个人实名认证
      * @param req
@@ -31,12 +46,7 @@ public interface CompanyService{
      */
     void updateCompanyStatus(CompanyVo companyVo);
 
-    /**
-     * 分页查询公司信息
-     * @param reqVo 继承了分页对象
-     * @return 公司列表分页对象
-     */
-    PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo);
+
 
     /**
      * 胖丁查询用户，公司和公司扩展表信息以及银行卡列表

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

@@ -109,7 +109,8 @@ public class FinanceServiceImpl implements FinanceService {
     public ResponseResult<CapitalFlowReqVo> applyWithdrawal(CapitalFlowReqVo req) {
         // 查找公司信息，提现信息
         CompanyResVo companyResVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);
-        if (!StringHelper.isEmpty(companyResVo)) {
+        CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(req.getBankId(), CompanyBankCardVo.class);
+        if (!StringHelper.isEmpty(companyResVo) && !StringHelper.isEmpty(companyBankCardVo)) {
             double withdrawFee = companyResVo.getWithdrawFee();
             double withdrawTotalCash = companyResVo.getWithdrawTotalCash();
             if (withdrawTotalCash < req.getOrderMoney()) {
@@ -127,7 +128,7 @@ public class FinanceServiceImpl implements FinanceService {
             CashWithdrawalReqVo cashWithdrawalReqVo = new CashWithdrawalReqVo();
             ObjectHelper.writeWithFrom(cashWithdrawalReqVo, capitalFlowVo);
             cashWithdrawalReqVo.setActualType(companyResVo.getWithdrawType());
-            cashWithdrawalReqVo.setBankCardType(companyResVo.getCompanyType());
+            cashWithdrawalReqVo.setBankCardType(companyBankCardVo.getType());
             companyConsumer.cashWithdrawal(cashWithdrawalReqVo);
             ResponseResult<CapitalFlowReqVo> responseResult = new ResponseResult<>();
             responseResult.setData(req);

src/main/java/com/pangding/web/authority/vo/reqvo/CompanyReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/CompanySaveReqVo.java

@@ -6,7 +6,7 @@ import java.util.List;
  * @Author zhangjinyao
  * @create 2019/6/2 18:10
  */
-public class CompanyReqVo {
+public class CompanySaveReqVo {
     /**
      * 公司id
      */

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

 package com.pangding.web.authority.vo.reqvo;
 
+import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
+
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/7/17 16:46
@@ -95,6 +99,8 @@ public class ExamineConfigReqVo {
      */
     private String userId;
 
+    private List<CompanyRuleVo> companyRuleVoList;
+
     public String getUserId() {
         return userId;
     }
@@ -238,4 +244,12 @@ public class ExamineConfigReqVo {
     public void setQrCodeType(Integer qrCodeType) {
         this.qrCodeType = qrCodeType;
     }
+
+    public List<CompanyRuleVo> getCompanyRuleVoList() {
+        return companyRuleVoList;
+    }
+
+    public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
+        this.companyRuleVoList = companyRuleVoList;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.pangding.web.vo.system.pd.authority.RoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
+import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 
 import java.util.List;
@@ -28,6 +29,8 @@ public class CompanyLoginResVo {
 
     private List<RoleVo> roleVoList;
 
+    private List<CompanyRuleVo> companyRuleVoList;
+
     public List<RoleVo> getRoleVoList() {
         return roleVoList;
     }
@@ -83,4 +86,12 @@ public class CompanyLoginResVo {
     public void setRoleVo(RoleVo roleVo) {
         this.roleVo = roleVo;
     }
+
+    public List<CompanyRuleVo> getCompanyRuleVoList() {
+        return companyRuleVoList;
+    }
+
+    public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
+        this.companyRuleVoList = companyRuleVoList;
+    }
 }