设置默认银行卡

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

@@ -146,4 +146,23 @@ public class UserController {
         return userServiceImpl.registerSaveUser(saveUserReqVo);
     }
 
+
+    /**
+     * 分销客户端 注册用户（新）
+     * @param //id
+     * @return
+     */
+    @ApiOperation(value ="注册", notes = "返回注册信息")
+    @RequestMapping(value = "/registerUserByDistribution", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<String> registerUserByDistribution(@RequestBody SaveUserReqVo saveUserReqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("registerFrom", saveUserReqVo.getRegisterFrom())
+                .notBlankCheck("account",saveUserReqVo.getAccount())
+                .notBlankCheck("password", saveUserReqVo.getPassword())
+                .notBlankCheck("confirmPassword", saveUserReqVo.getConfirmPassword())
+                .notBlankCheck("companyType", saveUserReqVo.getCompanyType())
+                .checkException();
+        return userServiceImpl.registerSaveUser(saveUserReqVo);
+    }
+
 }

src/main/java/com/pangding/web/authority/dao/company/CompanyRelationDao.java

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

src/main/java/com/pangding/web/authority/dao/company/impl/CompanyRelationDaoImpl.java

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

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

@@ -401,7 +401,10 @@ public class RegisterServiceImpl implements RegisterService {
             throw new CodeException("用户名不存在");
         }
         /*通过私钥将rsa加密的密码解密*/
-        String password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(), RsaConstant.privateKey);
+        String password = reqVo.getPassword();
+        if(StringHelper.isEmpty(reqVo.getLoginType()) || 2 != reqVo.getLoginType()){
+            password = RSAUtils.decryptionByPrivateKey(reqVo.getPassword(), RsaConstant.privateKey);
+        }
         if (!(StringHelper.md5(password).equals(userVo.getPassword()))) {
             throw new CodeException("用户名或密码错误");
         }

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

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
-import com.pangding.web.authority.dao.company.CompanyBankCardDao;
-import com.pangding.web.authority.dao.company.CompanyDao;
-import com.pangding.web.authority.dao.company.CompanyExtendDao;
-import com.pangding.web.authority.dao.company.CompanyMerchantDao;
+import com.pangding.web.authority.dao.company.*;
 import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.service.TokenService;
 import com.pangding.web.authority.service.company.NewCompanyService;
@@ -20,10 +17,7 @@ import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.LoginTokenVo;
 import com.pangding.web.vo.system.pd.authority.*;
-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.CompanyMerchantVo;
-import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.pd.company.*;
 import com.pangding.web.vo.system.req.LoginReqVo;
 import com.pangding.web.vo.system.req.authority.AuthorityReqVo;
 import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
@@ -70,6 +64,8 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private CompanyExtendDao companyExtendDao;
     @Autowired
+    private CompanyRelationDao companyRelationDao;
+    @Autowired
     private CompanyBankCardDao companyBankCardDao;
     @Autowired
     private CompanyMerchantDao companyMerchantdao;
@@ -211,9 +207,19 @@ public class UserServiceImpl implements UserService {
                 return (ResponseResult)ResponseResult.error("99", "两次填写的密码不相等");
             }
 
-            // 验证邀请码是否正确 todo 关联码怎么判断
-            CompanyResVo companyResVo = newCompanyService.checkInvitationCode(saveUserReqVo.getInvitationCode());
-
+            String invitationCompanyId = "";
+            String invitationCompanyName = "";
+            int invitationCodeType = 0;
+            // 分销客户端注册  不需要邀请码
+            if(CompanyConstant.REGISTER_FROM_SALE != saveUserReqVo.getRegisterFrom()){
+                // 验证邀请码是否正确 todo 关联码怎么判断
+                CompanyResVo companyResVo = newCompanyService.checkInvitationCode(saveUserReqVo.getInvitationCode());
+                if(!StringHelper.isEmpty(companyResVo)){
+                    invitationCompanyId = companyResVo.getId();
+                    invitationCompanyName = companyResVo.getCompanyName();
+                    invitationCodeType = companyResVo.getInvitationCodeType();
+                }
+            }
             String companyId = StringHelper.getNewID();
             String userId = StringHelper.getNewID();
 
@@ -235,13 +241,13 @@ public class UserServiceImpl implements UserService {
             // 保存公司表
             CompanyVo companyVo = new CompanyVo();
             companyVo.setId(companyId);
-            companyVo.setInvitationCompanyId(companyResVo.getId());
-            companyVo.setInvitationCompanyName(companyResVo.getCompanyName());
-            companyVo.setInvitationCodeType(companyResVo.getInvitationCodeType());
-            if(CompanyConstant.RELATION_CODE == companyResVo.getInvitationCodeType()){
+            companyVo.setInvitationCompanyId(invitationCompanyId);
+            companyVo.setInvitationCompanyName(invitationCompanyName);
+            companyVo.setInvitationCodeType(invitationCodeType);
+            if(CompanyConstant.RELATION_CODE == invitationCodeType){
                 // 邀请码为关联码  需关联父级
-                companyVo.setPid(companyResVo.getId());
-                companyVo.setPcompanyName(companyResVo.getCompanyName());
+                companyVo.setPid(invitationCompanyId);
+                companyVo.setPcompanyName(invitationCompanyName);
             }
             companyVo.setStatus(CompanyConstant.COMPANY_STATUS_INIT);
             companyVo.setNature(saveUserReqVo.getCompanyType());
@@ -260,6 +266,15 @@ public class UserServiceImpl implements UserService {
             companyExtendVo.setId(companyId);
             companyExtendDao.create(companyExtendVo);
 
+            // 分销客户端 需保存公司关联表
+            if(CompanyConstant.REGISTER_FROM_SALE == saveUserReqVo.getRegisterFrom()){
+                CompanyRelationVo companyRelationVo = new CompanyRelationVo();
+                companyRelationVo.setCompanyId(companyId);
+                companyRelationVo.setRelationId(saveUserReqVo.getRelationId());
+                companyRelationVo.setRelationType("tbd");
+                companyRelationDao.save(companyRelationVo);
+            }
+
             String roleId = StringHelper.getNewID();
             // 保存角色表
             RoleVo roleVo = new RoleVo();