user/role/tright 7.17

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

@@ -112,14 +112,12 @@ public class ComputerRegisterController {
                 .notBlankCheck("companyName",reqVo.getCompanyName())
                 .notBlankCheck("companyAddress",reqVo.getAddress())
                 .notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
-                .notNumberCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
                 .notBlankCheck("merchantName",reqVo.getMerchantName())
                 .notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
                 .notBlankCheck("contactName",reqVo.getContactName())
                 .notBlankCheck("contactCode",reqVo.getContactCode())
                 .checkIdCard("contactCode",reqVo.getContactCode())
                 .notBlankCheck("contactPhone",reqVo.getContactPhone())
-                .checkPhoneNo("contactPhone",reqVo.getContactPhone())
                 .notBlankCheck("bankName",reqVo.getBankName())
                 .notBlankCheck("bankCardCode",reqVo.getBankCardCode())
                 .notNumberCheck("bankCardCode",reqVo.getBankCardCode())

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

@@ -29,7 +29,7 @@ public class IndexController {
      * @return 可提现的金额
      */
     @PostMapping(value = "/withdrawCash", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<BigDecimal> withdrawCash(@RequestBody WithdrawCashReqVo reqVo){
+    public ResponseResult<Double> withdrawCash(@RequestBody WithdrawCashReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getId())
                 .checkException();

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

@@ -16,7 +16,7 @@ public interface IndexService {
      * @param reqVo 封装了公司id的请求对象
      * @return 可提现的金额
      */
-    BigDecimal getWithdrawCash(WithdrawCashReqVo reqVo);
+    Double getWithdrawCash(WithdrawCashReqVo reqVo);
 
     /**
      * 通过公司id获取该公司累积总收益

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

@@ -390,7 +390,7 @@ public class DataServiceImpl implements DataService {
             if (null != tyyOrderbackVo){
                 refundNum += tyyOrderbackVo.getRefundnum();
                 refundFee += tyyOrderbackVo.getRefundFee();
-                pdRefundMoney += tyyOrderbackVo.getReceiveMoney();
+                pdRefundMoney += tyyOrderbackVo.getReceiveMoney() == null ? 0 : tyyOrderbackVo.getReceiveMoney();
                 refundMoney += tyyOrderbackVo.getRefundMoney();
             }
         }

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

@@ -33,12 +33,12 @@ public class IndexServiceImpl implements IndexService {
      * @return 可提现的金额
      */
     @Override
-    public BigDecimal getWithdrawCash(WithdrawCashReqVo reqVo) {
+    public Double getWithdrawCash(WithdrawCashReqVo reqVo) {
         CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo,CompanyExtendVo.class);
         if (null == companyExtendVo){
             throw new CodeException("未查到该公司数据");
         }
-        BigDecimal cash = companyExtendVo.getWithdrawTotalCash();
+        Double cash = companyExtendVo.getWithdrawTotalCash();
         if (null == cash){
             throw new CodeException("暂无可提现余额信息");
         }

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

@@ -92,10 +92,13 @@ public class RegisterServiceImpl implements RegisterService {
         // 检查账户是否合法
         userServiceImpl.isValid(registerUserReqVo.getAccount());
 
-        UserVo userVo = new UserVo();
-        userVo.setAccount(registerUserReqVo.getAccount());
+        UserGetReqVo userGetReqVo = new UserGetReqVo();
+        userGetReqVo.setAccount(registerUserReqVo.getAccount());
         // 检查用户名是否存在
-        userServiceImpl.checkAccount(userVo);
+        UserVo userVoCheck = userDaoImpl.load(userGetReqVo,UserVo.class);
+        if (null != userVoCheck){
+            throw new CodeException("用户名"+registerUserReqVo.getAccount()+"已存在");
+        }
 
         /*通过私钥将rsa加密的密码解密*/
         String password = RSAUtils.decryptionByPrivateKey(registerUserReqVo.getPassword(),RsaConstant.privateKey);
@@ -111,6 +114,8 @@ public class RegisterServiceImpl implements RegisterService {
         }
 
         /*保存用户*/
+        UserVo userVo = new UserVo();
+        userVo.setAccount(registerUserReqVo.getAccount());
         String companyId = StringHelper.getNewID();
         userVo.setPassword(StringHelper.md5(password));
         userVo.setId(StringHelper.getNewID());
@@ -184,6 +189,8 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyVo companyVo = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyVo.setExamineStatus(0);
+        companyVo.setCompanyAttribute(resCompanyReqVo.getCompanyAttribution());
         companyDaoImpl.update(companyVo);
 
         /*跟新用户表添加联系方式*/
@@ -191,6 +198,7 @@ public class RegisterServiceImpl implements RegisterService {
         userReqVo.setCompanyId(reqVo.getId());
         UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
         userVo.setPhone(reqVo.getContactPhone());
+        userVo.setName(reqVo.getContactName());
         userDaoImpl.update(userVo);
 
         /*保存或更新商户表*/
@@ -203,6 +211,9 @@ public class RegisterServiceImpl implements RegisterService {
         req.setUserId(userVo.getId());
         req.setUsername(userVo.getAccount());
         req.setReqId(reqVo.getReqId());
+        req.setPhone(reqVo.getContactPhone());
+        req.setCreateTime(DateHelper.getNow());
+        req.setProductCompanyName(reqVo.getCompanyName());
         if (null == reqVo.getMerchantId() || "".equals(reqVo.getMerchantId())){
             req.setId(StringHelper.getNewID());
         }else {
@@ -254,6 +265,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyVo companyVo = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo,resCompanyReqVo);
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyVo.setExamineStatus(0);
         companyDaoImpl.update(companyVo);
 
         List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();
@@ -287,6 +299,7 @@ public class RegisterServiceImpl implements RegisterService {
         userReqVo.setCompanyId(reqVo.getId());
         UserVo userVo = userDaoImpl.load(userReqVo,UserVo.class);
         userVo.setPhone(reqVo.getContactPhone());
+        userVo.setName(reqVo.getContactName());
         userDaoImpl.update(userVo);
 
         /*保存或更新商户表*/
@@ -380,7 +393,7 @@ public class RegisterServiceImpl implements RegisterService {
             resVo.setMsg("公司基本信息未完善，跳转公司完善页面");
             return resVo;
         }
-        /*判断电子签约状态，若小于10，则跳转签约页面*/
+        /*判断电子签约状态，若不等于1，则跳转签约页面*/
         else if (companyVo.getSigningStatus() != CompanyConstant.COMPANY_STATUS_SIGN_success){
             resVo.setCode("04");
             resVo.setMsg("未签约，跳转签约页面");
@@ -509,6 +522,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo,companyVo);
         companyReqVo.setValidateCode(reqVo.getVerifyCode());
+        companyReqVo.setCompanyAttribution(reqVo.getCompanyAttribute());
         ResponseResult result = payFeign.setCompanyInfo(companyReqVo);
         if (null == result || !"00".equals(result.getCode())){
             throw new CodeException("保存商户失败，请重试");
@@ -519,6 +533,8 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
         companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyVo1.setCompanyAttribute(resCompanyReqVo.getCompanyAttribution());
+        companyVo1.setExamineStatus(0);
         companyDaoImpl.update(companyVo1);
         return reqVo.getVerifyCode();
     }
@@ -536,6 +552,7 @@ public class RegisterServiceImpl implements RegisterService {
         /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo,companyVo);
+        companyReqVo.setCompanyAttribution(companyVo.getCompanyAttribute());
         CompanyBankReqVo companyBankReqVo = new CompanyBankReqVo();
         ObjectHelper.writeWithFrom(companyBankReqVo,reqVo);
         companyBankReqVo.setId(StringHelper.getNewID());
@@ -551,6 +568,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyVo companyVo1 = new CompanyVo();
         ObjectHelper.writeWithFrom(companyVo1,resCompanyReqVo);
         companyVo1.setProductOrInterface(CompanyConstant.PRODUCT);
+        companyVo1.setExamineStatus(0);
         companyDaoImpl.update(companyVo1);
 
         List<CompanyBankReqVo> bankList = resCompanyReqVo.getBankList();

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
+import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.RoleService;
 import com.pangding.web.authority.vo.*;
@@ -50,6 +51,9 @@ public class RoleServiceImpl implements RoleService {
         this.checkNameExist(roleVo);
         webRoleReqVo.setId(StringHelper.getNewID());
 
+        if (CompanyConstant.PD_COMPANY_ID.equals(roleVo.getCompanyId())){
+            roleVo.setCompanyId("");
+        }
         roleDao.create(roleVo);
         List<String> authorityIds = webRoleReqVo.getAuthorityIds();
         if (authorityIds != null && !authorityIds.isEmpty()){

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

@@ -121,12 +121,22 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void checkAccount(UserVo userVo) {
-        userDao.checkAccount(userVo);
+        UserGetReqVo userGetReqVo = new UserGetReqVo();
+        userGetReqVo.setAccount(userVo.getAccount());
+        UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
+        if (null != userVo1){
+            throw new CodeException("用户名"+userVo.getAccount()+"已存在");
+        }
     }
 
     @Override
     public void checkPhone(UserVo userVo) {
-        userDao.checkPhone(userVo);
+        UserGetReqVo userGetReqVo = new UserGetReqVo();
+        userGetReqVo.setPhone(userVo.getPhone());
+        UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
+        if (null != userVo1){
+            throw new CodeException("手机号"+userVo.getPhone()+"已存在");
+        }
     }
 
     @Override

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

@@ -157,6 +157,11 @@ public class CompanyConstant {
      */
     public static final int COMPANY_STATUS_SIGN_success = 1;
 
+    /**
+     * 胖丁公司id
+     */
+    public static final String PD_COMPANY_ID = "10001";
+
 
 
 }

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

@@ -18,7 +18,7 @@ public class CompanyExtendVo extends BaseVo {
     private String qrCode;
 
     @TableAnnotation("QR_code_type")
-    private int qrCodeType;
+    private Integer qrCodeType;
 
     @TableAnnotation("QR_code_url")
     private String qrCodeUrl;
@@ -27,7 +27,7 @@ public class CompanyExtendVo extends BaseVo {
      * 是否分账
      */
     @TableAnnotation("subledger_status")
-    private int subledgerStatus;
+    private Integer subledgerStatus;
 
     /**
      * 分账规则
@@ -39,49 +39,25 @@ public class CompanyExtendVo extends BaseVo {
      * 是否分润
      */
     @TableAnnotation("divide_status")
-    private int divedeStatus;
-
-    /**
-     * 分润规则
-     */
-    @TableAnnotation("divide_rule_id")
-    private String divideRuleId;
+    private Integer divedeStatus;
 
     /**
      * 是够可提现
      */
-    @TableAnnotation("withdraw_status")
-    private int withdrawStatus;
-
-    /**
-     * 提现规则
-     */
-    @TableAnnotation("withdraw_rule_id")
-    private String withdrawRuleId;
-
-    /**
-     * 可提现总额
-     */
     @TableAnnotation("withdraw_total_cash")
-    private BigDecimal withdrawTotalCash;
+    private Double withdrawTotalCash;
 
     /**
      * 是否扫码支付
      */
     @TableAnnotation("scan_code_pay_status")
-    private int scanCodePayStatus;
-
-    /**
-     * 支付规则
-     */
-    @TableAnnotation("pay_rule_id")
-    private String payRuleId;
+    private Integer scanCodePayStatus;
 
     /**
      * 是否邀请
      */
     @TableAnnotation("invitation_status")
-    private int invitationStatus;
+    private Integer invitationStatus;
 
     /**
      * 邀请规则
@@ -92,13 +68,19 @@ public class CompanyExtendVo extends BaseVo {
     @TableAnnotation("invitation_code")
     private String invitationCode;
 
-    public BigDecimal getWithdrawTotalCash() {
-        return withdrawTotalCash;
-    }
+    @TableAnnotation("withdraw_rule")
+    private Integer withdrawRule;
 
-    public void setWithdrawTotalCash(BigDecimal withdrawTotalCash) {
-        this.withdrawTotalCash = withdrawTotalCash;
-    }
+    @TableAnnotation("withdraw_money")
+    private Double withdrawMoney;
+
+    @TableAnnotation("withdraw_fee")
+    private Double withdrawFee;
+
+    @TableAnnotation("withdraw_type")
+    private String withdrawType;
+
+    private Integer grade;
 
     public String getId() {
         return id;
@@ -116,11 +98,11 @@ public class CompanyExtendVo extends BaseVo {
         this.qrCode = qrCode;
     }
 
-    public int getQrCodeType() {
+    public Integer getQrCodeType() {
         return qrCodeType;
     }
 
-    public void setQrCodeType(int qrCodeType) {
+    public void setQrCodeType(Integer qrCodeType) {
         this.qrCodeType = qrCodeType;
     }
 
@@ -132,11 +114,11 @@ public class CompanyExtendVo extends BaseVo {
         this.qrCodeUrl = qrCodeUrl;
     }
 
-    public int getSubledgerStatus() {
+    public Integer getSubledgerStatus() {
         return subledgerStatus;
     }
 
-    public void setSubledgerStatus(int subledgerStatus) {
+    public void setSubledgerStatus(Integer subledgerStatus) {
         this.subledgerStatus = subledgerStatus;
     }
 
@@ -148,59 +130,35 @@ public class CompanyExtendVo extends BaseVo {
         this.subledgerRuleId = subledgerRuleId;
     }
 
-    public int getDivedeStatus() {
+    public Integer getDivedeStatus() {
         return divedeStatus;
     }
 
-    public void setDivedeStatus(int divedeStatus) {
+    public void setDivedeStatus(Integer divedeStatus) {
         this.divedeStatus = divedeStatus;
     }
 
-    public String getDivideRuleId() {
-        return divideRuleId;
-    }
-
-    public void setDivideRuleId(String divideRuleId) {
-        this.divideRuleId = divideRuleId;
-    }
-
-    public int getWithdrawStatus() {
-        return withdrawStatus;
-    }
-
-    public void setWithdrawStatus(int withdrawStatus) {
-        this.withdrawStatus = withdrawStatus;
-    }
-
-    public String getWithdrawRuleId() {
-        return withdrawRuleId;
+    public Double getWithdrawTotalCash() {
+        return withdrawTotalCash;
     }
 
-    public void setWithdrawRuleId(String withdrawRuleId) {
-        this.withdrawRuleId = withdrawRuleId;
+    public void setWithdrawTotalCash(Double withdrawTotalCash) {
+        this.withdrawTotalCash = withdrawTotalCash;
     }
 
-    public int getScanCodePayStatus() {
+    public Integer getScanCodePayStatus() {
         return scanCodePayStatus;
     }
 
-    public void setScanCodePayStatus(int scanCodePayStatus) {
+    public void setScanCodePayStatus(Integer scanCodePayStatus) {
         this.scanCodePayStatus = scanCodePayStatus;
     }
 
-    public String getPayRuleId() {
-        return payRuleId;
-    }
-
-    public void setPayRuleId(String payRuleId) {
-        this.payRuleId = payRuleId;
-    }
-
-    public int getInvitationStatus() {
+    public Integer getInvitationStatus() {
         return invitationStatus;
     }
 
-    public void setInvitationStatus(int invitationStatus) {
+    public void setInvitationStatus(Integer invitationStatus) {
         this.invitationStatus = invitationStatus;
     }
 
@@ -219,4 +177,44 @@ public class CompanyExtendVo extends BaseVo {
     public void setInvitationCode(String invitationCode) {
         this.invitationCode = invitationCode;
     }
+
+    public Integer getWithdrawRule() {
+        return withdrawRule;
+    }
+
+    public void setWithdrawRule(Integer withdrawRule) {
+        this.withdrawRule = withdrawRule;
+    }
+
+    public Double getWithdrawMoney() {
+        return withdrawMoney;
+    }
+
+    public void setWithdrawMoney(Double withdrawMoney) {
+        this.withdrawMoney = withdrawMoney;
+    }
+
+    public Double getWithdrawFee() {
+        return withdrawFee;
+    }
+
+    public void setWithdrawFee(Double withdrawFee) {
+        this.withdrawFee = withdrawFee;
+    }
+
+    public String getWithdrawType() {
+        return withdrawType;
+    }
+
+    public void setWithdrawType(String withdrawType) {
+        this.withdrawType = withdrawType;
+    }
+
+    public Integer getGrade() {
+        return grade;
+    }
+
+    public void setGrade(Integer grade) {
+        this.grade = grade;
+    }
 }

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

@@ -46,7 +46,7 @@ public class TyyCompanyExtendVo extends BaseVo {
     /**
      * 可提现余额
      */
-    private BigDecimal money;
+    private Double money;
 
     /**
      * 提现手续费
@@ -108,11 +108,11 @@ public class TyyCompanyExtendVo extends BaseVo {
         this.status = status;
     }
 
-    public BigDecimal getMoney() {
+    public Double getMoney() {
         return money;
     }
 
-    public void setMoney(BigDecimal money) {
+    public void setMoney(Double money) {
         this.money = money;
     }
 

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

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
  */
 public class HomeResVo {
 
-    private BigDecimal withdrawTotalCash;
+    private Double withdrawTotalCash;
 
     private String companyId;
 
@@ -20,11 +20,11 @@ public class HomeResVo {
         this.companyId = companyId;
     }
 
-    public BigDecimal getWithdrawTotalCash() {
+    public Double getWithdrawTotalCash() {
         return withdrawTotalCash;
     }
 
-    public void setWithdrawTotalCash(BigDecimal withdrawTotalCash) {
+    public void setWithdrawTotalCash(Double withdrawTotalCash) {
         this.withdrawTotalCash = withdrawTotalCash;
     }
 }

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

@@ -10,15 +10,15 @@ import java.util.List;
  * @create 2019/6/18 19:58
  */
 public class WithdrawalResVo {
-    private BigDecimal withdrawTotalCash;
+    private Double withdrawTotalCash;
 
     private List<CompanyBankCardVo> bankCardVoList;
 
-    public BigDecimal getWithdrawTotalCash() {
+    public Double getWithdrawTotalCash() {
         return withdrawTotalCash;
     }
 
-    public void setWithdrawTotalCash(BigDecimal withdrawTotalCash) {
+    public void setWithdrawTotalCash(Double withdrawTotalCash) {
         this.withdrawTotalCash = withdrawTotalCash;
     }