user/role/tright 6.5

还需要调用其他服务

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

@@ -39,7 +39,7 @@ public class CompanyManagementController {
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getId())
                 .checkException();
-        return ResponseResult.result(companyServiceImpl.pdGetDetail(reqVo));
+        return ResponseResult.result(companyServiceImpl.getDetail(reqVo));
     }
 
     /**y

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

@@ -122,8 +122,6 @@ public class ComputerRegisterController {
                 .notBlankCheck("bankAddress",reqVo.getBankAddress())
                 .notBlankCheck("bankCode",reqVo.getBankCode())
                 .notNumberCheck("bankCode",reqVo.getBankCode())
-                .notBlankCheck("reservedPhone",reqVo.getReservedPhone())
-                .checkPhoneNo("reservedPhone",reqVo.getReservedPhone())
                 .checkException();
     };
 

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

@@ -258,18 +258,4 @@ public class PangdingManagementController {
         companyServiceImpl.batchDelete(reqVo);
         return new ResponseResult();
     }
-
-    /**
-     * 批量更新用户信息
-     * @param reqVo 封装了用户列表的请求对象
-     * @return
-     */
-    @RequestMapping(value = "/batchUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult batchUpdate(@RequestBody BatchUpdateReqVo reqVo) throws Exception {
-        CheckerHelper.newInstance()
-                .notBlankCheck("userList",reqVo.getUserVoList())
-                .checkException();
-        companyServiceImpl.batchUpdate(reqVo);
-        return new ResponseResult();
-    }
 }

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

@@ -20,7 +20,7 @@ public interface PayFeign {
      * @return
      */
     @RequestMapping(value="/register")
-    public ResponseResult setCompanyInfo(@RequestBody CompanyReqVo req);
+    public ResponseResult<CompanyReqVo> setCompanyInfo(@RequestBody CompanyReqVo req);
 
     /**
      * 绑定银行卡
@@ -28,7 +28,7 @@ public interface PayFeign {
      * @return
      */
     @RequestMapping(value="/bindback")
-    public ResponseResult bindBack(@RequestBody CompanyBankReqVo req);
+    public ResponseResult<CompanyBankReqVo> bindBack(@RequestBody CompanyBankReqVo req);
 
     /**
      * 解绑银行卡
@@ -36,5 +36,5 @@ public interface PayFeign {
      * @return
      */
     @RequestMapping(value = "/unbindBankCard")
-    public ResponseResult unbindBankCard(@RequestBody CompanyBankReqVo req);
+    public ResponseResult<CompanyBankReqVo> unbindBankCard(@RequestBody CompanyBankReqVo req);
 }

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

@@ -21,7 +21,7 @@ public interface StoreFeign {
      * @return
      */
     @RequestMapping("/merchantCreate")
-    public ResponseResult merchantCreate(@RequestBody MerchantCreateReqVo req);
+    public ResponseResult<String> merchantCreate(@RequestBody MerchantCreateReqVo req);
 
     /**
      * 通过公司还是id获取商户信息

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

@@ -8,6 +8,7 @@ import com.pangding.web.authority.vo.resvo.CompanyResVo;
 import com.pangding.web.authority.vo.resvo.DetailResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
 
 import java.util.List;
 
@@ -48,7 +49,7 @@ public interface CompanyService{
      * @param reqVo 包含公司id的请求对象
      * @return 封装了用户，公司主表信息的对象
      */
-    DetailResVo getDetail(CompanyGetReqVo reqVo);
+    CompanyResVo getDetail(CompanyGetReqVo reqVo);
 
     /**
      * 新增/修改公司信息

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

@@ -52,8 +52,6 @@ public class RegisterServiceImpl implements RegisterService {
     @Autowired
     private StoreFeign storeFeign;
     @Autowired
-    private CompanyService companyService;
-    @Autowired
     VerifyCodeService verifyCodeServiceImpl;
     @Autowired
     RoleAuthorityDao roleAuthorityDaoImpl;
@@ -119,6 +117,17 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo.setInvitationCompanyId(companyExtendVo.getId());
         companyVo.setCompanyType(registerUserReqVo.getCompanyType());
         companyDaoImpl.create(companyVo);
+
+        /*保存公司扩展表*/
+        CompanyExtendVo extendVo = new CompanyExtendVo();
+        extendVo.setId(companyVo.getId());
+        String qrCode = DateHelper.getNow()
+                .replace("-","")
+                .replace(":","")
+                .replace(" ","");
+        extendVo.setQrCode(qrCode);
+        companyExtendDaoImpl.create(extendVo);
+
         return companyVo;
     }
 
@@ -167,16 +176,6 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         companyDaoImpl.update(companyVo);
 
-        /*保存公司扩展表*/
-        CompanyExtendVo extendVo = new CompanyExtendVo();
-        extendVo.setId(resCompanyReqVo.getId());
-        String qrCode = DateHelper.getNow()
-                .replace("-","")
-                .replace(":","")
-                .replace(" ","");
-        extendVo.setQrCode(qrCode);
-        companyExtendDaoImpl.save(extendVo);
-
         /*跟新用户表添加联系方式*/
         UserVo userReqVo = new UserVo();
         userReqVo.setCompanyId(reqVo.getId());
@@ -209,7 +208,7 @@ public class RegisterServiceImpl implements RegisterService {
         }
 
         resVo.setCompanyId(companyVo.getId());
-        resVo.setCompanyExtendId(extendVo.getId());
+        resVo.setCompanyExtendId(companyVo.getId());
         resVo.setUserId(userVo.getId());
 
         return resVo;
@@ -255,6 +254,7 @@ public class RegisterServiceImpl implements RegisterService {
         CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
         ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
         companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+        companyBankCardVo.setPhone(reqVo.getContactPhone());
         companyBankCardDaoImpl.save(companyBankCardVo);
 
         /*保存公司扩展表*/
@@ -281,9 +281,7 @@ public class RegisterServiceImpl implements RegisterService {
         /*保存或更新商户表*/
         MerchantCreateReqVo req=new MerchantCreateReqVo();
         req.setReqId(StringHelper.getNewID());
-        req.setId(StringHelper.getNewID());
-        req.setName(reqVo.getCompanyName());
-        req.setAddress(reqVo.getAddress());
+        req.setName(reqVo.getMerchantName());
         req.setType(reqVo.getCompanyAttribute());
         req.setProductCompanyId(reqVo.getId());
         req.setUserId(userVo.getId());
@@ -293,6 +291,11 @@ public class RegisterServiceImpl implements RegisterService {
         }else {
             req.setId(reqVo.getMerchantId());
         }
+        if (null == reqVo.getMerchantAddress() || reqVo.getMerchantAddress().isEmpty()){
+            req.setAddress(reqVo.getAddress());
+        }else{
+            req.setAddress(reqVo.getMerchantAddress());
+        }
 
         ResponseResult result1 = storeFeign.merchantCreate(req);
         if (result1.getCode().equals("00")){

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

@@ -53,11 +53,17 @@ public class UserServiceImpl implements UserService {
         webUserReqVo.setRemark(password);
         String md5Password = this.passwordEncoder(password);
         webUserReqVo.setPassword(md5Password);
-        webUserReqVo.setId(StringHelper.getNewID());
 
         UserVo userVo = new UserVo();
-        ObjectHelper.writeWithFrom(userVo,webUserReqVo);
-        userDao.create(userVo);
+        if (null == webUserReqVo.getId() || webUserReqVo.getId().isEmpty()){
+            webUserReqVo.setId(StringHelper.getNewID());
+            ObjectHelper.writeWithFrom(userVo,webUserReqVo);
+            userDao.create(userVo);
+        }else{
+            ObjectHelper.writeWithFrom(userVo,webUserReqVo);
+            userDao.update(userVo);
+        }
+
         saveUserRole(webUserReqVo);
 
         return userVo.getId();
@@ -66,6 +72,11 @@ public class UserServiceImpl implements UserService {
     private void saveUserRole(WebUserReqVo webUserReqVo){
         if (webUserReqVo.getRoleIds()!=null && !webUserReqVo.getRoleIds().isEmpty()){
             List<String> roleIds = webUserReqVo.getRoleIds();
+            /*删除该用户之前的角色*/
+            UserRoleVo reqVo = new UserRoleVo();
+            reqVo.setUserId(webUserReqVo.getId());
+            userRoleDao.remove(reqVo);
+            /*设置新角色*/
             for (String roleId : roleIds) {
                 UserRoleVo userRoleRelation = new UserRoleVo();
                 userRoleRelation.setRoleId(roleId);

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

@@ -65,6 +65,17 @@ public class CompanyVo extends BaseVo implements InitDao {
     @TableAnnotation("product_or_interface")
     private int productOrInterface;
 
+    @TableAnnotation("examine_status")
+    private int examineStatus;
+
+    public int getExamineStatus() {
+        return examineStatus;
+    }
+
+    public void setExamineStatus(int examineStatus) {
+        this.examineStatus = examineStatus;
+    }
+
     public int getProductOrInterface() {
         return productOrInterface;
     }

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

@@ -24,7 +24,7 @@ public class UserVo extends BaseVo implements InitDao {
 
     private String phone;
 
-    private int status;
+    private String status;
 
     private String remark;
 
@@ -92,11 +92,11 @@ public class UserVo extends BaseVo implements InitDao {
         this.phone = phone;
     }
 
-    public int getStatus() {
+    public String getStatus() {
         return status;
     }
 
-    public void setStatus(int status) {
+    public void setStatus(String status) {
         this.status = status;
     }
 

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

@@ -11,6 +11,16 @@ public class CompanyBankCardGetReqVo {
 
     private String companyId;
 
+    private int isDefault;
+
+    public int getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(int isDefault) {
+        this.isDefault = isDefault;
+    }
+
     public String getReqId() {
         return reqId;
     }

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

@@ -37,10 +37,18 @@ public class RegisterEnterpriceReqVo {
 
     private String bankCode;
 
-    private String reservedPhone;
-
     private String merchantId;
 
+    private String merchantAddress;
+
+    public String getMerchantAddress() {
+        return merchantAddress;
+    }
+
+    public void setMerchantAddress(String merchantAddress) {
+        this.merchantAddress = merchantAddress;
+    }
+
     public String getMerchantId() {
         return merchantId;
     }
@@ -177,11 +185,4 @@ public class RegisterEnterpriceReqVo {
         this.bankCode = bankCode;
     }
 
-    public String getReservedPhone() {
-        return reservedPhone;
-    }
-
-    public void setReservedPhone(String reservedPhone) {
-        this.reservedPhone = reservedPhone;
-    }
 }

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

@@ -92,6 +92,57 @@ public class SaveCompanyReqVo {
      */
     private String createName;
 
+
+    private String companyId;
+
+    private String companyExtendId;
+
+    private String companyBankCardId;
+
+    private String merchantId;
+
+    private String userId;
+
+    public String getCompanyExtendId() {
+        return companyExtendId;
+    }
+
+    public void setCompanyExtendId(String companyExtendId) {
+        this.companyExtendId = companyExtendId;
+    }
+
+    public String getCompanyBankCardId() {
+        return companyBankCardId;
+    }
+
+    public void setCompanyBankCardId(String companyBankCardId) {
+        this.companyBankCardId = companyBankCardId;
+    }
+
+    public String getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(String merchantId) {
+        this.merchantId = merchantId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
     public String getCreateId() {
         return createId;
     }

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

@@ -9,7 +9,7 @@ import java.util.List;
  * @create 2019/5/23 14:53
  */
 public class CompanyResVo {
-    private List<UserVo> userVoList;
+    private UserVo userVo;
 
     private CompanyVo companyVo;
 
@@ -17,7 +17,7 @@ public class CompanyResVo {
 
     private CompanyExtendVo companyExtendVo;
 
-    private List<CompanyBankCardVo> bankCardVoList;
+    private CompanyBankCardVo bankCardVo;
 
     public Merchant getMerchant() {
         return merchant;
@@ -27,20 +27,20 @@ public class CompanyResVo {
         this.merchant = merchant;
     }
 
-    public List<UserVo> getUserVoList() {
-        return userVoList;
+    public UserVo getUserVo() {
+        return userVo;
     }
 
-    public void setUserVoList(List<UserVo> userVoList) {
-        this.userVoList = userVoList;
+    public void setUserVo(UserVo userVo) {
+        this.userVo = userVo;
     }
 
-    public List<CompanyBankCardVo> getBankCardVoList() {
-        return bankCardVoList;
+    public CompanyBankCardVo getBankCardVo() {
+        return bankCardVo;
     }
 
-    public void setBankCardVoList(List<CompanyBankCardVo> bankCardVoList) {
-        this.bankCardVoList = bankCardVoList;
+    public void setBankCardVo(CompanyBankCardVo bankCardVo) {
+        this.bankCardVo = bankCardVo;
     }
 
     public CompanyVo getCompanyVo() {