user/role/tright 6.19

在写胖丁伙伴

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

@@ -206,16 +206,16 @@ public class PangdingManagementController {
     }
 
     /**
-     * 仅将公司状态设置为12（停用）
+     * 修改公司审核状态
      * @param reqVo 封装了公司id 的请求对象
      * @return
      */
-    @RequestMapping(value = "/deleteCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult deleteCompany(@RequestBody DeleteCompanyReqVo reqVo){
+    @RequestMapping(value = "/updateExamine", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult updateExamine(@RequestBody UpdateExamineReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();
-        companyServiceImpl.deleteCompany(reqVo);
+        companyServiceImpl.updateExamine(reqVo);
         return new ResponseResult();
     }
 

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.service.PangdingPartnerService;
+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.MobileWithdrawalResVo;
+import com.pangding.web.authority.vo.resvo.WithdrawalResVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+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;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 15:26
+ */
+@RestController
+@RequestMapping(value = "/partner")
+public class PangdingPartnerController {
+    @Autowired
+    PangdingPartnerService pangdingPartnerServiceImpl;
+
+    /**
+     * 胖丁伙伴首页
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @PostMapping(value = "/home",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<HomeResVo> home(@RequestBody HomeReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(pangdingPartnerServiceImpl.home(reqVo));
+    }
+
+    /**
+     * 通过公司id获取该公司的可提现余额以及默认提现银行卡
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @PostMapping(value = "/withdrawal",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<MobileWithdrawalResVo> withdrawal(@RequestBody MobileWithdrawalReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .notBlankCheck("withdrawTotalCash",reqVo.getWithdrawTotalCash())
+                .checkException();
+        return ResponseResult.result(pangdingPartnerServiceImpl.withdrawal(reqVo));
+    }
+
+    @PostMapping(value = "/bankCardList",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<List<CompanyBankCardVo>> bankCardList(@RequestBody MobileBankCardListReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",reqVo.getCompanyId())
+                .checkException();
+        return ResponseResult.result(pangdingPartnerServiceImpl.bankCardList(reqVo));
+    }
+}

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

@@ -24,7 +24,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
 
         table.addExist(CHECK_PHONE,"contact_phone");
 
-        table.add(SELECT,"select * from pd_company where status <> '12' ")
+        table.add(SELECT,"select * from pd_company where 1=1 ")
                 .add("companyName","and company_name = ? ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")

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

@@ -64,11 +64,11 @@ public interface CompanyService{
     SaveCompanyResVo companySubmit(SaveCompanyReqVo reqVo);
 
     /**
-     * 仅将公司状态设置为12（停用）
+     * 修改公司审核状态
      * @param reqVo 封装了公司id 的请求对象
      * @return
      */
-    void deleteCompany(DeleteCompanyReqVo reqVo);
+    void updateExamine(UpdateExamineReqVo reqVo);
 
     /**
      * 保存银行卡信息，并调用第三方接口发送手机验证码

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

+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.MobileWithdrawalResVo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 16:49
+ */
+public interface PangdingPartnerService {
+    /**
+     * 胖丁伙伴首页
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    HomeResVo home(HomeReqVo reqVo);
+
+    /**
+     * 通过公司id获取该公司的可提现余额以及默认提现银行卡
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    MobileWithdrawalResVo withdrawal(MobileWithdrawalReqVo reqVo);
+
+    List<CompanyBankCardVo> bankCardList(MobileBankCardListReqVo reqVo);
+}

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

@@ -270,13 +270,18 @@ public class AuthorityServiceImpl implements AuthorityService {
             RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
             roleAuthorityGetReqVo.setRoleId(reqVo.getRoleId());
             List<RoleAuthorityVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo,RoleAuthorityVo.class);
-            List<String> authorityIdList = new ArrayList<>();
+            List<AuthorityVo> authorityVoList = new ArrayList<>();
             if (null != roleAuthorityVoList && !roleAuthorityVoList.isEmpty()){
                 for (RoleAuthorityVo roleAuthorityVo:roleAuthorityVoList) {
-                    authorityIdList.add(roleAuthorityVo.getAuthorityId());
+                    AuthorityGetReqVo getReqVo = new AuthorityGetReqVo();
+                    getReqVo.setId(roleAuthorityVo.getAuthorityId());
+                    AuthorityVo authorityVo = authorityDao.load(getReqVo,AuthorityVo.class);
+                    if (null != authorityVo){
+                        authorityVoList.add(authorityVo);
+                    }
                 }
             }
-            authorityListResVo.setAuthorityListByRole(authorityIdList);
+            authorityListResVo.setAuthorityListByRole(authorityVoList);
         }
 
         return authorityListResVo;

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

@@ -389,17 +389,17 @@ public class CompanyServiceImpl implements CompanyService{
     }
 
     /**
-     * 仅将公司状态设置为12（停用）
+     * 修改公司审核状态
      * @param reqVo 封装了公司id 的请求对象
      * @return
      */
     @Override
-    public void deleteCompany(DeleteCompanyReqVo reqVo) {
-        /*仅修改公司状态status，不删除数据*/
+    public void updateExamine(UpdateExamineReqVo reqVo) {
+
         CompanyGetReqVo getReqVo = new CompanyGetReqVo();
         getReqVo.setId(reqVo.getCompanyId());
         CompanyVo companyVo = companyDao.load(getReqVo,CompanyVo.class);
-        companyVo.setStatus(CompanyConstant.COMPANY_STATUS_STOP);
+        companyVo.setExamineStatus(reqVo.getExamineStatus());
         companyVo.setUpdateTime(DateHelper.getNow());
         companyDao.update(companyVo);
     }
@@ -590,6 +590,7 @@ public class CompanyServiceImpl implements CompanyService{
         int select = reqVo.getSelect();
         /*此处应调用微信接口传入qrCode和select获取qrCodeUrl*/
         QrCodeReqVo qrCodeReqVo = new QrCodeReqVo();
+        qrCodeReqVo.setReqId(reqVo.getReqId());
         /*临时二维码，超时时间30分钟*/
         SceneInfo sceneInfo = new SceneInfo();
         Scene scene = new Scene();

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

@@ -153,7 +153,7 @@ public class DataServiceImpl implements DataService {
             companyBankCardVo.setBindingCode(enterpriseBankVo.getBindId());
             companyBankCardVo.setBindingTime(enterpriseBankVo.getBindDate());
             if (flag){
-                companyBankCardVo.setIsDefault("1");
+                companyBankCardVo.setIsDefault(1);
                 flag = false;
             }
             CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();

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

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.dao.CompanyBankCardDao;
+import com.pangding.web.authority.dao.CompanyExtendDao;
+import com.pangding.web.authority.service.PangdingPartnerService;
+import com.pangding.web.authority.util.CompanyBankCardConstant;
+import com.pangding.web.authority.vo.CompanyBankCardVo;
+import com.pangding.web.authority.vo.CompanyExtendVo;
+import com.pangding.web.authority.vo.reqvo.*;
+import com.pangding.web.authority.vo.resvo.HomeResVo;
+import com.pangding.web.authority.vo.resvo.MobileWithdrawalResVo;
+import com.yanzuoguang.util.exception.CodeException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 16:49
+ */
+@Service
+public class PangdingPartnerServiceImpl implements PangdingPartnerService {
+    @Autowired
+    CompanyExtendDao companyExtendDaoImpl;
+    @Autowired
+    CompanyBankCardDao companyBankCardDaoImpl;
+
+    /**
+     * 胖丁伙伴首页
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @Override
+    public HomeResVo home(HomeReqVo reqVo) {
+        /*通过公司id到公司扩展表查询可提现余额*/
+        CompanyExtendGetReqVo getReqVo = new CompanyExtendGetReqVo();
+        getReqVo.setId(reqVo.getCompanyId());
+        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(getReqVo,CompanyExtendVo.class);
+        if (null == companyExtendVo){
+            throw new CodeException("未查到该公司数据");
+        }
+        /*返回对象*/
+        HomeResVo resVo = new HomeResVo();
+        resVo.setWithdrawTotalCash(companyExtendVo.getWithdrawTotalCash());
+        return resVo;
+    }
+
+    /**
+     * 通过公司id获取该公司的可提现余额以及默认提现银行卡
+     * @param reqVo 封装了公司id的请求对象
+     * @return
+     */
+    @Override
+    public MobileWithdrawalResVo withdrawal(MobileWithdrawalReqVo reqVo) {
+        MobileWithdrawalResVo resVo = new MobileWithdrawalResVo();
+        resVo.setCompanyId(reqVo.getCompanyId());
+        resVo.setWithdrawTotalCash(reqVo.getWithdrawTotalCash());
+        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+        getReqVo.setCompanyId(reqVo.getCompanyId());
+        getReqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+        CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(getReqVo,CompanyBankCardVo.class);
+        if (null == companyBankCardVo){
+            throw new CodeException("该公司暂无默认提现银行卡");
+        }
+        resVo.setCompanyBankCardVo(companyBankCardVo);
+        return resVo;
+    }
+
+    @Override
+    public List<CompanyBankCardVo> bankCardList(MobileBankCardListReqVo reqVo) {
+        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+        getReqVo.setCompanyId(reqVo.getCompanyId());
+        List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo,CompanyBankCardVo.class);
+        if (null == companyBankCardVoList || companyBankCardVoList.isEmpty()){
+            throw new CodeException("该公司暂无银行卡");
+        }
+        Collections.sort(companyBankCardVoList);
+        return companyBankCardVoList;
+    }
+}

src/main/java/com/pangding/web/authority/util/CompanyBankCardConstant.java

@@ -9,11 +9,11 @@ public class CompanyBankCardConstant {
      * 设置银行卡为默认卡
      * 值：1
      */
-    public static final String IS_DEFAULT = "1";
+    public static final Integer IS_DEFAULT = 1;
 
     /**
      * 不设置为默认卡
      * 值：0
      */
-    public static final String IS_NOT_DEFAULT = "0";
+    public static final Integer IS_NOT_DEFAULT = 0;
 }

src/main/java/com/pangding/web/authority/util/CompanyConstant.java

@@ -14,12 +14,6 @@ public class CompanyConstant {
      */
     public static final int COMPANY_TYPE_COMPANY = 1;
 
-    /**
-     * 公司状态 停用
-     * 值：12
-     */
-    public static final int COMPANY_STATUS_STOP = 12;
-
     /**
      * 供应商
      * 值：0

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @create 2019/5/16 14:17
  */
 @TableAnnotation("pd_company_bank_card")
-public class CompanyBankCardVo extends BaseVo {
+public class CompanyBankCardVo extends BaseVo implements Comparable<CompanyBankCardVo>{
     private String id;
 
     @TableAnnotation("bank_card_code")
@@ -47,7 +47,7 @@ public class CompanyBankCardVo extends BaseVo {
     private String bindingTime;
 
     @TableAnnotation("is_default")
-    private String isDefault;
+    private Integer isDefault;
 
     public String getPhone() {
         return phone;
@@ -57,11 +57,11 @@ public class CompanyBankCardVo extends BaseVo {
         this.phone = phone;
     }
 
-    public String getIsDefault() {
+    public Integer getIsDefault() {
         return isDefault;
     }
 
-    public void setIsDefault(String isDefault) {
+    public void setIsDefault(Integer isDefault) {
         this.isDefault = isDefault;
     }
 
@@ -162,4 +162,9 @@ public class CompanyBankCardVo extends BaseVo {
     public void setBindingTime(String bindingTime) {
         this.bindingTime = bindingTime;
     }
+
+    @Override
+    public int compareTo(CompanyBankCardVo o) {
+        return o.getIsDefault()-this.isDefault;
+    }
 }

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

@@ -11,13 +11,13 @@ public class CompanyBankCardGetReqVo {
 
     private String companyId;
 
-    private String isDefault;
+    private Integer isDefault;
 
-    public String getIsDefault() {
+    public Integer getIsDefault() {
         return isDefault;
     }
 
-    public void setIsDefault(String isDefault) {
+    public void setIsDefault(Integer isDefault) {
         this.isDefault = isDefault;
     }
 

src/main/java/com/pangding/web/authority/vo/reqvo/DeleteCompanyReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/HomeReqVo.java

@@ -2,9 +2,9 @@ package com.pangding.web.authority.vo.reqvo;
 
 /**
  * @Author zhangjinyao
- * @create 2019/5/31 19:55
+ * @create 2019/6/19 16:34
  */
-public class DeleteCompanyReqVo {
+public class HomeReqVo {
     private String reqId;
 
     private String companyId;

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 19:26
+ */
+public class MobileBankCardListReqVo {
+    private String reqId;
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 18:15
+ */
+public class MobileWithdrawalReqVo {
+    private BigDecimal withdrawTotalCash;
+
+    private String companyId;
+
+    public BigDecimal getWithdrawTotalCash() {
+        return withdrawTotalCash;
+    }
+
+    public void setWithdrawTotalCash(BigDecimal withdrawTotalCash) {
+        this.withdrawTotalCash = withdrawTotalCash;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}

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

@@ -8,6 +8,7 @@ import com.yanzuoguang.util.vo.BaseVo;
  * @create 2019/6/6 16:23
  */
 public class QrCodeReqVo extends BaseVo {
+    private String reqId;
     /**
      * 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒。
      */
@@ -25,6 +26,14 @@ public class QrCodeReqVo extends BaseVo {
      */
     private String ticket;
 
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
     public String getTicket() {
         return ticket;
     }

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

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/31 19:55
+ */
+public class UpdateExamineReqVo {
+    private String reqId;
+
+    private String companyId;
+
+    private Integer examineStatus;
+
+    public Integer getExamineStatus() {
+        return examineStatus;
+    }
+
+    public void setExamineStatus(Integer examineStatus) {
+        this.examineStatus = examineStatus;
+    }
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}

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

 package com.pangding.web.authority.vo.resvo;
 
+import com.pangding.web.authority.vo.AuthorityVo;
+
 import java.util.List;
 
 /**
@@ -9,7 +11,7 @@ import java.util.List;
 public class AuthorityListResVo {
     private List<AuthorityListByLevelResVo> authorityListByLevel;
 
-    private List<String> authorityListByRole;
+    private List<AuthorityVo> authorityListByRole;
 
     public List<AuthorityListByLevelResVo> getAuthorityListByLevel() {
         return authorityListByLevel;
@@ -19,11 +21,11 @@ public class AuthorityListResVo {
         this.authorityListByLevel = authorityListByLevel;
     }
 
-    public List<String> getAuthorityListByRole() {
+    public List<AuthorityVo> getAuthorityListByRole() {
         return authorityListByRole;
     }
 
-    public void setAuthorityListByRole(List<String> authorityListByRole) {
+    public void setAuthorityListByRole(List<AuthorityVo> authorityListByRole) {
         this.authorityListByRole = authorityListByRole;
     }
 }

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

+package com.pangding.web.authority.vo.resvo;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 16:39
+ */
+public class HomeResVo {
+
+    private BigDecimal withdrawTotalCash;
+
+    public BigDecimal getWithdrawTotalCash() {
+        return withdrawTotalCash;
+    }
+
+    public void setWithdrawTotalCash(BigDecimal withdrawTotalCash) {
+        this.withdrawTotalCash = withdrawTotalCash;
+    }
+}

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

+package com.pangding.web.authority.vo.resvo;
+
+import com.pangding.web.authority.vo.CompanyBankCardVo;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/19 18:05
+ */
+public class MobileWithdrawalResVo {
+    private BigDecimal withdrawTotalCash;
+
+    private CompanyBankCardVo companyBankCardVo;
+
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public BigDecimal getWithdrawTotalCash() {
+        return withdrawTotalCash;
+    }
+
+    public void setWithdrawTotalCash(BigDecimal withdrawTotalCash) {
+        this.withdrawTotalCash = withdrawTotalCash;
+    }
+
+    public CompanyBankCardVo getCompanyBankCardVo() {
+        return companyBankCardVo;
+    }
+
+    public void setCompanyBankCardVo(CompanyBankCardVo companyBankCardVo) {
+        this.companyBankCardVo = companyBankCardVo;
+    }
+}