user/role/tright 7.3

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

@@ -9,6 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/6/18 19:53
@@ -26,4 +29,30 @@ public class FinanceController {
                 .checkException();
         return ResponseResult.result(financeServiceImpl.withdrawal(reqVo));
     }
+
+    @PostMapping(value = "/test")
+    public List<List<Integer>> combinationSum(int[] candidates, int target) {
+        List<List<Integer>> resList = new ArrayList<>();
+        for (int i = 0; i < candidates.length; i++) {
+            List<Integer> list = method(candidates,target);
+            resList.add(list);
+        }
+        return resList;
+    }
+    private List<Integer> method(int[] candidates, int target){
+        List<Integer> list = new ArrayList<>();
+        for (int i = 0; i < candidates.length; i++) {
+            int res = target - candidates[i];
+            if (res < 0){
+                continue;
+            }else if (res == 0){
+                list.add(candidates[i]);
+            }else {
+                list.add(candidates[i]);
+                List<Integer> nextList = method(candidates,res);
+                list.addAll(nextList);
+            }
+        }
+        return list;
+    }
 }

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

@@ -273,4 +273,17 @@ public class PangdingManagementController {
                 .checkException();
         return ResponseResult.result(companyServiceImpl.myInvite(reqVo));
     }
+
+    /**
+     * 根据二维码源码获取公司数据
+     * @param reqVo 封装了二维码源码的请求对象
+     * @return
+     */
+    @RequestMapping(value = "/getCompanyByQrCode",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<CompanyVo> getCompanyByQrCode(@RequestBody GetCompanyByQrCodeReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("qrCode",reqVo.getQrCode())
+                .checkException();
+        return ResponseResult.result(companyServiceImpl.getCompanyByQrCode(reqVo));
+    }
 }

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

@@ -29,7 +29,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")
                 .add("examineStatus","and examine_status = ?")
-                .add("companyId","and pid = ? ");
+                .add("companyId","and invitation_company_id = ? ");
     }
 
     @Override

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

@@ -149,4 +149,11 @@ public interface CompanyService{
     PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo);
 
     String invitation(InvitationReqVo reqVo);
+
+    /**
+     * 根据二维码源码获取公司数据
+     * @param reqVo 封装了二维码源码的请求对象
+     * @return
+     */
+    CompanyVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo);
 }

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

@@ -189,7 +189,7 @@ public class CompanyServiceImpl implements CompanyService{
             companyReqVo.getBankList().add(companyBankReqVo);
         }
         /*注册*/
-        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        /*ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("获取失败，请重试");
         }
@@ -197,14 +197,15 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
-        companyVo1.setExamineStatus(companyVo.getExamineStatus());
-
+        companyVo1.setExamineStatus(companyVo.getExamineStatus());*/
+        /*以上先注释掉，之前要把下面两行代码修改*/
         /*保存公司主表*/
-        companyDao.create(companyVo1);
-        resVo.setCompanyId(companyVo1.getId());
+        companyDao.create(companyVo);
+        resVo.setCompanyId(companyVo.getId());
 
         /*保存银行卡表*/
-        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
+        /*之后要将companyReqVo.getBankList()改为res.getBankList()*/
+        List<CompanyBankReqVo> companyBankReqVoList = companyReqVo.getBankList();
         if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()){
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
@@ -218,7 +219,7 @@ public class CompanyServiceImpl implements CompanyService{
 
         /*保存公司扩展表*/
         CompanyExtendVo extendVo = new CompanyExtendVo();
-        extendVo.setId(companyVo1.getId());
+        extendVo.setId(companyVo.getId());
         String qrCode = DateHelper.getNow()
                 .replace("-","")
                 .replace(":","")
@@ -328,21 +329,23 @@ public class CompanyServiceImpl implements CompanyService{
         }
 
         /*注册服务验证验证码*/
-        ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
+        /*ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("验证失败，请重试");
-        }
+        }*/
 
         /*更新公司主表*/
-        CompanyReqVo res = (CompanyReqVo) result.getData();
+        /*CompanyReqVo res = (CompanyReqVo) result.getData();
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,res);
         companyVo1.setProductOrInterface(companyVo.getProductOrInterface());
-        companyVo1.setExamineStatus(companyVo.getExamineStatus());
-        companyDao.update(companyVo1);
+        companyVo1.setExamineStatus(companyVo.getExamineStatus());*/
+        /*以上先注释掉，之后下面一行需要由companyDao.update(companyVo)改为companyDao.update(companyVo1);*/
+        companyDao.update(companyVo);
 
         /*更新银行卡表*/
-        List<CompanyBankReqVo> companyBankReqVoList = res.getBankList();
+        /*之后以下需要由companyReqVo.getBankList()改为res.getBankList()*/
+        List<CompanyBankReqVo> companyBankReqVoList = companyReqVo.getBankList();
         if (null != companyBankReqVoList && !companyBankReqVoList.isEmpty()){
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             CompanyBankReqVo companyBankReqVo = companyBankReqVoList.get(0);
@@ -459,7 +462,7 @@ public class CompanyServiceImpl implements CompanyService{
         }
 
         /*此处需要调用第三方接口发送手机验证码，并修改数据库状态*/
-        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        /*CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
         ResponseResult result = payFeign.bindBack(companyBankReqVo);
         if (null == result || !"00".equals(result.getCode())){
@@ -469,7 +472,7 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo,resVo);
         companyBankCardVo.setIsDefault(reqVo.getIsDefault());
-        companyBankCardDao.update(companyBankCardVo);
+        companyBankCardDao.update(companyBankCardVo);*/
         return reqVo.getId();
     }
 
@@ -484,10 +487,10 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyBankCardVo bankCardVo = companyBankCardDao.load(reqVo,CompanyBankCardVo.class);
         CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo,bankCardVo);
-        ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
+        /*ResponseResult result = payFeign.unbindBankCard(companyBankReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("解绑失败，请重试");
-        }
+        }*/
         /*若删除的银行卡为默认银行卡，则需要设置其他一张卡为默认银行卡*/
         if (CompanyBankCardConstant.IS_DEFAULT.equals(bankCardVo.getIsDefault())){
             CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
@@ -535,7 +538,7 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
 
         /*此处应该将companyBankCardVo和verifyCode发送到第三方接口，获取到的返回值用于更新银行卡状态*/
-        CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
+        /*CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo,companyBankCardVo);
         companyBankReqVo.setValidateCode(reqVo.getVerifyCode());
         ResponseResult result = payFeign.bindBack(companyBankReqVo);
@@ -546,9 +549,10 @@ public class CompanyServiceImpl implements CompanyService{
         CompanyBankCardVo companyBankCardVo1 = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo1,resVo);
         companyBankCardVo1.setIsDefault(companyBankCardVo.getIsDefault());
-        companyBankCardDao.update(companyBankCardVo1);
+        companyBankCardDao.update(companyBankCardVo1);*/
 
-        return companyBankCardVo1;
+        /*return companyBankCardVo1;*/
+        return companyBankCardVo;
     }
 
     /**y
@@ -737,4 +741,26 @@ public class CompanyServiceImpl implements CompanyService{
     public String invitation(InvitationReqVo reqVo) {
         return pangdingPartnerServiceImpl.invitation(reqVo);
     }
+
+    /**
+     * 根据二维码源码获取公司数据
+     * @param reqVo 封装了二维码源码的请求对象
+     * @return
+     */
+    @Override
+    public CompanyVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo) {
+        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
+        companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
+        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class);
+        if (null == companyExtendVo){
+            throw new CodeException("未查询到对应公司数据");
+        }
+        CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
+        companyGetReqVo.setId(companyExtendVo.getId());
+        CompanyVo companyVo = companyDao.load(companyGetReqVo,CompanyVo.class);
+        if (null == companyVo){
+            throw new CodeException("未查询到对应公司数据");
+        }
+        return companyVo;
+    }
 }

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

@@ -108,16 +108,21 @@ public class RegisterServiceImpl implements RegisterService {
             throw new CodeException("注册编码错误");
         }
 
+        /*保存用户*/
         String companyId = StringHelper.getNewID();
         userVo.setPassword(StringHelper.md5(password));
         userVo.setId(StringHelper.getNewID());
         userVo.setRemark(password);
         userVo.setCompanyId(companyId);
         userDaoImpl.create(userVo);
+
+        /*保存公司*/
         CompanyVo companyVo = new CompanyVo();
         companyVo.setId(companyId);
         companyVo.setInvitationCompanyId(companyExtendVo.getId());
         companyVo.setCompanyType(registerUserReqVo.getCompanyType());
+        companyVo.setExamineStatus(0);
+        companyVo.setStatus(0);
         companyDaoImpl.create(companyVo);
 
         /*保存公司扩展表*/
@@ -162,7 +167,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
         companyGetReqVo.setId(reqVo.getId());
         CompanyVo company = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
-        CompanyReqVo companyReqVo = new CompanyReqVo();
+        /*CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo,reqVo);
         companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
         companyReqVo.setStatus(company.getStatus());
@@ -172,9 +177,12 @@ public class RegisterServiceImpl implements RegisterService {
         }
         CompanyReqVo resCompanyReqVo = (CompanyReqVo) result.getData();
 
-        /*更新公司表*/
+        *//*更新公司表*//*
         CompanyVo companyVo = new CompanyVo();
-        ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
+        ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);*/
+        /*以上内容先不调用,调用后，下面两行代码需要删掉*/
+        CompanyVo companyVo = new CompanyVo();
+        ObjectHelper.writeWithFrom(companyVo,company);
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);
 

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

@@ -11,6 +11,16 @@ public class CompanyExtendGetReqVo {
 
     private String id;
 
+    private String qrCode;
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
     public String getReqId() {
         return reqId;
     }

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

@@ -9,15 +9,15 @@ public class CompanyGetReqVo {
 
     private String id;
 
-    private int productOrInterface;
+    private Integer productOrInterface;
 
     private String companyName;
 
-    public int getProductOrInterface() {
+    public Integer getProductOrInterface() {
         return productOrInterface;
     }
 
-    public void setProductOrInterface(int productOrInterface) {
+    public void setProductOrInterface(Integer productOrInterface) {
         this.productOrInterface = productOrInterface;
     }
 

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/3 17:49
+ */
+public class GetCompanyByQrCodeReqVo {
+    private String reqId;
+
+    /**
+     * 二维码源码
+     */
+    private String qrCode;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+}